Changeset 675

Timestamp:

Aug 12, 2006 1:58:56 PM (18 years ago)

Author:

bennylp

Message:

Improved logging consistency and added more logging info in verbosity 6

Location:

pjproject/trunk

Files:

• pjlib/src/pj/os_core_unix.c (modified) (5 diffs)
• pjsip/src/pjsip/sip_dialog.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transaction.c (modified) (1 diff)

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

@@ -80 +80 @@
     int                 nesting_level;
     pj_thread_t        *owner;
+    char                owner_name[PJ_MAX_OBJ_NAME];
 #endif
 };
@@ -979 +980 @@
     PJ_ASSERT_RETURN(mutex, PJ_EINVAL);
 
+#if PJ_DEBUG
+    PJ_LOG(6,(mutex->obj_name, "Mutex: thread %s is waiting (mutex owner=%s)", 
+                                pj_thread_this()->obj_name,
+                                mutex->owner_name));
+#else
     PJ_LOG(6,(mutex->obj_name, "Mutex: thread %s is waiting", 
                                 pj_thread_this()->obj_name));
+#endif
 
     status = pthread_mutex_lock( &mutex->mutex );
 
+
+#if PJ_DEBUG
+    if (status == PJ_SUCCESS) {
+        mutex->owner = pj_thread_this();
+        pj_ansi_strcpy(mutex->owner_name, mutex->owner->obj_name);
+        ++mutex->nesting_level;
+    }
+
+    PJ_LOG(6,(mutex->obj_name, 
+              (status==0 ? 
+                "Mutex acquired by thread %s (level=%d)" : 
+                "Mutex acquisition FAILED by %s (level=%d)"),
+              pj_thread_this()->obj_name,
+              mutex->nesting_level));
+#else
     PJ_LOG(6,(mutex->obj_name, 
               (status==0 ? "Mutex acquired by thread %s" : "FAILED by %s"),
               pj_thread_this()->obj_name));
-
-#if PJ_DEBUG
-    if (status == PJ_SUCCESS) {
-        mutex->owner = pj_thread_this();
-        ++mutex->nesting_level;
-    }
 #endif
 
@@ -1020 +1036 @@
     if (--mutex->nesting_level == 0) {
         mutex->owner = NULL;
-    }
-#endif
-
+        mutex->owner_name[0] = '\0';
+    }
+
+    PJ_LOG(6,(mutex->obj_name, "Mutex released by thread %s (level=%d)", 
+                                pj_thread_this()->obj_name, 
+                                mutex->nesting_level));
+#else
     PJ_LOG(6,(mutex->obj_name, "Mutex released by thread %s", 
                                 pj_thread_this()->obj_name));
+#endif
 
     status = pthread_mutex_unlock( &mutex->mutex );
@@ -1052 +1073 @@
 
     if (status==0) {
+#if PJ_DEBUG
+        mutex->owner = pj_thread_this();
+        pj_ansi_strcpy(mutex->owner_name, mutex->owner->obj_name);
+        ++mutex->nesting_level;
+
+        PJ_LOG(6,(mutex->obj_name, "Mutex acquired by thread %s (level=%d)", 
+                                   pj_thread_this()->obj_name,
+                                   mutex->nesting_level));
+#else
         PJ_LOG(6,(mutex->obj_name, "Mutex acquired by thread %s", 
                                   pj_thread_this()->obj_name));
-
-#if PJ_DEBUG
-        mutex->owner = pj_thread_this();
-        ++mutex->nesting_level;
 #endif
     }
@@ -1082 +1108 @@
 
 #if PJ_HAS_THREADS
-    PJ_LOG(6,(mutex->obj_name, "Mutex destroyed"));
+    PJ_LOG(6,(mutex->obj_name, "Mutex destroyed by thread %s",
+                               pj_thread_this()->obj_name));
     status = pthread_mutex_destroy( &mutex->mutex );
     if (status == 0)

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -81 +81 @@
     pj_list_init(&dlg->inv_hdr);
 
-    status = pj_mutex_create_recursive(pool, "dlg%p", &dlg->mutex_);
+    status = pj_mutex_create_recursive(pool, dlg->obj_name, &dlg->mutex_);
     if (status != PJ_SUCCESS)
         goto on_error;

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -906 +906 @@
     tsx->timeout_timer.cb = &tsx_timer_callback;
     
-    status = pj_mutex_create_recursive(pool, "tsx%p", &tsx->mutex);
+    status = pj_mutex_create_recursive(pool, tsx->obj_name, &tsx->mutex);
     if (status != PJ_SUCCESS) {
         pjsip_endpt_release_pool(mod_tsx_layer.endpt, pool);