Changeset 4297

Timestamp:

Nov 13, 2012 8:46:42 AM (12 years ago)

Author:

bennylp

Message:

Re #1562: PJSUA-LIB shutdown operation may block for a long time if system time is modified while the shutdown is in progress. Also fixed similar issue in STUN client.

Location:

pjproject/trunk

Files:

• pjlib-util/src/pjlib-util/stun_simple_client.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (2 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/stun_simple_client.c

@@ -194 +194 @@
 
         /* Calculate time of next retransmission. */
-        pj_gettimeofday(&next_tx);
+        pj_gettickcount(&next_tx);
         next_tx.sec += (stun_timer[send_cnt]/1000);
         next_tx.msec += (stun_timer[send_cnt]%1000);
         pj_time_val_normalize(&next_tx);
 
-        for (pj_gettimeofday(&now), select_rc=1; 
+        for (pj_gettickcount(&now), select_rc=1;
              status==PJ_SUCCESS && select_rc>=1 && wait_resp>0 
                && PJ_TIME_VAL_LT(now, next_tx); 
-             pj_gettimeofday(&now)) 
+             pj_gettickcount(&now))
         {
             pj_time_val timeout;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -1076 +1076 @@
     pj_time_val timeout, now;
 
-    pj_gettimeofday(&timeout);
+    pj_gettickcount(&timeout);
     timeout.msec += msec;
     pj_time_val_normalize(&timeout);
@@ -1085 +1085 @@
         while (pjsua_handle_events(10) > 0 && i > 0)
             --i;
-        pj_gettimeofday(&now);
+        pj_gettickcount(&now);
     } while (PJ_TIME_VAL_LT(now, timeout));
 }