Changeset 5519

Timestamp:

Jan 11, 2017 3:35:17 AM (8 years ago)

Author:

nanang

Message:

Fixed #1988: Wait for any active spinning loop in read callback to complete before reinitiating read operation in UDP restart.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c (modified) (8 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -77 +77 @@
     int                 is_closing;
     pj_bool_t           is_paused;
+    int                 read_loop_spin;
 
     /* Group lock to be used by UDP transport and ioqueue key */
@@ -130 +131 @@
     pj_status_t status;
 
+    ++tp->read_loop_spin;
+
     /* Don't do anything if transport is closing. */
     if (tp->is_closing) {
         tp->is_closing++;
-        return;
+        goto on_return;
     }
 
     /* Don't do anything if transport is being paused. */
     if (tp->is_paused)
-        return;
+        goto on_return;
 
     /*
@@ -228 +231 @@
          */
         if (tp->is_paused)
-            return;
+            break;
 
         /* Read next packet. */
@@ -244 +247 @@
 
         } else if (status == PJ_EPENDING) {
+            break;
+
+        } else if (status == PJ_ECANCELLED) {
+            /* Socket is closing, quit loop */
             break;
 
@@ -277 +284 @@
         }
     }
+
+on_return:
+    --tp->read_loop_spin;
 }
 
@@ -624 +634 @@
         return PJ_SUCCESS;
 
-    /* Create group lock */
-    status = pj_grp_lock_create(tp->base.pool, NULL, &tp->grp_lock);
-    if (status != PJ_SUCCESS)
-        return status;
-
-    pj_grp_lock_add_ref(tp->grp_lock);
-    pj_grp_lock_add_handler(tp->grp_lock, tp->base.pool, tp, &udp_on_destroy);
+    /* Create group lock if not yet (don't need to do so on UDP restart) */
+    if (!tp->grp_lock) {
+        status = pj_grp_lock_create(tp->base.pool, NULL, &tp->grp_lock);
+        if (status != PJ_SUCCESS)
+            return status;
+
+        pj_grp_lock_add_ref(tp->grp_lock);
+        pj_grp_lock_add_handler(tp->grp_lock, tp->base.pool, tp,
+                                &udp_on_destroy);
+    }
     
     /* Register to ioqueue. */
@@ -1076 +1089 @@
     tp = (struct udp_transport*) transport;
 
+    /* Pause the transport first, so that any active read loop spin will
+     * quit as soon as possible.
+     */
+    tp->is_paused = PJ_TRUE;
+
     if (option & PJSIP_UDP_TRANSPORT_DESTROY_SOCKET) {
         char addr_buf[PJ_INET6_ADDRSTRLEN];
@@ -1139 +1157 @@
     }
 
+    /* Make sure all udp_on_read_complete() loop spin are stopped */
+    do {
+        pj_thread_sleep(1);
+    } while (tp->read_loop_spin);
+
     /* Re-register new or existing socket to ioqueue. */
     status = register_to_ioqueue(tp);