Changeset 9 in libcf

Timestamp:

01/30/13 17:39:07 (11 years ago)

Author:

cheese

Message:

#1 add more omitted code and enhance stability

Location:

trunk

Files:

• include/cf_debug.h (modified) (3 diffs)
• src/cf_debug.c (modified) (6 diffs)

trunk/include/cf_debug.h

@@ -9 +9 @@
 #define CF_ERROR_DEBUG_INVALID_CTX          CF_ERROR_DEBUG - 1
 #define CF_ERROR_DEBUG_SET_OUTPUT_FD        CF_ERROR_DEBUG - 2
-#define CF_ERROR_DEBUG_INVALID_ARGS         CF_ERROR_DEBUG - 3
-#define CF_ERROR_DEBUG_PUSH_CALLSTACK       CF_ERROR_DEBUG - 4
-#define CF_ERROR_DEBUG_POP_CALLSTACK        CF_ERROR_DEBUG - 5
+#define CF_ERROR_DEBUG_PUSH_CALLSTACK       CF_ERROR_DEBUG - 3
+#define CF_ERROR_DEBUG_POP_CALLSTACK        CF_ERROR_DEBUG - 4
 
 #ifdef _WIN32
@@ -23 +22 @@
     CF_Debug_Trace (__ctx,__bin,__len,__fmt,##__VA_ARGS__)
 # define CF_DEBUG_CALLSTACK_PUSH(__ctx)                             \
-    CF_Debug_CallstackPush (__ctx,__func__,__LINE__)
+    CF_Debug_CallstackPush (__ctx,__FILE__,__func__,__LINE__)
 # define CF_DEBUG_CALLSTACK_POP                                     \
     CF_Debug_CallstackPop
@@ -67 +66 @@
 CF_EXPORT int
 CF_Debug_CallStackPush  (CF_Debug_Ctx   ctx,
+                         const char     * file,
                          const char     * func,
                          const int      line);

trunk/src/cf_debug.c

@@ -9 +9 @@
 #include <ctype.h>
 #include <stdarg.h>
+#include <string.h>
 
 #ifdef _WIN32
@@ -28 +29 @@
 typedef struct __cf_debug_callstack__
 {
+    char    file[NAME_LENGTH + 1];
     char    func[NAME_LENGTH + 1];
     int     line;
@@ -187 +189 @@
 int
 CF_Debug_CallStackPush (CF_Debug_Ctx    ctx,
+                        const char      * file,
                         const char      * func,
                         const int       line)
@@ -199 +202 @@
         return CF_ERROR_DEBUG_PUSH_CALLSTACK;
 
+    /* push to callstack */
+    sprintf (push->file, "%s", file);
     sprintf (push->func, "%s", func);
     push->line = line;
     push->caller = context->callstack.caller;
-
     context->callstack.caller = push;
+
+    /* set current context */
+    sprintf (context->file, "%s", file);
+    sprintf (context->func, "%s", func);
+    context->line = line;
 
     return CF_OK;
@@ -216 +225 @@
 
     CHECK_INVALID_CTX (ctx);
-
-    if (callstack == NULL)
-        return CF_ERROR_DEBUG_INVALID_ARGS;
 
     pop = context->callstack.caller;
@@ -224 +230 @@
         return CF_ERROR_DEBUG_POP_CALLSTACK;
 
-    sprintf (callstack->function, "%s", pop->func);
-    callstack->line = pop->line;
-
-    context->callstack.caller = pop->caller;
+    if (callstack != NULL)
+    {
+        sprintf (callstack->function, "%s", pop->func);
+        callstack->line = pop->line;
+    }
+
+    memset (context->file, 0x00, sizeof (context->file));
+    memset (context->func, 0x00, sizeof (context->func));
+    context->line = 0;
+
+    /* restore current context */
+    if (pop->caller != NULL)
+    {
+        sprintf (context->file, "%s", pop->caller->file);
+        sprintf (context->func, "%s", pop->caller->func);
+        context->line = pop->caller->line;
+        context->callstack.caller = pop->caller;
+    }
+
     free (pop);