Changeset 103 in libcf
- Timestamp:
- 05/29/13 11:06:23 (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/cf_log.h
r102 r103 14 14 #include "cf_base.h" 15 15 16 /** 17 * 로그의 버퍼 크기를 기본 값으로 설정 18 * 19 * @see CF_Log_Open 20 */ 21 #define CF_LOG_BUFFER_DEFAULT -1 22 23 /** 24 * 로그 기록 시 버퍼를 사용하지 않고 즉시 기록 25 * 26 * @see CF_Log_Open 27 */ 28 #define CF_LOG_BUFFER_NO 0 29 30 /** 31 * 로그 레벨 사용 안함 32 * 33 * @see CF_Log_Initialize 34 */ 35 #define CF_LOG_NO_LEVEL -1 16 /** 로그 옵션 플래그 */ 17 typedef enum { 18 CF_LOG_DEFAULT_BUFFER = -1, /**< 기본 버퍼 크기 사용 */ 19 CF_LOG_NO_BUFFER = 0, /**< 버퍼없이 파일에 바로 쓰기 */ 20 CF_LOG_NO_LEVEL = -1, /**< 로그 레벨 사용 안함 */ 21 } E_CF_LOG_OPTION, CF_LOG_OPTION; 36 22 37 23 #ifdef __cplusplus -
trunk/src/cf_log.c
r102 r103 389 389 * @param ctx 로그 컨텍스트 받을 주소 390 390 * 391 * @see CF_LOG_ BUFFER_DEFAULT, CF_LOG_BUFFER_NO391 * @see CF_LOG_DEFAULT_BUFFER, CF_LOG_NO_BUFFER 392 392 */ 393 393 static int … … 398 398 int result = 0; 399 399 int fileFlag = CF_FILE_CREATE|CF_FILE_WRITE|CF_FILE_APPEND; 400 int size = (memsize == CF_LOG_ BUFFER_DEFAULT)400 int size = (memsize == CF_LOG_DEFAULT_BUFFER) 401 401 ? LOG_BUFFER_DEFAULT_SIZE 402 402 : memsize; … … 579 579 * @param memsize 로그 버퍼 크기 580 580 * 581 * @see CF_LOG_ BUFFER_DEFAULT, CF_LOG_BUFFER_NO581 * @see CF_LOG_DEFAULT_BUFFER, CF_LOG_NO_BUFFER 582 582 */ 583 583 int -
trunk/src/cf_socket.c
r87 r103 42 42 # define sa_family_t unsigned short 43 43 # define close(__sock) closesocket(__sock) 44 # define CHECK_SELECT(x) ((x) == SOCKET_ERROR)45 44 # define GET_SYSTEM_ERROR() WSAGetLastError () 46 45 # define ERROR_INTR WSAEINTR 47 46 #else 48 # define CHECK_SELECT(x) ((x) < 0)49 47 # define GET_SYSTEM_ERROR() errno 50 48 # define ERROR_INTR EINTR … … 115 113 FD_SET (sock, &readfds); 116 114 117 while ( CHECK_SELECT (result = select (sock + 1, &readfds, NULL, NULL, &tv)))115 while ((result = select (sock + 1, &readfds, NULL, NULL, &tv)) < 0) 118 116 { 119 117 error = GET_SYSTEM_ERROR (); -
trunk/test/log.c
r101 r103 6 6 #include <stdio.h> 7 7 8 #define LOGID 19 10 8 int main (void) 11 9 { … … 13 11 char logname[16] = {0x00,}; 14 12 15 if (CF_Log_Initialize (10, 5) < 0)13 if (CF_Log_Initialize (10, CF_LOG_NO_LEVEL) < 0) 16 14 { 17 15 fprintf (stderr, "failed to init. log\n"); … … 22 20 { 23 21 sprintf (logname, "logid%d.txt", i); 24 if (CF_Log_Open (i, logname, CF_LOG_ BUFFER_NO) < 0)22 if (CF_Log_Open (i, logname, CF_LOG_NO_BUFFER) < 0) 25 23 fprintf (stderr, "failed to open log\n"); 26 24 } -
trunk/test/test.c
r101 r103 115 115 { 116 116 sprintf (idname, "logid%d.txt", i); 117 if (CF_Log_Open (i, idname, CF_LOG_ BUFFER_NO) < 0)117 if (CF_Log_Open (i, idname, CF_LOG_NO_BUFFER) < 0) 118 118 fprintf (stderr, "failed to open log\n"); 119 119 } … … 133 133 134 134 /* mt {{{ */ 135 if (CF_Log_Open (LOG_MT, "log_mt.txt", CF_LOG_ BUFFER_DEFAULT) < 0)135 if (CF_Log_Open (LOG_MT, "log_mt.txt", CF_LOG_DEFAULT_BUFFER) < 0) 136 136 CF_DEBUG_PRINT (stderr, "create log ctx error\n"); 137 137 … … 238 238 CF_Log_Write (LOG_SOCKET, "SERVER", "accepted\n"); 239 239 240 for (i = 0 ; i < 10; i++)240 for (i = 0 ; i < 5 ; i++) 241 241 { 242 242 if ((recvd = CF_Socket_Recv (clntsock, buf, sizeof (buf))) < 0) … … 280 280 CF_Log_Write (LOG_SOCKET, "CLIENT", "connected\n"); 281 281 282 for (i = 0 ; i < 10; i++)282 for (i = 0 ; i < 5 ; i++) 283 283 { 284 284 if (CF_Socket_Send (sock, buf, sizeof (buf)) < 0) … … 316 316 317 317 /*------------------------------------------------------------*/ 318 if (CF_Log_Initialize (1 ) < 0)318 if (CF_Log_Initialize (1, CF_LOG_NO_LEVEL) < 0) 319 319 { 320 320 fprintf (stderr, "failed to init. log\n"); … … 322 322 } 323 323 324 if (CF_Log_Open (LOG_SOCKET, "socket.txt", CF_LOG_ BUFFER_DEFAULT) < 0)324 if (CF_Log_Open (LOG_SOCKET, "socket.txt", CF_LOG_DEFAULT_BUFFER) < 0) 325 325 CF_DEBUG_PRINT (stderr, "failed to open log\n"); 326 326
Note:
See TracChangeset
for help on using the changeset viewer.