Changeset 14 in libcf

Timestamp:

01/31/13 22:55:37 (11 years ago)

Author:

cheese

Message:

#1 add test code and fix debug and logging error

Location:

trunk

Files:

• include/cf_debug.h (modified) (3 diffs)
• src/cf_debug.c (modified) (6 diffs)
• src/cf_file.c (modified) (2 diffs)
• src/cf_log.c (modified) (5 diffs)
• src/makefile (modified) (2 diffs)
• test (added)
• test/makefile (added)
• test/test.c (added)
• windows/libcf.ln (deleted)
• windows/libcf.sln (modified) (2 diffs)
• windows/libcf/libcf.vcproj (modified) (2 diffs)
• windows/test (added)
• windows/test/test.vcproj (added)

trunk/include/cf_debug.h

@@ -17 +17 @@
 
 #ifdef _DEBUG
+# define CF_UPDATE_CTX(__ctx)                                       \
+    CF_Debug_UpdateCtx (__ctx,__FILE__,__func__,__LINE__)
 # define CF_DEBUG_TRACE(__ctx,__fmt,...)                            \
-    CF_Debug_Trace (__ctx,__fmt,##__VA_ARGS__)
+    do {                                                            \
+    CF_UPDATE_CTX (__ctx);                                          \
+    CF_Debug_Trace (__ctx,__fmt,##__VA_ARGS__);                     \
+    } while (0)
 # define CF_DEBUG_TRACE_BIN(__ctx,__bin,__len,__fmt,...)            \
-    CF_Debug_Trace (__ctx,__bin,__len,__fmt,##__VA_ARGS__)
+    do {                                                            \
+    CF_UPDATE_CTX (__ctx);                                          \
+    CF_Debug_Trace (__ctx,__bin,__len,__fmt,##__VA_ARGS__);         \
+    } while (0)
 # define CF_DEBUG_CALLSTACK_PUSH(__ctx)                             \
-    CF_Debug_CallstackPush (__ctx,__FILE__,__func__,__LINE__)
+    CF_Debug_CallStackPush (__ctx,__FILE__,__func__,__LINE__)
 # define CF_DEBUG_CALLSTACK_POP                                     \
-    CF_Debug_CallstackPop
+    CF_Debug_CallStackPop
 #else // #ifdef _DEBUG
+# define CF_UPDATE_CTX(__ctx)
 # define CF_DEBUG_TRACE(__ctx,__fmt,...)
 # define CF_DEBUG_TRACE_BIN(__ctx,__bin,__len,__fmt,...)
@@ -34 +43 @@
 typedef void *  CF_Debug_Ctx;
 typedef struct cf_debug_callStack {
+    char    file[NAME_LENGTH + 1];
     char    function[NAME_LENGTH + 1];
     int     line;
@@ -51 +61 @@
 CF_Debug_SetOutputFD    (CF_Debug_Ctx   ctx,
                          int            fd);
+
+CF_EXPORT int
+CF_Debug_UpdateCtx      (CF_Debug_Ctx   ctx,
+                         const char     * file,
+                         const char     * func,
+                         const int      line);
 
 CF_EXPORT int

trunk/src/cf_debug.c

@@ -49 +49 @@
 } S_CF_DEBUG_CTX, CF_DEBUG_CTX;
 
-void
+int
 CF_Debug_Local_Print (CF_DEBUG_CTX  * ctx,
                       const char    * fmt,
                       va_list       valist)
 {
-    fprintf (GET_CTX_OSTREAM (ctx), "[DEBUG][%s %s(%d)] ",
+    fprintf (GET_CTX_OSTREAM (ctx), "[DEBUG][%s:%d][%s] ",
                                     ctx->file,
-                                    ctx->func,
-                                    ctx->line);
+                                    ctx->line,
+                                    ctx->func);
     vfprintf (GET_CTX_OSTREAM (ctx), fmt, valist);
+
+    return CF_OK;
 }
 
@@ -129 +131 @@
         return CF_ERROR_DEBUG_SET_OUTPUT_FD;
     }
+
+    return CF_OK;
+}
+
+int
+CF_Debug_UpdateCtx (CF_Debug_Ctx    ctx,
+                    const char      * file,
+                    const char      * func,
+                    const int       line)
+{
+    CF_DEBUG_CTX * context = (CF_DEBUG_CTX *) ctx;
+
+    CHECK_INVALID_CTX (ctx);
+
+    strncpy (context->file, file, strlen (file));
+    strncpy (context->func, func, strlen (func));
+    context->line = line;
 
     return CF_OK;
@@ -154 +173 @@
                    const char           * fmt, ...)
 {
-    int             i, j;
-    va_list         valist;
-    FILE            * fp = GET_CTX_OSTREAM (ctx);
-
-    CHECK_INVALID_CTX (ctx);
+    int     i, j;
+    va_list valist;
+    FILE    * fp = NULL;
+
+    CHECK_INVALID_CTX (ctx);
+    fp = GET_CTX_OSTREAM (ctx); 
 
     va_start (valist, fmt);
@@ -210 +230 @@
     context->callstack.caller = push;
 
-    /* set current context */
-    sprintf (context->file, "%s", file);
-    sprintf (context->func, "%s", func);
-    context->line = line;
+    CF_Debug_UpdateCtx (ctx, file, func, line);
 
     return CF_OK;
@@ -233 +250 @@
     if (callstack != NULL)
     {
+        sprintf (callstack->file    , "%s", pop->file);
         sprintf (callstack->function, "%s", pop->func);
         callstack->line = pop->line;
@@ -244 +262 @@
     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;
-    }
-
+        CF_Debug_UpdateCtx (ctx,
+                            pop->caller->file,
+                            pop->caller->func, 
+                            pop->caller->line);
+    }
+
+    context->callstack.caller = pop->caller;
     free (pop);
 

trunk/src/cf_file.c

@@ -5 +5 @@
 
 #ifdef _WIN32
+# include <stdio.h>
 # include <io.h>
-# include <stdio.h>
+# include <sys/stat.h>
+
+# define S_IWUSR        _S_IWRITE
+# define S_IRUSR        _S_IREAD
+# define S_IXUSR        _S_IEXEC
+# define S_IRGRP        0x00000000
+# define S_IWGRP        0x00000000
+# define S_IXGRP        0x00000000
+# define S_IROTH        0x00000000
+# define S_IWOTH        0x00000000
+# define S_IXOTH        0x00000000
 #else // #ifdef _WIN32
 # include <unistd.h>
@@ -26 +37 @@
 CF_File_Create (const char * path)
 {
-    int result = open (path, O_CREAT | O_WRONLY | O_TRUNC, 0);
+    int result = open (path, O_CREAT | O_WRONLY | O_TRUNC, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
 
     if (result < 0)

trunk/src/cf_log.c

@@ -2 +2 @@
  * cf_log.c
  */
+#ifdef _WIN32
+# define _USE_32BIT_TIME_T
+#endif
+
 #include "cf_log.h"
 #include "cf_file.h"
@@ -14 +18 @@
 
 #ifdef _WIN32
+# define snprintf       _snprintf
 # include <Windows.h>
 #else // #ifdef _WIN32
@@ -24 +29 @@
 
 #define LOCK_LOG_CTX(__ctx)                     \
-    if (CF_Mutex_Lock (&__ctx->mutex) < 0)      \
-        return CF_ERROR_LOG_LOCK_CTX
+    CF_Mutex_Lock (&__ctx->mutex)
 
 #define UNLOCK_LOG_CTX(__ctx)                   \
-    if (CF_Mutex_Unlock (&__ctx->mutex) < 0)    \
-        return CF_ERROR_LOG_UNLOCK_CTX
+    CF_Mutex_Unlock (&__ctx->mutex)
 
 #define CF_LOG_BUFFER_DEFAULT_SIZE      128 * 1024
@@ -146 +149 @@
     CF_Log_Local_GetTime (&dt);
 
-    sprintf (buffer, "%02d-%02d-%02d %02d:%02d:%02d.%03d",
-                     dt.year, dt.month, dt.day, 
-                     dt.hour, dt.min, dt.sec, dt.usec);
+    
+
+    snprintf (buffer, strlen ("0000-00-00 00:00:00.000"),
+              "%02d-%02d-%02d %02d:%02d:%02d.%03d",
+              dt.year, dt.month, dt.day,
+              dt.hour, dt.min, dt.sec, dt.usec);
 
     return CF_OK;
@@ -287 +293 @@
     if (context->buffer != NULL)
     {
-        /* FIXME : write residual data in buffer */
-
+        CF_Log_Flush (ctx);
         free (context->buffer);
         context->buffer = NULL;

trunk/src/makefile

@@ -43 +43 @@
                     cf_log          \
 
-LIB_NAME        = cf
+TARGET_NAME     = cf
 
 CC              = gcc
@@ -57 +57 @@
 TARGET_PATH     = ../_build
 OBJ_PATH        = ../_obj
-TARGET          = $(TARGET_PATH)/lib$(LIB_NAME).$(EXT_SHARED)
+TARGET          = $(TARGET_PATH)/lib$(TARGET_NAME).$(EXT_SHARED)
 SRCS            = $(addsuffix .$(SOURCE_TYPE),$(FILES))
 OBJS            = $(addprefix $(OBJ_PATH)/,$(addsuffix .o,$(FILES)))

trunk/windows/libcf.sln

@@ -2 +2 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcf", "libcf/libcf.vcproj", "{E5FB2D95-3841-464C-B23F-94ADA4499FE6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCF", "libcf\libcf.vcproj", "{E5FB2D95-3841-464C-B23F-94ADA4499FE6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcproj", "{D344FA91-7B7A-4390-9CA5-E1ABCCECA3A2}"
+    ProjectSection(ProjectDependencies) = postProject
+        {E5FB2D95-3841-464C-B23F-94ADA4499FE6} = {E5FB2D95-3841-464C-B23F-94ADA4499FE6}
+    EndProjectSection
 EndProject
 Global
@@ -14 +19 @@
         {E5FB2D95-3841-464C-B23F-94ADA4499FE6}.Release|Win32.ActiveCfg = Release|Win32
         {E5FB2D95-3841-464C-B23F-94ADA4499FE6}.Release|Win32.Build.0 = Release|Win32
+        {D344FA91-7B7A-4390-9CA5-E1ABCCECA3A2}.Debug|Win32.ActiveCfg = Debug|Win32
+        {D344FA91-7B7A-4390-9CA5-E1ABCCECA3A2}.Debug|Win32.Build.0 = Debug|Win32
+        {D344FA91-7B7A-4390-9CA5-E1ABCCECA3A2}.Release|Win32.ActiveCfg = Release|Win32
+        {D344FA91-7B7A-4390-9CA5-E1ABCCECA3A2}.Release|Win32.Build.0 = Release|Win32
     EndGlobalSection
     GlobalSection(SolutionProperties) = preSolution

trunk/windows/libcf/libcf.vcproj

@@ -22 +22 @@
             IntermediateDirectory="$(ConfigurationName)"
             ConfigurationType="2"
-            CharacterSet="1"
+            CharacterSet="0"
             >
             <Tool
@@ -95 +95 @@
             IntermediateDirectory="$(ConfigurationName)"
             ConfigurationType="2"
-            CharacterSet="1"
+            CharacterSet="0"
             WholeProgramOptimization="1"
             >