Should not change outter lock.

NetEase · Apr 29, 2016 · f7347f0 · f7347f0
1 parent 5ebf2e4
commit f7347f0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/pc_pomelo.c b/src/pc_pomelo.c
@@ -350,6 +350,8 @@ int pc_client_poll(pc_client_t* client)
         return PC_RC_ERROR;
     }
 
+    pc_mutex_lock(&client->event_mutex);
+
     /*
      * `is_in_poll` is used to avoid recursive invocation of pc_client_poll
      * by identical thread as `pc_mutex_t` is recursive.
@@ -360,7 +362,6 @@ int pc_client_poll(pc_client_t* client)
     if (!client->is_in_poll) {
         client->is_in_poll = 1;
 
-        pc_mutex_lock(&client->event_mutex);
         while(!QUEUE_EMPTY(&client->pending_ev_queue)) {
             q = QUEUE_HEAD(&client->pending_ev_queue);
             ev = (pc_event_t*) QUEUE_DATA(q, pc_event_t, queue);
@@ -375,10 +376,10 @@ int pc_client_poll(pc_client_t* client)
             pc__handle_event(client, ev);
             pc_mutex_lock(&client->event_mutex);
         }
-        pc_mutex_unlock(&client->event_mutex);
         client->is_in_poll = 0;
     }
 
+    pc_mutex_unlock(&client->event_mutex);
 
     return PC_RC_OK;
 }