Changeset 51 in libcf for trunk/test/test.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/test/test.c (modified) (6 diffs)

trunk/test/test.c

@@ -22 +22 @@
 #define PORT        1234
 
-CF_Debug_Ctx        gDebugCtx;
-CF_Debug_CallStack  gDebugCallstack;
 CF_Mutex            globalMutex;
 
@@ -63 +61 @@
     CF_Thread   tid[10];
 
-    CF_DEBUG_CALLSTACK_PUSH (gDebugCtx);
+    CF_DEBUG_BEGIN_FUNCTION;
 
     /* initialize */
@@ -125 +123 @@
     /* finalize */
     CF_Log_Finalize ();
+
+    CF_DEBUG_END_FUNCTION;
 }
 
@@ -132 +132 @@
     char    buffer[128] = {0x00,};
 
-    CF_DEBUG_CALLSTACK_PUSH (gDebugCtx);
+    CF_DEBUG_BEGIN_FUNCTION;
 
     fd = CF_File_Open (file, CF_FILE_RO);
     if (fd < 0)
-        CF_DEBUG_TRACE (gDebugCtx, "what the ... file open ?\n");
+        CF_DEBUG_PRINT (stderr, "what the ... file open ?\n");
 
     if (CF_File_Read (fd, buffer, sizeof (buffer)) < 0)
-        CF_DEBUG_TRACE (gDebugCtx, "what the ... file read ?\n");
+        CF_DEBUG_PRINT (stderr, "what the ... file read ?\n");
     else
-        CF_DEBUG_TRACE_BIN (gDebugCtx, (unsigned char *)buffer,
-                                        sizeof (buffer),
-                                        "-- %d bytes of %d bytes\n",
-                                        sizeof (buffer),
-                                        CF_File_GetSize (fd));
+        CF_DEBUG_PRINT_BIN (stdout, (unsigned char *)buffer,
+                                    sizeof (buffer),
+                                    "-- %d bytes of %d bytes\n",
+                                    sizeof (buffer),
+                                    CF_File_GetSize (fd));
 
     CF_File_Close (fd);
 
-    CF_DEBUG_CALLSTACK_POP (gDebugCtx, NULL);
+    CF_DEBUG_END_FUNCTION;
 }
 
 void test_callstack3 (void)
 {
-    CF_DEBUG_CALLSTACK_PUSH (gDebugCtx);
-    while (CF_DEBUG_CALLSTACK_POP (gDebugCtx, &gDebugCallstack) == CF_OK)
-    {
-        CF_DEBUG_TRACE (gDebugCtx, "print callstack [file:%s line:%d func:%s]\n",
-                                    gDebugCallstack.file,
-                                    gDebugCallstack.line,
-                                    gDebugCallstack.function);
-    }
-    CF_DEBUG_CALLSTACK_POP (gDebugCtx, NULL);
+    CF_DEBUG_BEGIN_FUNCTION;
+    CF_Debug_PrintCallStack (stdout);
+    CF_DEBUG_END_FUNCTION;
 }
 void test_callstack2 (void)
 {
-    CF_DEBUG_CALLSTACK_PUSH (gDebugCtx);
+    CF_DEBUG_BEGIN_FUNCTION;
     test_callstack3 ();
-    CF_DEBUG_CALLSTACK_POP (gDebugCtx, NULL);
+    CF_DEBUG_END_FUNCTION;
 }
 void test_callstack1 (void)
 {
-    CF_DEBUG_CALLSTACK_PUSH (gDebugCtx);
+    CF_DEBUG_BEGIN_FUNCTION;
     test_callstack2 ();
-    CF_DEBUG_CALLSTACK_POP (gDebugCtx, NULL);
+    CF_DEBUG_END_FUNCTION;
 }
 
@@ -333 +327 @@
 int main (int argc, char ** argv)
 {
-    gDebugCtx = CF_Debug_CreateCtx ();
-
-    CF_DEBUG_CALLSTACK_PUSH (gDebugCtx);
+    CF_DEBUG_BEGIN_FUNCTION;
 
     // 1
@@ -353 +345 @@
     test_socket ();
 
-    CF_DEBUG_CALLSTACK_POP (gDebugCtx, &gDebugCallstack);
-
     CF_DEBUG_PRINT (stderr, " == END OF TEST ==\n");
-    CF_DEBUG_TRACE (gDebugCtx, "here is the end of function [file:%s line:%d func:%s]\n",
-                                gDebugCallstack.file,
-                                gDebugCallstack.line,
-                                gDebugCallstack.function);
-
-    CF_Debug_DestroyCtx (gDebugCtx);
+
+    CF_DEBUG_END_FUNCTION;
 
     return 0;