Changeset 105 in libcf

Timestamp:

05/29/13 14:10:04 (11 years ago)

Author:

cheese

Message:

#1 remove integrated test code

Location:

trunk

Files:

• include/cf_base.h (modified) (1 diff)
• test/log.c (modified) (3 diffs)
• test/makefile (modified) (3 diffs)
• test/socket.c (added)
• test/socket_client.c (deleted)
• test/socket_server.c (deleted)
• test/test.c (deleted)
• windows/test/test.vcproj (modified) (1 diff)

trunk/include/cf_base.h

@@ -5 +5 @@
  *
  * @remarks 기본 정의
- *
- * @example test.c
  *
  * @mainpage

trunk/test/log.c

@@ -4 +4 @@
  */
 #include "cf_log.h"
+#include "cf_thread.h"
+#include "cf_debug.h"
+
 #include <stdio.h>
+
+CF_Mutex globalMutex;
+
+#define LOG_MT      1
+
+int test_log_mt (void * arg)
+{
+    static int cnt = 0;
+    int i = 0;
+    int th = 0;
+    
+    if (CF_Mutex_Lock (&globalMutex) < 0) { // for critical section
+        // error
+    }
+    th = cnt++;
+    if (CF_Mutex_Unlock (&globalMutex) < 0) { // for critical section
+        // error
+    }
+
+    CF_DEBUG_PRINT (stderr, "created %dth thread\n", th);
+
+    for (i = 0 ; i < 100000 ; i++)
+    {
+        CF_Log_Write (LOG_MT, "LOG_MT", "[%d] multi-threadedlogging test %d\n", th, i);
+    }
+
+    CF_DEBUG_PRINT (stderr, "end %dth thread\n", th);
+
+    return 0;
+}
 
 int main (void)
 {
     int         i, j;
-    char        logname[16] = {0x00,};
+    char        idname[16] = {0x00,};
+    CF_Thread   tid[10];
 
-    if (CF_Log_Initialize (10, CF_LOG_NO_LEVEL) < 0)
+    /* initialize */
+    if (CF_Log_Initialize (10, 2) < 0)
     {
         fprintf (stderr, "failed to init. log\n");
@@ -19 +54 @@
     for (i = 0 ; i < 10 ; i++)
     {
-        sprintf (logname, "logid%d.txt", i);
-        if (CF_Log_Open (i, logname, CF_LOG_NO_BUFFER) < 0)
+        sprintf (idname, "logid%d.txt", i);
+        if (CF_Log_Open (i, idname, CF_LOG_NO_BUFFER) < 0)
             fprintf (stderr, "failed to open log\n");
     }
@@ -37 +72 @@
     }
 
+    /* mt {{{ */
+    if (CF_Log_Open (LOG_MT, "log_mt.txt", CF_LOG_DEFAULT_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_Create (&globalMutex) < 0) {
+        // error
+    }
+
+    for (i = 0 ; i < 10 ; i++)
+    {
+        if (CF_Thread_Create (&tid[i], test_log_mt, &i) < 0)
+        {
+            CF_DEBUG_PRINT (stderr, "failed to create %dth thread\n", i);
+            return -2;
+        }
+    }
+
+    for (i = 0 ; i < 10 ; i++)
+    {
+        if (CF_Thread_Join (&tid[i]) < 0)
+            CF_DEBUG_PRINT (stderr, "failed to join %dth thread\n", i);
+        if (CF_Thread_Release (&tid[i]) < 0)
+            CF_DEBUG_PRINT (stderr, "failed to release %dth thread\n", i);
+    }
+
+    if (CF_Mutex_Destory (&globalMutex) < 0) {
+        // error
+    }
+    /* }}} mt */
+
+    /* finalize */
     CF_Log_Finalize ();
 

trunk/test/makefile

@@ -8 +8 @@
 # env
 #----------------------------------------------------------
-FILES           =   \
-                    test            \
-
-TARGET_NAME     = test
-
 TARGET_PATH     = ../_build
 OBJ_PATH        = ../_obj
-TARGET          = $(TARGET_PATH)/$(TARGET_NAME).$(EXT_EXECUTE)
-SRCS            = $(addsuffix .$(SOURCE_TYPE),$(FILES))
-OBJS            = $(addprefix $(OBJ_PATH)/,$(addsuffix .o,$(FILES)))
 
 INCLUDES        = -I../include
@@ -27 +19 @@
 # label
 #----------------------------------------------------------
-all: dep $(TARGET)
+all: dep
     @echo ========== Complete CHEROXY compilation ==========
 dep: $(OBJ_PATH) $(TARGET_PATH) $(LIB_CF) 
@@ -37 +29 @@
 $(LIB_CF): dummy
     cd ../src; make all;
+
+test:
+    make $(shell ls *.c | awk -F. '{ print $$1 }')
 
 %: %.c

trunk/windows/test/test.vcproj

@@ -174 +174 @@
             >
             <File
-                RelativePath="..\..\test\test.c"
+                RelativePath="..\..\test\codec.c"
+                >
+            </File>
+            <File
+                RelativePath="..\..\test\debug.c"
+                >
+            </File>
+            <File
+                RelativePath="..\..\test\file.c"
+                >
+            </File>
+            <File
+                RelativePath="..\..\test\log.c"
+                >
+            </File>
+            <File
+                RelativePath="..\..\test\socket.c"
+                >
+            </File>
+            <File
+                RelativePath="..\..\test\thread.c"
                 >
             </File>