Changeset 8 in libcf
- Timestamp:
- 01/30/13 17:25:10 (11 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/cf_debug.h
r6 r8 19 19 #ifdef _DEBUG 20 20 # define CF_DEBUG_TRACE(__ctx,__fmt,...) \ 21 CF_Debug_Trace (__ctx,__fmt,##__VA_ARGS__) \ 22 21 CF_Debug_Trace (__ctx,__fmt,##__VA_ARGS__) 23 22 # define CF_DEBUG_TRACE_BIN(__ctx,__bin,__len,__fmt,...) \ 24 CF_Debug_Trace (__ctx,__bin,__len,__fmt,##__VA_ARGS__) \ 25 23 CF_Debug_Trace (__ctx,__bin,__len,__fmt,##__VA_ARGS__) 26 24 # define CF_DEBUG_CALLSTACK_PUSH(__ctx) \ 27 CF_Debug_CallstackPush (__ctx,__func__,__LINE__) \ 28 25 CF_Debug_CallstackPush (__ctx,__func__,__LINE__) 29 26 # define CF_DEBUG_CALLSTACK_POP \ 30 CF_Debug_CallstackPop \ 31 27 CF_Debug_CallstackPop 32 28 #else // #ifdef _DEBUG 33 29 # define CF_DEBUG_TRACE(__ctx,__fmt,...) -
trunk/src/cf_debug.c
r7 r8 222 222 pop = context->callstack.caller; 223 223 if (pop == NULL) 224 {225 224 return CF_ERROR_DEBUG_POP_CALLSTACK; 226 }227 225 228 226 sprintf (callstack->function, "%s", pop->func); -
trunk/src/cf_thread.c
r5 r8 45 45 int result = 0; 46 46 47 TRY48 {49 47 #ifdef _WIN32 50 51 52 result = -1;48 *threadID = (THREAD_TYPE) _beginthreadex (0, 0, callback, arg, 0, 0); 49 if (*threadID == NULL) 50 return CF_ERROR_THREAD_CREATE; 53 51 #else 54 *threadID = (THREAD_TYPE *) calloc (sizeof (THREAD_TYPE), 1); 55 if (*threadID == NULL) 56 { 57 result = -2; 58 TRY_BREAK; 59 } 52 *threadID = (THREAD_TYPE *) calloc (sizeof (THREAD_TYPE), 1); 53 if (*threadID == NULL) 54 return CF_ERROR_THREAD_CREATE; 60 55 61 result = pthread_create ((THREAD_TYPE *) *threadID, NULL, callback, arg); 56 result = pthread_create ((THREAD_TYPE *) *threadID, NULL, callback, arg); 57 if (result < 0) 58 return CF_ERROR_THREAD_CREATE; 62 59 #endif 63 }64 CATCH_IF (result < 0)65 {66 return CF_ERROR_THREAD_CREATE;67 }68 60 69 61 return CF_OK; … … 100 92 int result = 0; 101 93 102 TRY103 {104 94 #ifdef _WIN32 105 *mutex = (MUTEX_TYPE) CreateMutexA (NULL, FALSE, NULL); 106 if (*mutex == NULL) 107 { 108 result = -1; 109 TRY_BREAK; 110 } 95 *mutex = (MUTEX_TYPE) CreateMutexA (NULL, FALSE, NULL); 96 if (*mutex == NULL) 97 return CF_ERROR_MUTEX_CREATE; 111 98 #else 112 *mutex = (MUTEX_TYPE *) calloc (sizeof (MUTEX_TYPE), 1); 113 if (*mutex == NULL) 114 { 115 result = -2; 116 TRY_BREAK; 117 } 99 *mutex = (MUTEX_TYPE *) calloc (sizeof (MUTEX_TYPE), 1); 100 if (*mutex == NULL) 101 return CF_ERROR_MUTEX_CREATE; 118 102 119 result = pthread_mutex_init (*mutex, NULL); 103 result = pthread_mutex_init (*mutex, NULL); 104 if (result < 0) 105 return CF_ERROR_MUTEX_CREATE; 120 106 #endif 121 }122 CATCH_IF (result < 0)123 {124 return CF_ERROR_MUTEX_CREATE;125 }126 107 127 108 return CF_OK;
Note:
See TracChangeset
for help on using the changeset viewer.