Changeset 125 in libcf

Timestamp:

06/12/13 13:44:25 (11 years ago)

Author:

cheese

Message:

#1 fix mutex bugs

Location:

trunk

Files:

• src/cf_debug.c (modified) (2 diffs)
• src/cf_log.c (modified) (4 diffs)
• test/log.c (modified) (1 diff)
• test/thread.c (modified) (2 diffs)

trunk/src/cf_debug.c

@@ -391 +391 @@
     ASSERT_CTX (ctx);
 
-    CF_Mutex_Lock (&ctx->mutex);
+    CF_Mutex_Lock (ctx->mutex);
     CF_Debug_CallStackPush (gDebugSingleCtx, file, func, line);
-    CF_Mutex_Unlock (&ctx->mutex);
+    CF_Mutex_Unlock (ctx->mutex);
 
     return CF_OK;
@@ -412 +412 @@
     ASSERT_CTX (ctx);
 
-    CF_Mutex_Lock (&ctx->mutex);
+    CF_Mutex_Lock (ctx->mutex);
     CF_Debug_CallStackPop (gDebugSingleCtx, NULL);
-    CF_Mutex_Unlock (&ctx->mutex);
+    CF_Mutex_Unlock (ctx->mutex);
 
     return CF_OK;

trunk/src/cf_log.c

@@ -51 +51 @@
     if (gLogArray.ctxPool[__mapid] == NULL) \
         return CF_ERROR_LOG_NOT_MAPPED_ID
-
-#define LOCK_LOG_CTX(__ctx)             CF_Mutex_Lock (__ctx->mutex)
-#define UNLOCK_LOG_CTX(__ctx)           CF_Mutex_Unlock (__ctx->mutex)
 
 #define LOG_BUFFER_DEFAULT_SIZE         128 * 1024
@@ -314 +311 @@
     ASSERT_CTX (ctx);
 
-    LOCK_LOG_CTX (context);
+    CF_Mutex_Lock (context->mutex);
 //  va_start (valist, fmt);
 
@@ -324 +321 @@
 
 //  va_end (valist);
-    UNLOCK_LOG_CTX (context);
+    CF_Mutex_Unlock (context->mutex);
 
     return CF_OK;
@@ -343 +340 @@
     ASSERT_CTX (ctx);
 
-    LOCK_LOG_CTX (context);
+    CF_Mutex_Lock (context->mutex);
     CF_Log_Local_Flush (context);
-    UNLOCK_LOG_CTX (context);
+    CF_Mutex_Unlock (context->mutex);
 
     return CF_OK;

trunk/test/log.c

@@ -19 +19 @@
     int th = 0;
     
-    if (CF_Mutex_Lock (&globalMutex) < 0) { // for critical section
+    if (CF_Mutex_Lock (globalMutex) < 0) { // for critical section
         // error
     }
     th = cnt++;
-    if (CF_Mutex_Unlock (&globalMutex) < 0) { // for critical section
+    if (CF_Mutex_Unlock (globalMutex) < 0) { // for critical section
         // error
     }

trunk/test/thread.c

@@ -10 +10 @@
 
 int worker (void * arg) {
-    if (CF_Mutex_Lock (&globalMutex) < 0) { // for critical section
+    if (CF_Mutex_Lock (globalMutex) < 0) { // for critical section
         // error
     }
@@ -16 +16 @@
     fprintf (stderr, "here is critical section !\n");
 
-    if (CF_Mutex_Unlock (&globalMutex) < 0) { // for critical section
+    if (CF_Mutex_Unlock (globalMutex) < 0) { // for critical section
         // error
     }