Changeset 1042 for pjproject/trunk

Timestamp:

Mar 5, 2007 9:08:01 PM (18 years ago)

Author:

bennylp

Message:

Optimization on the log and add tracing on mutex trylock

Location:

pjproject/trunk/pjlib

Files:

• include/pj/log.h (modified) (2 diffs)
• src/pj/log.c (modified) (3 diffs)
• src/pj/os_core_unix.c (modified) (2 diffs)
• src/pj/os_core_win32.c (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/log.h

@@ -99 +99 @@
  * @hideinitializer
  */
-#define PJ_LOG(level,arg)       pj_log_wrapper_##level(arg)
+#define PJ_LOG(level,arg)       do { \
+                                    if (level <= pj_log_get_level()) \
+                                        pj_log_wrapper_##level(arg); \
+                                } while (0)
 
 /**
@@ -172 +175 @@
  * @return          Current log maximum level.
  */
+#if 0
 PJ_DECL(int) pj_log_get_level(void);
+#else
+PJ_DECL(int) pj_log_max_level;
+#define pj_log_get_level()  pj_log_max_level
+#endif
 
 /**

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

@@ -25 +25 @@
 #if PJ_LOG_MAX_LEVEL >= 1
 
-static int log_max_level = PJ_LOG_MAX_LEVEL;
+PJ_DEF(int) pj_log_max_level = PJ_LOG_MAX_LEVEL;
 static pj_log_func *log_writer = &pj_log_write;
 static unsigned log_decor = PJ_LOG_HAS_TIME | PJ_LOG_HAS_MICRO_SEC |
@@ -46 +46 @@
 PJ_DEF(void) pj_log_set_level(int level)
 {
-    log_max_level = level;
-}
-
+    pj_log_max_level = level;
+}
+
+#if 0
 PJ_DEF(int) pj_log_get_level(void)
 {
-    return log_max_level;
-}
+    return pj_log_max_level;
+}
+#endif
 
 PJ_DEF(void) pj_log_set_log_func( pj_log_func *func )
@@ -77 +79 @@
     PJ_CHECK_STACK();
 
-    if (level > log_max_level)
+    if (level > pj_log_max_level)
         return;
 

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

@@ -1124 +1124 @@
     PJ_ASSERT_RETURN(mutex, PJ_EINVAL);
 
+    PJ_LOG(6,(mutex->obj_name, "Mutex: thread %s is trying", 
+                                pj_thread_this()->obj_name));
+
     status = pthread_mutex_trylock( &mutex->mutex );
 
@@ -1139 +1142 @@
                                   pj_thread_this()->obj_name));
 #endif
+    } else {
+        PJ_LOG(6,(mutex->obj_name, "Mutex: thread %s's trylock() failed", 
+                                    pj_thread_this()->obj_name));
     }
     

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

@@ -886 +886 @@
     PJ_ASSERT_RETURN(mutex, PJ_EINVAL);
 
+    PJ_LOG(6,(mutex->obj_name, "Mutex: thread %s is trying", 
+                                pj_thread_this()->obj_name));
+
 #if PJ_WIN32_WINNT >= 0x0400
     status=TryEnterCriticalSection(&mutex->crit) ? PJ_SUCCESS : PJ_EUNKNOWN;
@@ -900 +903 @@
         ++mutex->nesting_level;
 #endif
-    }
+    } else {
+        PJ_LOG(6,(mutex->obj_name, "Mutex: thread %s's trylock() failed", 
+                                    pj_thread_this()->obj_name));
+    }
+
     return status;
 }