Changeset 6082

Timestamp:

Sep 30, 2019 6:50:32 AM (4 years ago)

Author:

nanang

Message:

Re #2237: Updated SSL socket to use group lock in scheduling timer.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_imp_common.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_imp_common.c

@@ -260 +260 @@
                                          &ssock->timer);
                 }
-                ssock->timer.id = TIMER_CLOSE;
                 pj_time_val_normalize(&interval);
-                status1 = pj_timer_heap_schedule(ssock->param.timer_heap, 
-                                                 &ssock->timer, &interval);
+                status1 = pj_timer_heap_schedule_w_grp_lock(
+                                                 ssock->param.timer_heap, 
+                                                 &ssock->timer,
+                                                 &interval,
+                                                 TIMER_CLOSE,
+                                                 ssock->param.grp_lock);
                 if (status1 != PJ_SUCCESS) {
                     PJ_PERROR(3,(ssock->pool->obj_name, status,
@@ -985 +988 @@
     {
         pj_assert(ssock->timer.id == TIMER_NONE);
-        ssock->timer.id = TIMER_HANDSHAKE_TIMEOUT;
-        status = pj_timer_heap_schedule(ssock->param.timer_heap, 
-                                        &ssock->timer,
-                                        &ssock->param.timeout);
+        status = pj_timer_heap_schedule_w_grp_lock(ssock->param.timer_heap, 
+                                                   &ssock->timer,
+                                                   &ssock->param.timeout,
+                                                   TIMER_HANDSHAKE_TIMEOUT,
+                                                   ssock->param.grp_lock);
         if (status != PJ_SUCCESS) {
             ssock->timer.id = TIMER_NONE;
@@ -1969 +1973 @@
     {
         pj_assert(ssock->timer.id == TIMER_NONE);
-        ssock->timer.id = TIMER_HANDSHAKE_TIMEOUT;
-        status = pj_timer_heap_schedule(ssock->param.timer_heap,
-                                        &ssock->timer,
-                                        &ssock->param.timeout);
+        status = pj_timer_heap_schedule_w_grp_lock(ssock->param.timer_heap,
+                                                   &ssock->timer,
+                                                   &ssock->param.timeout,
+                                                   TIMER_HANDSHAKE_TIMEOUT,
+                                                   ssock->param.grp_lock);
         if (status != PJ_SUCCESS) {
             ssock->timer.id = TIMER_NONE;