Changeset 64 in libcf

Timestamp:

04/10/13 17:32:58 (11 years ago)

Author:

cheese

Message:

#1 arrange test code

Location:

trunk

Files:

• include/cf_debug.h (modified) (7 diffs)
• src/cf_log.c (modified) (1 diff)
• test/debug.c (modified) (2 diffs)
• test/test.c (modified) (7 diffs)

trunk/include/cf_debug.h

@@ -37 +37 @@
  * @see CF_Debug_Print
  */
-# define CF_DEBUG_PRINT(__fp,__fmt,...)                             \
+# define CF_DEBUG_PRINT(__fp,__fmt,...) \
     CF_Debug_Print (__fp,__FILE__,__func__,__LINE__,__fmt,##__VA_ARGS__)
 
@@ -51 +51 @@
  * @see CF_Debug_PrintBin
  */
-# define CF_DEBUG_PRINT_BIN(__fp,__bin,__len,__fmt,...)             \
+# define CF_DEBUG_PRINT_BIN(__fp,__bin,__len,__fmt,...) \
     CF_Debug_PrintBin (__fp,__FILE__,__func__,__LINE__,__bin,__len,__fmt,##__VA_ARGS__)
 
@@ -59 +59 @@
  * @see CF_Debug_Initialize
  */
-# define CF_DEBUG_INITIALIZE                                        \
+# define CF_DEBUG_INITIALIZE    \
     CF_Debug_Initialize ()
 
@@ -67 +67 @@
  * @see CF_Debug_Finalize
  */
-# define CF_DEBUG_FINALIZE                                          \
+# define CF_DEBUG_FINALIZE  \
     CF_Debug_Finalize ()
 
@@ -75 +75 @@
  * @see CF_Debug_EnterFunction
  */
-# define CF_DEBUG_BEGIN_FUNCTION                                    \
+# define CF_DEBUG_BEGIN_FUNCTION    \
     CF_Debug_EnterFunction (__FILE__,__func__,__LINE__)
 
@@ -83 +83 @@
  * @see CF_Debug_LeaveFunction
  */
-# define CF_DEBUG_END_FUNCTION                                      \
+# define CF_DEBUG_END_FUNCTION  \
     CF_Debug_LeaveFunction ()
 
@@ -91 +91 @@
  * @see CF_Debug_PrintCallStack
  */
-# define CF_DEBUG_PRINT_CALLSTACK(__fp)                             \
+# define CF_DEBUG_PRINT_CALLSTACK(__fp) \
     CF_Debug_PrintCallStack (__fp)
 

trunk/src/cf_log.c

@@ -198 +198 @@
     int result = CF_OK;
 
-    if( ctx->size > 0 ) /* 버퍼단위 버퍼링.... */
+    if (ctx->size > 0) /* 버퍼단위 버퍼링.... */
     {
         size_t writeSize;

trunk/test/debug.c

@@ -9 +9 @@
 #include <string.h>
 
-void callee (void) {
+void callee3 (void) {
+    // ...
+
     CF_DEBUG_BEGIN_FUNCTION;
+    CF_DEBUG_PRINT_CALLSTACK (stdout);
+    CF_DEBUG_END_FUNCTION;
 
-    CF_DEBUG_PRINT_CALLSTACK (stdout);
+    // ...
+}
 
+void callee2 (void) {
+    // ...
+
+    CF_DEBUG_BEGIN_FUNCTION;
+    callee3 ();
     CF_DEBUG_END_FUNCTION;
+
+    // ...
+}
+
+void callee1 (void) {
+    // ...
+
+    CF_DEBUG_BEGIN_FUNCTION;
+    callee2 ();
+    CF_DEBUG_END_FUNCTION;
+
+    // ...
 }
 
@@ -24 +46 @@
 
     CF_DEBUG_INITIALIZE;
-    CF_DEBUG_BEGIN_FUNCTION;
 
     CF_DEBUG_PRINT (stderr, "print message with context to stderr\n");
 
-    CF_DEBUG_PRINT_BIN (stdout, (unsigned char *) data, (int) sizeof (data), "hehehehe\n");
+    CF_DEBUG_PRINT_BIN (stdout, (unsigned char *) data, (int) sizeof (data), "data : \n%s", data);
 
-    callee ();
+    CF_DEBUG_BEGIN_FUNCTION;
+    callee1 ();
+    CF_DEBUG_END_FUNCTION;
 
-    CF_DEBUG_END_FUNCTION;
     CF_DEBUG_FINALIZE;
 

trunk/test/test.c

@@ -42 +42 @@
 {
     CF_DEBUG_INITIALIZE;
-    CF_DEBUG_BEGIN_FUNCTION;
 
     // 1
@@ -54 +53 @@
     // 3
     CF_DEBUG_PRINT (stderr, " == CALLSTACK TEST ==\n");
+    CF_DEBUG_BEGIN_FUNCTION;
     test_callstack1 ();
+    CF_DEBUG_END_FUNCTION;
 
     // 4
@@ -62 +63 @@
     CF_DEBUG_PRINT (stderr, " == END OF TEST ==\n");
 
-    CF_DEBUG_END_FUNCTION;
     CF_DEBUG_FINALIZE;
 
@@ -100 +100 @@
     CF_Thread   tid[10];
 
-    CF_DEBUG_BEGIN_FUNCTION;
-
     /* initialize */
     if (CF_Log_Initialize (10) < 0)
@@ -164 +162 @@
     /* finalize */
     CF_Log_Finalize ();
-
-    CF_DEBUG_END_FUNCTION;
 }
 
@@ -172 +168 @@
     int     fd = 0;
     char    buffer[128] = {0x00,};
-
-    CF_DEBUG_BEGIN_FUNCTION;
 
     fd = CF_File_Open (file, CF_FILE_RO);
@@ -189 +183 @@
 
     CF_File_Close (fd);
-
+}
+
+void test_callstack3 (void)
+{
+    // ...
+
+    CF_DEBUG_BEGIN_FUNCTION;
+    CF_DEBUG_PRINT_CALLSTACK (stderr);
     CF_DEBUG_END_FUNCTION;
-}
-
-void test_callstack3 (void)
-{
-    CF_DEBUG_BEGIN_FUNCTION;
-    CF_DEBUG_PRINT_CALLSTACK (stdout);
-    CF_DEBUG_END_FUNCTION;
+
+    // ...
 }
 void test_callstack2 (void)
 {
+    // ...
+
     CF_DEBUG_BEGIN_FUNCTION;
     test_callstack3 ();
     CF_DEBUG_END_FUNCTION;
+
+    // ...
 }
 void test_callstack1 (void)
 {
+    // ...
+
     CF_DEBUG_BEGIN_FUNCTION;
     test_callstack2 ();
     CF_DEBUG_END_FUNCTION;
+
+    // ...
 }