Changeset 672

Timestamp:

Aug 11, 2006 12:42:06 PM (18 years ago)

Author:

bennylp

Message:

Increased width for sender column in log message, and added additional check in pj_thread_register()

Location:

pjproject/trunk/pjlib/src/pj

Files:

• log.c (modified) (1 diff)
• os_core_unix.c (modified) (5 diffs)

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

@@ -116 +116 @@
     }
     if (log_decor & PJ_LOG_HAS_SENDER) {
-        enum { SENDER_WIDTH = 12 };
+        enum { SENDER_WIDTH = 14 };
         int sender_len = strlen(sender);
         *pre++ = ' ';

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

@@ -44 +44 @@
 #define THIS_FILE   "os_core_unix.c"
 
+#define SIGNATURE1  0xDEAFBEEF
+#define SIGNATURE2  0xDEADC0DE
+
 struct pj_thread_t
 {
@@ -50 +53 @@
     pj_thread_proc *proc;
     void           *arg;
+    pj_uint32_t     signature1;
+    pj_uint32_t     signature2;
 
     pj_mutex_t     *suspended_mutex;
@@ -193 +198 @@
     }
 
-    /* If a thread descriptor has been registered before, just return it. */
+    /* Warn if this thread has been registered before */
     if (pj_thread_local_get (thread_tls_id) != 0) {
         // 2006-02-26 bennylp:
@@ -206 +211 @@
     }
 
+    /* On the other hand, also warn if the thread descriptor buffer seem to
+     * have been used to register other threads.
+     */
+    pj_assert(thread->signature1 != SIGNATURE1 ||
+              thread->signature2 != SIGNATURE2 ||
+              (thread->thread == pthread_self()));
+
     /* Initialize and set the thread entry. */
     pj_bzero(desc, sizeof(struct pj_thread_t));
     thread->thread = pthread_self();
+    thread->signature1 = SIGNATURE1;
+    thread->signature2 = SIGNATURE2;
 
     if(cstr_thread_name && pj_strlen(&thread_name) < sizeof(thread->obj_name)-1)
@@ -218 +232 @@
     
     rc = pj_thread_local_set(thread_tls_id, thread);
-    if (rc != PJ_SUCCESS)
+    if (rc != PJ_SUCCESS) {
+        pj_bzero(desc, sizeof(struct pj_thread_t));
         return rc;
+    }
 
 #if defined(PJ_OS_HAS_CHECK_STACK) && PJ_OS_HAS_CHECK_STACK!=0