qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cliffjan...@apache.org
Subject qpid-proton git commit: PROTON-1491: epoll proactor - remove spurrious IO rearm on close
Date Fri, 26 May 2017 20:15:44 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master f66938024 -> 4edd7fe17


PROTON-1491: epoll proactor - remove spurrious IO rearm on close


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/4edd7fe1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/4edd7fe1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/4edd7fe1

Branch: refs/heads/master
Commit: 4edd7fe17430ea39bb388a0f085a19ea68619238
Parents: f669380
Author: Clifford Jansen <cliffjansen@apache.org>
Authored: Fri May 26 13:15:12 2017 -0700
Committer: Clifford Jansen <cliffjansen@apache.org>
Committed: Fri May 26 13:15:12 2017 -0700

----------------------------------------------------------------------
 proton-c/src/proactor/epoll.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/4edd7fe1/proton-c/src/proactor/epoll.c
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/epoll.c b/proton-c/src/proactor/epoll.c
index c65fa44..7490ecd 100644
--- a/proton-c/src/proactor/epoll.c
+++ b/proton-c/src/proactor/epoll.c
@@ -700,12 +700,7 @@ static void pconnection_begin_close(pconnection_t *pc) {
   if (!pc->context.closing) {
     pc->context.closing = true;
     if (pc->current_arm != 0 && !pc->new_events) {
-      // Force io callback via hangup
-      if (pc->current_arm != (EPOLLIN | EPOLLOUT)) {
-        pc->current_arm = (EPOLLIN | EPOLLOUT);
-        pc->psocket.epoll_io.wanted = pc->current_arm;;
-        rearm(pc->psocket.proactor, &pc->psocket.epoll_io);
-      }
+      // Force io callback via an EPOLLHUP
       shutdown(pc->psocket.sockfd, SHUT_RDWR);
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message