Changeset 5971 for pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

Timestamp:

Apr 23, 2019 8:42:45 AM (4 years ago)

Author:

nanang

Message:

Fixed #2191:

• Stricter double timer entry scheduling prevention.
• Integrate group lock in SIP transport, e.g: for add/dec ref, for timer scheduling.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -804 +804 @@
 
 /*
+ * Schedule timer with group lock.
+ */
+#if PJ_TIMER_DEBUG
+PJ_DEF(pj_status_t) pjsip_endpt_schedule_timer_w_grp_lock_dbg(
+                                                    pjsip_endpoint *endpt,
+                                                    pj_timer_entry *entry,
+                                                    const pj_time_val *delay,
+                                                    int id_val,
+                                                    pj_grp_lock_t *grp_lock,
+                                                    const char *src_file,
+                                                    int src_line)
+{
+    PJ_LOG(6, (THIS_FILE, "pjsip_endpt_schedule_timer_w_grp_lock"
+                          "(entry=%p, delay=%u.%u, grp_lock=%p)",
+                          entry, delay->sec, delay->msec, grp_lock));
+    return pj_timer_heap_schedule_w_grp_lock_dbg(endpt->timer_heap, entry,
+                                                 delay, id_val, grp_lock,
+                                                 src_file, src_line);
+}
+#else
+PJ_DEF(pj_status_t) pjsip_endpt_schedule_timer_w_grp_lock(
+                                                 pjsip_endpoint *endpt,
+                                                 pj_timer_entry *entry,
+                                                 const pj_time_val *delay,
+                                                 int id_val,
+                                                 pj_grp_lock_t *grp_lock )
+{
+    PJ_LOG(6, (THIS_FILE, "pjsip_endpt_schedule_timer_w_grp_lock"
+                          "(entry=%p, delay=%u.%u, grp_lock=%p)",
+                          entry, delay->sec, delay->msec, grp_lock));
+    return pj_timer_heap_schedule_w_grp_lock( endpt->timer_heap, entry,
+                                              delay, id_val, grp_lock );
+}
+#endif
+
+/*
  * Cancel the previously registered timer.
  */