Skip to content

O
OpenXG-RAN
Commit 764ec5a2 authored by Laurent THOMAS's avatar Laurent THOMAS
Browse files
Options

improve log header

parent 792b6b4e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 115 additions and 179 deletions
ci-scripts/runTestOnVM.sh
View file @ 764ec5a2
This diff is collapsed.
common/config/config_load_configmodule.c
View file @ 764ec5a2
...@@ -194,6 +194,11 @@ configmodule_interface_t *load_configmodule(int argc, ...@@ -194,6 +194,11 @@ configmodule_interface_t *load_configmodule(int argc,
int i; int i;
int OoptIdx=-1; int OoptIdx=-1;
printf("CMDLINE: ");
for (int i=0; i<argc; i++)
printf("\"%s\" ", argv[i]);
printf("\n");
/* first parse the command line to look for the -O option */ /* first parse the command line to look for the -O option */
for (i = 0; i<argc; i++) { for (i = 0; i<argc; i++) {
if (strlen(argv[i]) < 2) if (strlen(argv[i]) < 2)
......
common/utils/LOG/DOC/rtusage.md
View file @ 764ec5a2
...@@ -9,7 +9,7 @@ All logging facility parameters are defined in the log_config section. Some para ...@@ -9,7 +9,7 @@ All logging facility parameters are defined in the log_config section. Some para
|:---:|:---:|:---:|:----| |:---:|:---:|:---:|:----|
| `global_log_level` | `pre-defined string of char` | `info` | Allows printing of messages up to the specified level. Available levels, from lower to higher are `error`,`warn`,`info`,`debug`,`trace` | | `global_log_level` | `pre-defined string of char` | `info` | Allows printing of messages up to the specified level. Available levels, from lower to higher are `error`,`warn`,`info`,`debug`,`trace` |
| `global_log_online` | `boolean` | 1 (=true) | If false, all console messages are discarded, whatever their level | | `global_log_online` | `boolean` | 1 (=true) | If false, all console messages are discarded, whatever their level |
| `global_log_options` | `list of pre-defined string of char` | | 3 options can be specified to trigger the information added in the header of the message: `nocolor`, disable color usage in log messages, usefull when redirecting logs to a file, where escape sequences used for color selection can be annoying, `level`, add a one letter level id in the message header (T,D,I,W,E for trace, debug, info, warning, error),`thread`, add the thread name in the message header| | `global_log_options` | `list of pre-defined string of char` | | 3 options can be specified to trigger the information added in the header of the message: `nocolor`, disable color usage in log messages, usefull when redirecting logs to a file, where escape sequences used for color selection can be annoying, `level`, add a one letter level id in the message header (T,D,I,W,E for trace, debug, info, warning, error),`thread`, add the thread name in the message header, `function`, adds the function name, `line`, adds the line number, `time` adds the time since process starts|
### Component specific parameters ### Component specific parameters
| name | type | default | description | | name | type | default | description |
......
common/utils/LOG/log.c
View file @ 764ec5a2
...@@ -73,7 +73,9 @@ mapping log_options[] = { ...@@ -73,7 +73,9 @@ mapping log_options[] = {
{"nocolor", FLAG_NOCOLOR }, {"nocolor", FLAG_NOCOLOR },
{"level", FLAG_LEVEL }, {"level", FLAG_LEVEL },
{"thread", FLAG_THREAD }, {"thread", FLAG_THREAD },
{NULL,-1} {"line", FLAG_FILE_LINE },
{"function", FLAG_FUNCT},
{"time", FLAG_TIME}
}; };
...@@ -81,6 +83,7 @@ mapping log_maskmap[] = LOG_MASKMAP_INIT; ...@@ -81,6 +83,7 @@ mapping log_maskmap[] = LOG_MASKMAP_INIT;
char *log_level_highlight_start[] = {LOG_RED, LOG_ORANGE, "", LOG_BLUE, LOG_CYBL}; /*!< \brief Optional start-format strings for highlighting */ char *log_level_highlight_start[] = {LOG_RED, LOG_ORANGE, "", LOG_BLUE, LOG_CYBL}; /*!< \brief Optional start-format strings for highlighting */
char *log_level_highlight_end[] = {LOG_RESET,LOG_RESET,LOG_RESET, LOG_RESET,LOG_RESET}; /*!< \brief Optional end-format strings for highlighting */ char *log_level_highlight_end[] = {LOG_RESET,LOG_RESET,LOG_RESET, LOG_RESET,LOG_RESET}; /*!< \brief Optional end-format strings for highlighting */
static void log_output_memory(log_component_t *c, const char *file, const char *func, int line, int comp, int level, const char* format,va_list args);
int write_file_matlab(const char *fname, int write_file_matlab(const char *fname,
...@@ -495,34 +498,54 @@ int logInit (void) ...@@ -495,34 +498,54 @@ int logInit (void)
return 0; return 0;
} }
static inline int log_header(log_component_t *c,
char *log_getthreadname(char *threadname, char *log_buffer,
int bufsize) int buffsize,
const char *file,
const char *func,
int line,
int level)
{ {
int rt = pthread_getname_np(pthread_self(), threadname,bufsize) ; int flag= g_log->flag | c->flag;
char threadname[64];
if (flag & FLAG_THREAD ) {
threadname[0]='{';
if ( pthread_getname_np(pthread_self(), threadname+1,61) != 0)
strcpy(threadname+1, "?thread?");
strcat(threadname,"}");
} else {
threadname[0]=0;
}
if (rt == 0) { char l[32];
return threadname; if (flag & FLAG_FILE_LINE && flag & FLAG_FUNCT )
snprintf(l, sizeof l," (%s:%d) ", func, line);
else if (flag & FLAG_FILE_LINE)
sprintf(l," (%d) ", line);
else
l[0]=0;
char timeString[32];
if ( flag & FLAG_TIME ) {
struct timespec t;
clock_gettime(CLOCK_MONOTONIC, &t);
static double tOrigin=0;
if (tOrigin==0)
tOrigin=t.tv_sec+t.tv_nsec/1.0e9;
snprintf(timeString, sizeof t,"%05.3f",t.tv_sec+t.tv_nsec/1.0e9-tOrigin);
} else { } else {
return "thread?"; timeString[0]=0;
} }
}
static int log_header(char *log_buffer, return snprintf(log_buffer, buffsize, "%s%s[%s]%c%s %s ",
int buffsize, timeString,
int comp, flag & FLAG_NOCOLOR ? "" : log_level_highlight_start[level],
int level, c->name,
const char *format) flag & FLAG_LEVEL ? g_log->level2string[level] : ' ',
{ l,
char threadname[PR_SET_NAME]; threadname
return snprintf(log_buffer, buffsize, "%s%s[%s]%c %s %s%s", );
log_level_highlight_end[level],
( (g_log->flag & FLAG_NOCOLOR)?"":log_level_highlight_start[level]),
g_log->log_component[comp].name,
( (g_log->flag & FLAG_LEVEL)?g_log->level2string[level]:' '),
( (g_log->flag & FLAG_THREAD)?log_getthreadname(threadname,PR_SET_NAME+1):""),
format,
log_level_highlight_end[level]);
} }
void logRecord_mt(const char *file, void logRecord_mt(const char *file,
...@@ -533,16 +556,10 @@ void logRecord_mt(const char *file, ...@@ -533,16 +556,10 @@ void logRecord_mt(const char *file,
const char *format, const char *format,
... ) ... )
{ {
char log_buffer[MAX_LOG_TOTAL]= {0}; log_component_t *c = &g_log->log_component[comp];
va_list args; va_list args;
va_start(args,format); va_start(args,format);
if (log_mem_flag == 1) { log_output_memory(c, file,func,line,comp,level,format,args);
log_output_memory(file,func,line,comp,level,format,args);
} else {
log_header(log_buffer,MAX_LOG_TOTAL,comp,level,format);
g_log->log_component[comp].vprint(g_log->log_component[comp].stream,log_buffer,args);
fflush(g_log->log_component[comp].stream);
}
va_end(args); va_end(args);
} }
...@@ -554,13 +571,8 @@ void vlogRecord_mt(const char *file, ...@@ -554,13 +571,8 @@ void vlogRecord_mt(const char *file,
const char *format, const char *format,
va_list args ) va_list args )
{ {
char log_buffer[MAX_LOG_TOTAL]; log_component_t *c = &g_log->log_component[comp];
if (log_mem_flag == 1) { log_output_memory(c, file,func,line,comp,level, format,args);
log_output_memory(file,func,line,comp,level, format,args);
} else {
log_header(log_buffer,MAX_LOG_TOTAL,comp, level,format);
g_log->log_component[comp].vprint(g_log->log_component[comp].stream,log_buffer, args);
}
} }
void log_dump(int component, void log_dump(int component,
...@@ -572,6 +584,8 @@ void log_dump(int component, ...@@ -572,6 +584,8 @@ void log_dump(int component,
{ {
va_list args; va_list args;
char *wbuf; char *wbuf;
log_component_t *c = &g_log->log_component[component];
int flag= g_log->flag | c->flag;
switch(datatype) { switch(datatype) {
case LOG_DUMP_DOUBLE: case LOG_DUMP_DOUBLE:
...@@ -586,9 +600,8 @@ void log_dump(int component, ...@@ -586,9 +600,8 @@ void log_dump(int component,
if (wbuf != NULL) { if (wbuf != NULL) {
va_start(args, format); va_start(args, format);
int pos=log_header(wbuf,MAX_LOG_TOTAL,component, OAILOG_INFO,""); int pos=log_header(c, wbuf,MAX_LOG_TOTAL,"noFile","noFunc",0, OAILOG_INFO);
int pos2=vsprintf(wbuf+pos,format, args); pos+=vsprintf(wbuf+pos,format, args);
pos=pos+pos2;
va_end(args); va_end(args);
for (int i=0; i<buffsize; i++) { for (int i=0; i<buffsize; i++) {
...@@ -603,9 +616,11 @@ void log_dump(int component, ...@@ -603,9 +616,11 @@ void log_dump(int component,
break; break;
} }
} }
if ( flag & FLAG_NOCOLOR )
sprintf(wbuf+pos,"\n"); sprintf(wbuf+pos,"\n");
g_log->log_component[component].print(g_log->log_component[component].stream,wbuf); else
sprintf(wbuf+pos,"%s\n",log_level_highlight_end[OAILOG_INFO]);
c->print(c->stream,wbuf);
free(wbuf); free(wbuf);
} }
} }
...@@ -805,13 +820,10 @@ void flush_mem_to_file(void) ...@@ -805,13 +820,10 @@ void flush_mem_to_file(void)
char logmem_log_level[NUM_LOG_LEVEL]={'E','W','I','D','T'}; char logmem_log_level[NUM_LOG_LEVEL]={'E','W','I','D','T'};
void log_output_memory(const char *file, const char *func, int line, int comp, int level, const char* format,va_list args) static void log_output_memory(log_component_t *c, const char *file, const char *func, int line, int comp, int level, const char* format,va_list args)
{ {
//logRecord_mt(file,func,line, pthread_self(), comp, level, format, ##args) //logRecord_mt(file,func,line, pthread_self(), comp, level, format, ##args)
int len = 0; int len = 0;
log_component_t *c;
char *log_start;
char *log_end;
/* The main difference with the version above is the use of this local log_buffer. /* The main difference with the version above is the use of this local log_buffer.
* The other difference is the return value of snprintf which was not used * The other difference is the return value of snprintf which was not used
* correctly. It was not a big problem because in practice MAX_LOG_TOTAL is * correctly. It was not a big problem because in practice MAX_LOG_TOTAL is
...@@ -819,87 +831,12 @@ void log_output_memory(const char *file, const char *func, int line, int comp, i ...@@ -819,87 +831,12 @@ void log_output_memory(const char *file, const char *func, int line, int comp, i
*/ */
char log_buffer[MAX_LOG_TOTAL]; char log_buffer[MAX_LOG_TOTAL];
/* for no gcc warnings */
(void)log_start;
(void)log_end;
c = &g_log->log_component[comp];
//VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_LOG_RECORD, VCD_FUNCTION_IN);
// make sure that for log trace the extra info is only printed once, reset when the level changes // make sure that for log trace the extra info is only printed once, reset when the level changes
if (level == OAILOG_TRACE) { if (level < OAILOG_TRACE)
log_start = log_buffer; len += log_header(c, log_buffer, MAX_LOG_TOTAL, file, func, line, level);
len = vsnprintf(log_buffer, MAX_LOG_TOTAL, format, args); len += vsnprintf(log_buffer+len, MAX_LOG_TOTAL-len, format, args);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL; if ( !((g_log->flag | c->flag) & FLAG_NOCOLOR) )
log_end = log_buffer + len; len+=snprintf(log_buffer+len, MAX_LOG_TOTAL-len, "%s", log_level_highlight_end[level]);
} else {
if ( (g_log->flag & 0x001) || (c->flag & 0x001) ) {
len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "%s",
log_level_highlight_start[level]);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
}
log_start = log_buffer + len;
// if ( (g_log->flag & 0x004) || (c->flag & 0x004) ) {
len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%s]",
g_log->log_component[comp].name);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
// }
if ( (level >= OAILOG_ERR) && (level <= OAILOG_TRACE) ) {
len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%c]",
logmem_log_level[level]);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
}
if ( (g_log->flag & FLAG_THREAD) || (c->flag & FLAG_THREAD) ) {
# define THREAD_NAME_LEN 128
char threadname[THREAD_NAME_LEN];
if (pthread_getname_np(pthread_self(), threadname, THREAD_NAME_LEN) != 0)
{
perror("pthread_getname_np : ");
} else {
len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%s]", threadname);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
}
# undef THREAD_NAME_LEN
}
if ( (g_log->flag & FLAG_FUNCT) || (c->flag & FLAG_FUNCT) ) {
len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%s] ",
func);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
}
if ( (g_log->flag & FLAG_FILE_LINE) || (c->flag & FLAG_FILE_LINE) ) {
len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%s:%d]",
file, line);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
}
/* len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%08lx]", thread_id);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
struct timeval gettime;
gettimeofday(&gettime,NULL);
len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%ld.%06ld]", gettime.tv_sec, gettime.tv_usec);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
*/
if ( (g_log->flag & FLAG_NOCOLOR) || (c->flag & FLAG_NOCOLOR) ) {
len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "%s",
log_level_highlight_end[level]);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
}
len += vsnprintf(&log_buffer[len], MAX_LOG_TOTAL - len, format, args);
if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
log_end = log_buffer + len;
}
//va_end(args);
// OAI printf compatibility // OAI printf compatibility
if(log_mem_flag==1){ if(log_mem_flag==1){
...@@ -936,7 +873,7 @@ void log_output_memory(const char *file, const char *func, int line, int comp, i ...@@ -936,7 +873,7 @@ void log_output_memory(const char *file, const char *func, int line, int comp, i
} }
} }
}else{ }else{
fwrite(log_buffer, len, 1, stdout); fwrite(log_buffer, len, 1, c->stream);
} }
} }
......
common/utils/LOG/log.h
View file @ 764ec5a2
...@@ -317,7 +317,6 @@ int register_log_component(char *name, char *fext, int compidx); ...@@ -317,7 +317,6 @@ int register_log_component(char *name, char *fext, int compidx);
#define LOG_MEM_SIZE 100*1024*1024 #define LOG_MEM_SIZE 100*1024*1024
#define LOG_MEM_FILE "./logmem.log" #define LOG_MEM_FILE "./logmem.log"
void flush_mem_to_file(void); void flush_mem_to_file(void);
void log_output_memory(const char *file, const char *func, int line, int comp, int level, const char* format,va_list args);
int logInit_log_mem(void); int logInit_log_mem(void);
void close_log_mem(void); void close_log_mem(void);
......
openair2/RRC/LTE/rrc_eNB_S1AP.c
View file @ 764ec5a2
...@@ -62,11 +62,6 @@ ...@@ -62,11 +62,6 @@
#include "executables/softmodem-common.h" #include "executables/softmodem-common.h"
extern RAN_CONTEXT_t RC; extern RAN_CONTEXT_t RC;
extern int
gtpv1u_delete_s1u_tunnel(
const instance_t instanceP,
const gtpv1u_enb_delete_tunnel_req_t *const req_pP);
/* Value to indicate an invalid UE initial id */ /* Value to indicate an invalid UE initial id */
static const uint16_t UE_INITIAL_ID_INVALID = 0; static const uint16_t UE_INITIAL_ID_INVALID = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment