Changeset 25 in libcf for trunk/src/cf_log.c

Timestamp:

02/02/13 17:27:06 (11 years ago)

Author:

cheese

Message:

#1 fix logging bug and debugging macros

File:

• trunk/src/cf_log.c (modified) (8 diffs)

trunk/src/cf_log.c

@@ -24 +24 @@
 #endif // #ifdef _WIN32
 
-#define CHECK_INVALID_CTX(__ctx)                \
-    if (__ctx == NULL)                          \
-        return CF_ERROR_LOG_INVALID_CTX
-
-#define LOCK_LOG_CTX(__ctx)                     \
-    CF_Mutex_Lock (&__ctx->mutex)
-
-#define UNLOCK_LOG_CTX(__ctx)                   \
-    CF_Mutex_Unlock (&__ctx->mutex)
+#define CHECK_INVALID_CTX(__ctx)        (__ctx == NULL)
+#define LOCK_LOG_CTX(__ctx)             CF_Mutex_Lock (&__ctx->mutex)
+#define UNLOCK_LOG_CTX(__ctx)           CF_Mutex_Unlock (&__ctx->mutex)
+#define CHECK_INITIALIZED()             (gLogEnvironment.ctxPool == NULL||  \
+                                         gLogEnvironment.ctxSize <= 0   )
+#define CHECK_INVALID_MAPID(__mapid)    (gLogEnvironment.ctxSize <= __mapid)
+#define CHECK_MAPPED_ID(__mapid)        (gLogEnvironment.ctxPool[__mapid] != NULL)  \
+
 
 #define CF_LOG_BUFFER_DEFAULT_SIZE      128 * 1024
@@ -271 +270 @@
     CF_LOG_CTX * context = (CF_LOG_CTX *) ctx;
 
-    CHECK_INVALID_CTX (ctx);
+    if (CHECK_INVALID_CTX (ctx))
+        return CF_ERROR_LOG_INVALID_CTX;
 
     memset (context->path, 0x00, sizeof (context->path));
@@ -301 +301 @@
     CF_LOG_CTX * context = (CF_LOG_CTX *) ctx;
 
-    CHECK_INVALID_CTX (ctx);
+    if (CHECK_INVALID_CTX (ctx))
+        return CF_ERROR_LOG_INVALID_CTX;
 
     if (CF_Mutex_Create (&context->mutex) < 0)
@@ -314 +315 @@
     CF_LOG_CTX * context = (CF_LOG_CTX *) ctx;
 
-    CHECK_INVALID_CTX (ctx);
+    if (CHECK_INVALID_CTX (ctx))
+        return CF_ERROR_LOG_INVALID_CTX;
 
     if (CF_Mutex_Destory (&context->mutex) < 0)
@@ -332 +334 @@
     size_t      length = 0;
 
-    CHECK_INVALID_CTX (ctx);
+    if (CHECK_INVALID_CTX (ctx))
+        return CF_ERROR_LOG_INVALID_CTX;
 
     LOCK_LOG_CTX (context);
@@ -375 +378 @@
     CF_LOG_CTX * context = (CF_LOG_CTX *) ctx;
 
-    CHECK_INVALID_CTX (ctx);
+    if (CHECK_INVALID_CTX (ctx))
+        return CF_ERROR_LOG_INVALID_CTX;
 
     LOCK_LOG_CTX (context);
@@ -388 +392 @@
                  const CF_Log_Ctx   ctx)
 {
-    if (gLogEnvironment.ctxPool == NULL || gLogEnvironment.ctxSize <= 0)
+    int result = 0;
+
+    TRY
+    {
+        if (CHECK_INITIALIZED())
+        {
+            result = CF_ERROR_LOG_NOT_INITIALIZE;
+            TRY_BREAK;
+        }
+        if (CHECK_INVALID_MAPID(mapid))
+        {
+            result = CF_ERROR_LOG_INVALID_MAPID;
+            TRY_BREAK;
+        }
+        if (CHECK_MAPPED_ID(mapid))
+        {
+            result = CF_ERROR_LOG_ALREADY_MAPPED_ID;
+            TRY_BREAK;
+        }
+    }
+    CATCH_IF (result < 0)
+    {
+        CF_Log_DestroyCtx (ctx);
+        return result;
+    }
+
+    gLogEnvironment.ctxPool[mapid] = ctx;
+
+    return CF_OK;
+}
+
+int
+CF_Log_UnmapCtxID (const int mapid)
+{
+    if (CHECK_INITIALIZED())
         return CF_ERROR_LOG_NOT_INITIALIZE;
-
-    if (gLogEnvironment.ctxPool[mapid] != NULL)
-        return CF_ERROR_LOG_ALREADY_MAPPED_ID;
-
-    gLogEnvironment.ctxPool[mapid] = ctx;
-
-    return CF_OK;
-}
-
-int
-CF_Log_UnmapCtxID (const int mapid)
-{
-    if (gLogEnvironment.ctxPool == NULL || gLogEnvironment.ctxSize <= 0)
-        return CF_ERROR_LOG_NOT_INITIALIZE;
-
-    if (gLogEnvironment.ctxPool[mapid] == NULL)
+    if (CHECK_INVALID_MAPID(mapid))
+        return CF_ERROR_LOG_INVALID_MAPID;
+    if (!CHECK_MAPPED_ID(mapid))
         return CF_ERROR_LOG_NOT_MAPPED_ID;
 
@@ -419 +444 @@
 CF_Log_GetMappedCtx (const int mapid)
 {
-    if (gLogEnvironment.ctxPool == NULL || gLogEnvironment.ctxSize <= 0)
+    if (CHECK_INITIALIZED())
         return NULL;
+    if (CHECK_INVALID_MAPID(mapid))
+        return NULL;
+    if (!CHECK_MAPPED_ID(mapid))
+        return NULL;
 
     return gLogEnvironment.ctxPool[mapid];