maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

integration fix: fixes for pthread_getname_np

Browse Source 
- define _GNU_SOURCE before including pthread.h
- do not use static for the array 'threadname' used
  to store the name, it makes it a global variable
  accessed by several threads in parallel
- increase size of 'threadname' (maybe not necessary)
- properly indent #define / #under (# should be at column 1)
This commit is contained in:
Cedric Roux
2017-04-03 10:26:42 +02:00
parent a032502713
commit c36c04537a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/UTIL/LOG/log.c
+4 -3
View File
@@ -28,6 +28,7 @@
*/ */
#define _GNU_SOURCE /* required for pthread_getname_np */
//#define LOG_TEST 1 //#define LOG_TEST 1
#define COMPONENT_LOG #define COMPONENT_LOG
@@ -1033,8 +1034,8 @@ void logRecord_mt(const char *file, const char *func, int line, int comp,
} }
if ( (g_log->flag & FLAG_THREAD) || (c->flag & FLAG_THREAD) ) { if ( (g_log->flag & FLAG_THREAD) || (c->flag & FLAG_THREAD) ) {
#define THREAD_NAME_LEN 16 # define THREAD_NAME_LEN 128
static char threadname[THREAD_NAME_LEN]; char threadname[THREAD_NAME_LEN];
if (pthread_getname_np(pthread_self(), threadname, THREAD_NAME_LEN) != 0) if (pthread_getname_np(pthread_self(), threadname, THREAD_NAME_LEN) != 0)
{ {
perror("pthread_getname_np : "); perror("pthread_getname_np : ");
@@ -1042,7 +1043,7 @@ void logRecord_mt(const char *file, const char *func, int line, int comp,
len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%s]", threadname); len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%s]", threadname);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL; if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
} }
#undef THREAD_NAME_LEN # undef THREAD_NAME_LEN
} }
if ( (g_log->flag & FLAG_FUNCT) || (c->flag & FLAG_FUNCT) ) { if ( (g_log->flag & FLAG_FUNCT) || (c->flag & FLAG_FUNCT) ) {