Changeset 101 in libcf

Timestamp:

05/28/13 23:45:43 (11 years ago)

Author:

cheese

Message:

#1 change interface to set log level

Location:

trunk

Files:

• include/cf_log.h (modified) (3 diffs)
• src/cf_log.c (modified) (6 diffs)
• test/log.c (modified) (2 diffs)
• test/test.c (modified) (2 diffs)

trunk/include/cf_log.h

@@ -31 +31 @@
  * 로그 레벨 사용 안함
  *
- * @see CF_Log_SetLevel
+ * @see CF_Log_Initialize
  */
 #define CF_LOG_NO_LEVEL                 -1
@@ -40 +40 @@
 
 CF_EXPORT int
-CF_Log_Initialize       (const int logPool);
+CF_Log_Initialize       (const int poolSize,
+                         const int level);
 
 CF_EXPORT int
@@ -65 +66 @@
                          const CF_BOOL  flag);
 
-CF_EXPORT int
-CF_Log_SetLevel         (const int level);
-
 #ifdef __cplusplus
 }

trunk/src/cf_log.c

@@ -49 +49 @@
     if (gLogArray.ctxPool[__mapid] == NULL) \
         return CF_ERROR_LOG_NOT_MAPPED_ID
+
+#define GET_LOG_LEVEL()                     \
+    ((gLogArray.level == CF_LOG_NO_LEVEL)   \
+     ? gLogArray.ctxSize                    \
+     : gLogArray.level)
+
+#define CHECK_LOG_LEVEL(__mapid)    \
+    if (GET_LOG_LEVEL () < mapid)   \
+        return CF_OK
 
 #define LOCK_LOG_CTX(__ctx)             CF_Mutex_Lock (&__ctx->mutex)
@@ -519 +528 @@
  * @return 성공 시, CF_OK; 실패 시, 오류 코드
  *
- * @param logPool 아이디 넘버 최대 값
+ * @param poolSize  로그 풀 크기로, 로그 아이디 넘버의 최대 값
+ * @param level     로그 레벨
+ *
+ * @see CF_LOG_NO_LEVEL
  */
 int
-CF_Log_Initialize (const int logPool)
+CF_Log_Initialize (const int poolSize, const int level)
 {
     memset (&gLogArray, 0x00, sizeof (CF_LOG_ARRAY));
 
-    if (logPool > 0)
+    if (poolSize > 0)
     {
         gLogArray.ctxPool =
-            (CF_Log_Ctx *) calloc ((size_t) logPool, sizeof (CF_Log_Ctx));
+            (CF_Log_Ctx *) calloc ((size_t) poolSize, sizeof (CF_Log_Ctx));
         if (gLogArray.ctxPool == NULL)
             return CF_ERROR_LOG_INITIALIZE;
-        gLogArray.ctxSize = logPool;
-        gLogArray.level = CF_LOG_NO_LEVEL;
+        gLogArray.ctxSize = poolSize;
+        gLogArray.level = level;
     }
 
@@ -581 +593 @@
     CF_Log_Ctx  ctx = NULL;
 
+    CHECK_LOG_LEVEL (mapid);
+
     result = CF_Log_CreateCtx (path, memsize, &ctx);
     if (result < 0)
@@ -602 +616 @@
 CF_Log_Close (const int mapid)
 {
+    CHECK_LOG_LEVEL (mapid);
+
     return CF_Log_UnmapCtxID (mapid);
 }
@@ -652 +668 @@
 
     return result;
-}
-
-/**
- * 현재 설정된 로그 레벨을 가져옴
- *
- * @return 로그 레벨이 설정된 경우, 로그 풀 크기; 그 외에, 설정된 로그 레벨
- */
-static int
-CF_Log_GetLevel (void)
-{
-    return (gLogArray.level == CF_LOG_NO_LEVEL) ? gLogArray.ctxSize
-                                                : gLogArray.level;
-}
-
-/**
- * 로그 레벨을 설정
- * 지정된 로그 레벨 이하의 아이디 넘버만 로그로 기록하도록 설정
- *
- * @return 성공 시, CF_OK; 실패 시, 오류 코드 
- *
- * @param level 설정할 로그 레벨
- *
- * @see CF_LOG_NO_LEVEL
- */
-int
-CF_Log_SetLevel (const int level)
-{
-    gLogArray.level = level;
-
-    return CF_OK;
 }
 
@@ -703 +689 @@
     va_list     valist;
 
-    result = CF_Log_GetLevel ();
-    if (result < mapid)
-        return CF_OK;
+    CHECK_LOG_LEVEL (mapid);
 
     result = CF_Log_GetMappedCtx (mapid, &ctx);

trunk/test/log.c

@@ -13 +13 @@
     char        logname[16] = {0x00,};
 
-    if (CF_Log_Initialize (10) < 0)
+    if (CF_Log_Initialize (10, 5) < 0)
     {
         fprintf (stderr, "failed to init. log\n");
@@ -25 +25 @@
             fprintf (stderr, "failed to open log\n");
     }
-
-    if (CF_Log_SetLevel (5) < 0)
-        fprintf (stderr, "failed to set log level\n");
 
     for (i = 0 ; i < 10 ; i++)

trunk/test/test.c

@@ -106 +106 @@
 
     /* initialize */
-    if (CF_Log_Initialize (10) < 0)
+    if (CF_Log_Initialize (10, 5) < 0)
     {
         fprintf (stderr, "failed to init. log\n");
@@ -118 +118 @@
             fprintf (stderr, "failed to open log\n");
     }
-
-    if (CF_Log_SetLevel (5) < 0)
-        fprintf (stderr, "failed to set log level\n");
 
     for (i = 0 ; i < 10 ; i++)