diff --git a/common/utils/T/tracer/logger/logger.h b/common/utils/T/tracer/logger/logger.h index 434cf5a90f..7c019b4797 100644 --- a/common/utils/T/tracer/logger/logger.h +++ b/common/utils/T/tracer/logger/logger.h @@ -30,6 +30,7 @@ void framelog_set_skip(logger *_this, int skip_delay); void framelog_set_update_only_at_sf9(logger *_this, int update_only_at_sf9); void textlog_dump_buffer(logger *_this, int dump_buffer); +void textlog_raw_time(logger *_this, int raw_time); #include "view/view.h" diff --git a/common/utils/T/tracer/logger/textlog.c b/common/utils/T/tracer/logger/textlog.c index 9eb6fd02d8..76f920e1e2 100644 --- a/common/utils/T/tracer/logger/textlog.c +++ b/common/utils/T/tracer/logger/textlog.c @@ -33,6 +33,7 @@ struct textlog { /* local output buffer */ OBUF o; int dump_buffer; + int raw_time; }; static void _event(void *p, event e) @@ -51,9 +52,13 @@ static void _event(void *p, event e) #ifdef T_SEND_TIME t = localtime(&e.sending_time.tv_sec); - /* round tv_nsec to nearest millisecond */ - sprintf(tt, "%2.2d:%2.2d:%2.2d.%9.9ld: ", t->tm_hour, t->tm_min, t->tm_sec, - e.sending_time.tv_nsec); + if (l->raw_time) + sprintf(tt, "%2.2d:%2.2d:%2.2d.%9.9ld [%ld]: ", + t->tm_hour, t->tm_min, t->tm_sec, + e.sending_time.tv_nsec, e.sending_time.tv_sec); + else + sprintf(tt, "%2.2d:%2.2d:%2.2d.%9.9ld: ", t->tm_hour, t->tm_min, t->tm_sec, + e.sending_time.tv_nsec); PUTS(&l->o, tt); #endif @@ -215,3 +220,9 @@ void textlog_dump_buffer(logger *_this, int dump_buffer) struct textlog *l = _this; l->dump_buffer = dump_buffer; } + +void textlog_raw_time(logger *_this, int raw_time) +{ + struct textlog *l = _this; + l->raw_time = raw_time; +} diff --git a/common/utils/T/tracer/textlog.c b/common/utils/T/tracer/textlog.c index dba9d55483..a123bf9bf5 100644 --- a/common/utils/T/tracer/textlog.c +++ b/common/utils/T/tracer/textlog.c @@ -52,6 +52,7 @@ void usage(void) " they will be processed in order\n" " by default, all is off\n" " -full also dump buffers' content\n" +" -raw-time also prints 'raw time'\n" " -ip connect to given IP address (default %s)\n" " -p connect to given port (default %d)\n" " -x GUI output\n" @@ -91,6 +92,7 @@ int main(int n, char **v) int gui_active = 1; textlog_data textlog_data; int full = 0; + int raw_time = 0; /* write on a socket fails if the other end is closed and we get SIGPIPE */ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) abort(); @@ -117,6 +119,7 @@ int main(int n, char **v) if (!strcmp(v[i], "-debug-gui")) { gui_logd = 1; continue; } if (!strcmp(v[i], "-no-gui")) { gui_active = 0; continue; } if (!strcmp(v[i], "-full")) { full = 1; continue; } + if (!strcmp(v[i], "-raw-time")) { raw_time = 1; continue; } usage(); } @@ -162,6 +165,7 @@ int main(int n, char **v) // "ev: {} eNB_id [eNB_ID] frame [frame] subframe [subframe]"); logger_add_view(textlog, out); if (full) textlog_dump_buffer(textlog, 1); + if (raw_time) textlog_raw_time(textlog, 1); free(name); free(desc); }