Changeset 151 in libcf for trunk/test/log.c

Timestamp:

10/31/13 10:17:24 (11 years ago)

Author:

cheese

Message:

#1 fix interface and add util module

File:

• trunk/test/log.c (modified) (6 diffs)

trunk/test/log.c

@@ -10 +10 @@
 #include <stdio.h>
 
-CF_Mutex_Ctx globalMutex;
+#define COUNT   5
 
-#define LOG_MT      1
+cf_ctx  globalLog;
+cf_ctx  globalMutex;
 
-int test_log_mt (void * arg)
+int worker (void * arg)
 {
     static int cnt = 0;
@@ -32 +33 @@
     for (i = 0 ; i < 10000 ; i++)
     {
-        CF_Log_Write (LOG_MT, "LOG_MT", "[%d] multi-threadedlogging test %d\n", th, i);
+        CF_Log_Write (globalLog, "LOG_MT", "[%d] multi-threadedlogging test %d\n", th, i);
     }
 
@@ -42 +43 @@
 int main (void)
 {
-    int             i, j;
-    char            idname[16] = {0x00,};
-    CF_Thread_Ctx   tid[10];
+    int     i, j;
+    cf_ctx  tid[COUNT];
 
     /* initialize */
-    if (CF_Log_Initialize (10) < 0)
+    if (CF_Log_Create (&globalLog, "log.txt", CF_LOG_NO_BUFFER) < 0)
+        CF_DEBUG_PRINT (stderr, "failed to open log\n");
+
+    for (j = 0 ; j < 10000 ; j++)
     {
-        fprintf (stderr, "failed to init. log\n");
-        return -1;
-    }
-
-    for (i = 0 ; i < 10 ; i++)
-    {
-        sprintf (idname, "logid%d.txt", i);
-        if (CF_Log_Open (i, idname, CF_LOG_NO_BUFFER) < 0)
-            fprintf (stderr, "failed to open log\n");
-    }
-
-    for (i = 0 ; i < 10 ; i++)
-    {
-        for (j = 0 ; j < 10000 ; j++)
-        {
-            int result = CF_Log_Write (i, "LOG_ID_TEST", "turn %d\n", j); 
-            if (result < 0)
-                fprintf (stderr, "failed to write log %d\n", result);
-        }
-
-        if (CF_Log_Close (i) < 0)
-            fprintf (stderr, "failed to close log\n");
+        int result = CF_Log_Write (globalLog, "LOG_ID_TEST", "turn %d\n", j); 
+        if (result < 0)
+            CF_DEBUG_PRINT (stderr, "failed to write log %d\n", result);
     }
 
     /* mt {{{ */
-    if (CF_Log_Open (LOG_MT, "log_mt.txt", CF_LOG_DEFAULT_BUFFER) < 0)
+    if (CF_Log_Create (&globalLog, "log_mt.txt", CF_LOG_NO_BUFFER) < 0)
         CF_DEBUG_PRINT (stderr, "create log ctx error\n");
 
-    if (CF_Log_SetMT (LOG_MT, CF_TRUE) < 0)
-        CF_DEBUG_PRINT (stderr, "set multi-threading mode error\n");
-
-    if (CF_Mutex_CreateCtx (&globalMutex) < 0) {
+    if (CF_Mutex_Create (&globalMutex) < 0) {
         // error
     }
 
-    for (i = 0 ; i < 10 ; i++)
+    if (CF_Log_SetMultiThread (globalLog) < 0)
+        CF_DEBUG_PRINT (stderr, "set multi-threading mode error\n");
+
+    for (i = 0 ; i < COUNT ; i++)
     {
-        if (CF_Thread_CreateCtx (&tid[i], test_log_mt, &i) < 0)
+        if (CF_Thread_Create (&tid[i], worker, &i) < 0)
         {
             CF_DEBUG_PRINT (stderr, "failed to create %dth thread\n", i);
@@ -93 +77 @@
     }
 
-    for (i = 0 ; i < 10 ; i++)
+    for (i = 0 ; i < COUNT ; i++)
     {
         if (CF_Thread_Start (tid[i]) < 0)
@@ -102 +86 @@
     }
 
-    for (i = 0 ; i < 10 ; i++)
+    for (i = 0 ; i < COUNT ; i++)
     {
         if (CF_Thread_Join (tid[i]) < 0)
             CF_DEBUG_PRINT (stderr, "failed to join %dth thread\n", i);
-        if (CF_Thread_DestroyCtx (tid[i]) < 0)
+        if (CF_Thread_Destroy (tid[i]) < 0)
             CF_DEBUG_PRINT (stderr, "failed to release %dth thread\n", i);
     }
 
-    if (CF_Mutex_DestoryCtx (globalMutex) < 0) {
+    if (CF_Log_UnsetMultiThread (globalLog) < 0)
+        CF_DEBUG_PRINT (stderr, "set multi-threading mode error\n");
+
+    if (CF_Mutex_Destory (globalMutex) < 0) {
         // error
     }
@@ -116 +103 @@
 
     /* finalize */
-    CF_Log_Finalize ();
+    CF_Log_Destroy (globalLog);
 
     return 0;