diff options
| author |   yalei wang <wylandrea@gmail.com> | 2018-08-02 10:36:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-08-02 10:36:17 +0000 |
| commit | b0a6393c31d73148bf97b0789b0695d691c7495c (patch) | |
| tree | b629bd5fbe4bbe3a934f6502d0d564e0151e728b /src | |
| parent | 480f7932d491cfcddfd78397fc8f3997436d4a8b (diff) | |
| parent | 5c6451f8dfcf6a145d5e49051f40197d328ee4b7 (diff) | |
Merge "Fix: epoll close process bug"
Diffstat (limited to 'src')
| -rw-r--r-- | src/nSocket/nstack/event/epoll/nstack_eventpoll.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nSocket/nstack/event/epoll/nstack_eventpoll.c b/src/nSocket/nstack/event/epoll/nstack_eventpoll.c index 9a753e9..a4ce0cc 100644 --- a/src/nSocket/nstack/event/epoll/nstack_eventpoll.c +++ b/src/nSocket/nstack/event/epoll/nstack_eventpoll.c @@ -753,13 +753,16 @@ nsep_epoll_close (int sock) return 0; } - nsep_set_infoSockMap (sock, NULL); - if (NSTACK_EPOL_FD == epInfo->fdtype) { - return nsp_epoll_close_ep_fd (sock, epInfo); + ret = nsp_epoll_close_ep_fd (sock, epInfo); + nsep_set_infoSockMap (sock, NULL); + return ret; } + nsep_set_infoSockMap (sock, NULL); + + nstack_each_modInx (modInx) { if (0 == (epInfo->epaddflag & (1 << modInx))) |