Changeset 122 in libcf for trunk/src/cf_log.c

Timestamp:

06/12/13 11:05:07 (11 years ago)

Author:

cheese

Message:

#1 modify id to context in thread

File:

• trunk/src/cf_log.c (modified) (7 diffs)

trunk/src/cf_log.c

@@ -52 +52 @@
         return CF_ERROR_LOG_NOT_MAPPED_ID
 
-#define LOCK_LOG_CTX(__ctx)             CF_Mutex_Lock (&__ctx->mutex)
-#define UNLOCK_LOG_CTX(__ctx)           CF_Mutex_Unlock (&__ctx->mutex)
+#define LOCK_LOG_CTX(__ctx)             CF_Mutex_Lock (__ctx->mutex)
+#define UNLOCK_LOG_CTX(__ctx)           CF_Mutex_Unlock (__ctx->mutex)
 
 #define LOG_BUFFER_DEFAULT_SIZE         128 * 1024
@@ -76 +76 @@
 
 /** 로그 컨텍스트 (CF_Log_Ctx의 구현) */
-typedef struct __cf_log_ctx__ {
+typedef struct __cf_log_ctx__
+{
     char            path[NAME_LENGTH + 1];
     int             fd;
@@ -85 +86 @@
 } CF_LOG_CTX;
 
-typedef struct __cf_log_array__ {
+typedef struct __cf_log_array__
+{
     CF_Log_Ctx  * ctxPool;
     int         ctxSize;
@@ -278 +280 @@
     ASSERT_CTX (ctx);
 
-    if (CF_Mutex_DestoryCtx (&context->mutex) < 0)
+    if (CF_Mutex_DestoryCtx (context->mutex) < 0)
         return CF_ERROR_LOG_UNSET_MULTITHREAD;
+
+    context->mutex = NULL;
 
     return CF_OK;
@@ -370 +374 @@
     CF_File_Close (context->fd);
 
-    CF_Mutex_DestoryCtx (&context->mutex);
+    CF_Mutex_DestoryCtx (context->mutex);
     context->mutex = NULL;
 
@@ -381 +385 @@
  * \return 성공 시, 로그 컨텍스트; 실패 시, NULL
  *
+ * \param ctx       로그 컨텍스트 주소
  * \param path      로그 파일 경로
  * \param memsize   로그 버퍼 크기
- * \param ctx       로그 컨텍스트 받을 주소
  *
  * \see CF_LOG_DEFAULT_BUFFER, CF_LOG_NO_BUFFER
  */
 static int
-CF_Log_CreateCtx (const char    * path,
-                  const int     memsize,
-                  CF_Log_Ctx    * ctx)
+CF_Log_CreateCtx (CF_Log_Ctx    * ctx,
+                  const char    * path,
+                  const int     memsize)
 {
     int result = 0;
@@ -580 +584 @@
     CF_Log_Ctx  ctx = NULL;
 
-    result = CF_Log_CreateCtx (path, memsize, &ctx);
+    result = CF_Log_CreateCtx (&ctx, path, memsize);
     if (result < 0)
         return result;