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

Timestamp:

04/02/13 10:23:52 (11 years ago)

Author:

cheese

Message:

#1 change the debugging utiltity to support single context with mutex

File:

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

trunk/src/cf_log.c

@@ -30 +30 @@
 #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 CHECK_INITIALIZED()             (gLogArray.ctxPool == NULL||    \
+                                         gLogArray.ctxSize <= 0 )
+#define CHECK_INVALID_MAPID(__mapid)    (gLogArray.ctxSize <= __mapid)
+#define CHECK_MAPPED_ID(__mapid)        (gLogArray.ctxPool[__mapid] != NULL)
 
 #define LOG_BUFFER_DEFAULT_SIZE         128 * 1024
 
-#define LOG_DATETIME_LENGTH         sizeof ("0000-00-00 00:00:00.000") - 1
+#define LOG_DATETIME_LENGTH             sizeof ("0000-00-00 00:00:00.000") - 1
 
 /**
@@ -69 +68 @@
 } S_CF_LOG_CTX, CF_LOG_CTX;
 
-typedef struct __cf_log_environment__ {
+typedef struct __cf_log_array__ {
     CF_Log_Ctx  * ctxPool;
     int         ctxSize;
-} S_CF_LOG_ENVIRONMENT, CF_LOG_ENVIRONMENT;
-
-static CF_LOG_ENVIRONMENT   gLogEnvironment;
+} S_CF_LOG_ARRAY, CF_LOG_ARRAY;
+
+static CF_LOG_ARRAY gLogArray;
 
 #if defined(_WIN32) || defined(_WIN64)
@@ -475 +474 @@
     }
 
-    gLogEnvironment.ctxPool[mapid] = ctx;
+    gLogArray.ctxPool[mapid] = ctx;
 
     return CF_OK;
@@ -501 +500 @@
         return CF_ERROR_LOG_NOT_MAPPED_ID;
 
-    CF_Log_DestroyCtx (gLogEnvironment.ctxPool[mapid]);
-
-    free (gLogEnvironment.ctxPool[mapid]);
-    gLogEnvironment.ctxPool[mapid] = NULL;
+    CF_Log_DestroyCtx (gLogArray.ctxPool[mapid]);
+
+    free (gLogArray.ctxPool[mapid]);
+    gLogArray.ctxPool[mapid] = NULL;
 
     return CF_OK;
@@ -528 +527 @@
         return CF_ERROR_LOG_NOT_MAPPED_ID;
 
-    *ctx = gLogEnvironment.ctxPool[mapid];
+    *ctx = gLogArray.ctxPool[mapid];
 
     return CF_OK;
@@ -543 +542 @@
 CF_Log_Initialize (const int logPool)
 {
-    memset (&gLogEnvironment, 0x00, sizeof (CF_LOG_ENVIRONMENT));
+    memset (&gLogArray, 0x00, sizeof (CF_LOG_ARRAY));
 
     if (logPool > 0)
     {
-        gLogEnvironment.ctxPool =
+        gLogArray.ctxPool =
             (CF_Log_Ctx *) calloc ((size_t) logPool, sizeof (CF_Log_Ctx));
-        if (gLogEnvironment.ctxPool == NULL)
+        if (gLogArray.ctxPool == NULL)
             return CF_ERROR_LOG_INITIALIZE;
-        gLogEnvironment.ctxSize = logPool;
+        gLogArray.ctxSize = logPool;
     }
 
@@ -567 +566 @@
     int mapid = 0;
 
-    for (mapid = 0 ; mapid < gLogEnvironment.ctxSize ; mapid++)
+    for (mapid = 0 ; mapid < gLogArray.ctxSize ; mapid++)
     {
         CF_Log_UnmapCtxID (mapid);
     }
 
-    if (gLogEnvironment.ctxPool != NULL)
-        free (gLogEnvironment.ctxPool);
-
-    memset (&gLogEnvironment, 0x00, sizeof (CF_LOG_ENVIRONMENT));
+    if (gLogArray.ctxPool != NULL)
+        free (gLogArray.ctxPool);
+
+    memset (&gLogArray, 0x00, sizeof (CF_LOG_ARRAY));
 
     return CF_OK;