Changeset 5829 for pjproject/trunk/pjlib/src/pj/lock.c

Timestamp:

Jul 20, 2018 7:21:32 AM (6 years ago)

Author:

nanang

Message:

Fix #2129: Updated pj_grp_lock_dump() to avoid infinite recursion.

File:

• pjproject/trunk/pjlib/src/pj/lock.c (modified) (8 diffs)

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

@@ -557 +557 @@
     }
     pj_assert(cnt > 0);
-    pj_grp_lock_dump(glock);
-    return PJ_SUCCESS;
+    return PJ_SUCCESS;
+}
+
+static pj_status_t grp_lock_dec_ref_dump(pj_grp_lock_t *glock)
+{
+    pj_status_t status;
+
+    status = grp_lock_dec_ref(glock);
+    if (status == PJ_SUCCESS) {
+        pj_grp_lock_dump(glock);
+    } else if (status == PJ_EGONE) {
+        PJ_LOG(4,(THIS_FILE, "Group lock %p destroyed.", glock));
+    }
+
+    return status;
 }
 
@@ -600 +613 @@
 {
     grp_lock_ref *ref;
+
+    PJ_UNUSED_ARG(line);
 
     pj_enter_critical_section();
@@ -619 +634 @@
     }
 
-    return grp_lock_dec_ref(glock);
+    return grp_lock_dec_ref_dump(glock);
 }
 #else
@@ -696 +711 @@
 {
 #if PJ_GRP_LOCK_DEBUG
-    grp_lock_ref *ref = grp_lock->ref_list.next;
+    grp_lock_ref *ref;
     char info_buf[1000];
     pj_str_t info;
@@ -703 +718 @@
     info.slen = 0;
 
-    pj_grp_lock_acquire(grp_lock);
+    grp_lock_add_ref(grp_lock);
     pj_enter_critical_section();
 
+    ref = grp_lock->ref_list.next;
     while (ref != &grp_lock->ref_list && info.slen < sizeof(info_buf)) {
         char *start = info.ptr + info.slen;
@@ -711 +727 @@
         int len;
 
-        len = pj_ansi_snprintf(start, max_len, "%s:%d ", ref->file, ref->line);
+        len = pj_ansi_snprintf(start, max_len, "\t%s:%d\n", ref->file, ref->line);
         if (len < 1 || len >= max_len) {
             len = strlen(ref->file);
@@ -718 +734 @@
 
             memcpy(start, ref->file, len);
-            start[len++] = ' ';
+            start[len++] = '\n';
         }
 
@@ -734 +750 @@
 
     pj_leave_critical_section();
-    pj_grp_lock_release(grp_lock);
-
-    PJ_LOG(4,(THIS_FILE, "Group lock %p, ref_cnt=%d. Reference holders: %s",
-               grp_lock, pj_grp_lock_get_ref(grp_lock), info.ptr));
+
+    PJ_LOG(4,(THIS_FILE, "Group lock %p, ref_cnt=%d. Reference holders:\n%s",
+               grp_lock, pj_grp_lock_get_ref(grp_lock)-1, info.ptr));
+
+    grp_lock_dec_ref(grp_lock);
 #else
-    PJ_UNUSED_ARG(grp_lock);
+    PJ_LOG(4,(THIS_FILE, "Group lock %p, ref_cnt=%d.",
+               grp_lock, pj_grp_lock_get_ref(grp_lock)));
 #endif
 }