diff --git a/common/utils/LOG/log.c b/common/utils/LOG/log.c
index b020f19f01717a6ceb32948ddba30847f2961e4e..02ee849202e285aeb936312a12b754ae6f21b19f 100644
--- a/common/utils/LOG/log.c
+++ b/common/utils/LOG/log.c
@@ -49,19 +49,8 @@
#include "common/config/config_userapi.h"
// main log variables
-log_mem_cnt_t log_mem_d[2];
-int log_mem_flag=0;
-int log_mem_multi=1;
-volatile int log_mem_side=0;
-pthread_mutex_t log_mem_lock;
-pthread_cond_t log_mem_notify;
-pthread_t log_mem_thread;
-int log_mem_file_cnt=0;
-volatile int log_mem_write_flag=0;
-volatile int log_mem_write_side=0;
-char __log_mem_filename[1024]={0};
-char * log_mem_filename = &__log_mem_filename[0];
-char logmem_filename[1024] = {0};
+
+
mapping log_level_names[] = {
{"error", OAILOG_ERR},
@@ -496,7 +485,7 @@ int rt = pthread_getname_np(pthread_self(), threadname,bufsize) ;
void logRecord_mt(const char *file, const char *func, int line, int comp, int level, const char* format, ... )
-{
+ {
char threadname[PR_SET_NAME];
char log_buffer[MAX_LOG_TOTAL];
@@ -504,23 +493,23 @@ void logRecord_mt(const char *file, const char *func, int line, int comp, int le
va_start(args, format);
- if(log_mem_flag == 1) {
- log_output_memory(file,func,line,comp,level, format,args);
- }
- else {
- snprintf(log_buffer, MAX_LOG_TOTAL , "%s%s[%s]%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);
- g_log->log_component[comp].fwrite(g_log->log_component[comp].stream,log_buffer, args);
- }
+
+
+
+ snprintf(log_buffer, MAX_LOG_TOTAL , "%s%s[%s]%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);
+
+ g_log->log_component[comp].fwrite(g_log->log_component[comp].stream,log_buffer, args);
va_end(args);
+
}
@@ -542,6 +531,8 @@ int set_log(int component, int level, int interval)
return 0;
}
+
+
void set_glog(int level)
{
for (int c=0; c< MAX_LOG_COMPONENTS; c++ ) {
@@ -637,262 +628,6 @@ void logClean (void)
}
}
-
-extern int oai_exit;
-void flush_mem_to_file(void)
-{
- int fp;
- char f_name[1024];
- struct timespec slp_tm;
- slp_tm.tv_sec = 0;
- slp_tm.tv_nsec = 10000;
-
- pthread_setname_np( pthread_self(), "flush_mem_to_file");
-
- while (!oai_exit) {
- pthread_mutex_lock(&log_mem_lock);
- log_mem_write_flag=0;
- pthread_cond_wait(&log_mem_notify, &log_mem_lock);
- log_mem_write_flag=1;
- pthread_mutex_unlock(&log_mem_lock);
- // write!
- if(log_mem_d[log_mem_write_side].enable_flag==0){
- if(log_mem_file_cnt>1){
- log_mem_file_cnt=1;
- printf("log over write!!!\n");
- }
- snprintf(f_name,1024, "%s_%d.log",log_mem_filename,log_mem_file_cnt);
- fp=open(f_name, O_WRONLY | O_CREAT, 0666);
- int ret = write(fp, log_mem_d[log_mem_write_side].buf_p, log_mem_d[log_mem_write_side].buf_index);
- if ( ret < 0) {
- fprintf(stderr,"{LOG} %s %d Couldn't write in %s \n",__FILE__,__LINE__,f_name);
- exit(EXIT_FAILURE);
- }
- close(fp);
- log_mem_file_cnt++;
- log_mem_d[log_mem_write_side].buf_index=0;
- log_mem_d[log_mem_write_side].enable_flag=1;
- }else{
- printf("If you'd like to write log, you should set enable flag to 0!!!\n");
- nanosleep(&slp_tm,NULL);
- }
- }
-}
-
-void log_output_memory(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)
- 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 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
- * big enough so that the buffer is never full.
- */
- 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
- if ((level == OAILOG_FILE) || (level == OAILOG_TRACE)) {
- log_start = log_buffer;
- len = vsnprintf(log_buffer, MAX_LOG_TOTAL, format, args);
- if (len > MAX_LOG_TOTAL) len = MAX_LOG_TOTAL;
- log_end = log_buffer + len;
- } 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 ( (g_log->flag & FLAG_LEVEL) || (c->flag & FLAG_LEVEL) ) {
- len += snprintf(&log_buffer[len], MAX_LOG_TOTAL - len, "[%s]",
- g_log->level2string[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;
-
- 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;
-
- 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;
- }
- }
-
- //va_end(args);
-
- // OAI printf compatibility
- if ((g_log->onlinelog == 1) && (level != OAILOG_FILE)) {
- if(log_mem_flag==1){
- if(log_mem_d[log_mem_side].enable_flag==1){
- int temp_index;
- temp_index=log_mem_d[log_mem_side].buf_index;
- if(temp_index+len+1 < LOG_MEM_SIZE){
- log_mem_d[log_mem_side].buf_index+=len;
- memcpy(&log_mem_d[log_mem_side].buf_p[temp_index],log_buffer,len);
- }else{
- log_mem_d[log_mem_side].enable_flag=0;
- if(log_mem_d[1-log_mem_side].enable_flag==1){
- temp_index=log_mem_d[1-log_mem_side].buf_index;
- if(temp_index+len+1 < LOG_MEM_SIZE){
- log_mem_d[1-log_mem_side].buf_index+=len;
- log_mem_side=1-log_mem_side;
- memcpy(&log_mem_d[log_mem_side].buf_p[temp_index],log_buffer,len);
- /* write down !*/
- if (pthread_mutex_lock(&log_mem_lock) != 0) {
- return;
- }
- if(log_mem_write_flag==0){
- log_mem_write_side=1-log_mem_side;
- if(pthread_cond_signal(&log_mem_notify) != 0) {
- }
- }
- if(pthread_mutex_unlock(&log_mem_lock) != 0) {
- return;
- }
- }else{
- log_mem_d[1-log_mem_side].enable_flag=0;
- }
- }
- }
- }
- }else{
- fwrite(log_buffer, len, 1, stdout);
- }
- }
-}
-
-int logInit_log_mem (void)
-{
- if(log_mem_flag==1){
- if(log_mem_multi==1){
- printf("log-mem multi!!!\n");
- log_mem_d[0].buf_p = malloc(LOG_MEM_SIZE);
- log_mem_d[0].buf_index=0;
- log_mem_d[0].enable_flag=1;
- log_mem_d[1].buf_p = malloc(LOG_MEM_SIZE);
- log_mem_d[1].buf_index=0;
- log_mem_d[1].enable_flag=1;
- log_mem_side=0;
- if ((pthread_mutex_init (&log_mem_lock, NULL) != 0)
- || (pthread_cond_init (&log_mem_notify, NULL) != 0)) {
- log_mem_d[1].enable_flag=0;
- return -1;
- }
- pthread_create(&log_mem_thread, NULL, (void *(*)(void *))flush_mem_to_file, (void*)NULL);
- }else{
- printf("log-mem single!!!\n");
- log_mem_d[0].buf_p = malloc(LOG_MEM_SIZE);
- log_mem_d[0].buf_index=0;
- log_mem_d[0].enable_flag=1;
- log_mem_d[1].enable_flag=0;
- log_mem_side=0;
- }
- }else{
- log_mem_d[0].buf_p=NULL;
- log_mem_d[1].buf_p=NULL;
- log_mem_d[0].enable_flag=0;
- log_mem_d[1].enable_flag=0;
- }
-
- printf("log init done\n");
-
- return 0;
-}
-
-void close_log_mem(void){
- int fp;
- char f_name[1024];
-
- if(log_mem_flag==1){
- log_mem_d[0].enable_flag=0;
- log_mem_d[1].enable_flag=0;
- usleep(10); // wait for log writing
- while(log_mem_write_flag==1){
- usleep(100);
- }
- if(log_mem_multi==1){
- snprintf(f_name,1024, "%s_%d.log",log_mem_filename,log_mem_file_cnt);
- fp=open(f_name, O_WRONLY | O_CREAT, 0666);
- int ret = write(fp, log_mem_d[0].buf_p, log_mem_d[0].buf_index);
- if ( ret < 0) {
- fprintf(stderr,"{LOG} %s %d Couldn't write in %s \n",__FILE__,__LINE__,f_name);
- exit(EXIT_FAILURE);
- }
- close(fp);
- free(log_mem_d[0].buf_p);
-
- snprintf(f_name,1024, "%s_%d.log",log_mem_filename,log_mem_file_cnt);
- fp=open(f_name, O_WRONLY | O_CREAT, 0666);
- ret = write(fp, log_mem_d[1].buf_p, log_mem_d[1].buf_index);
- if ( ret < 0) {
- fprintf(stderr,"{LOG} %s %d Couldn't write in %s \n",__FILE__,__LINE__,f_name);
- exit(EXIT_FAILURE);
- }
- close(fp);
- free(log_mem_d[1].buf_p);
- }else{
- fp=open(log_mem_filename, O_WRONLY | O_CREAT, 0666);
- int ret = write(fp, log_mem_d[0].buf_p, log_mem_d[0].buf_index);
- if ( ret < 0) {
- fprintf(stderr,"{LOG} %s %d Couldn't write in %s \n",__FILE__,__LINE__,log_mem_filename);
- exit(EXIT_FAILURE);
- }
- close(fp);
- free(log_mem_d[0].buf_p);
- }
- }
- }
-
#ifdef LOG_TEST
diff --git a/common/utils/LOG/log.h b/common/utils/LOG/log.h
index edff0a5eeb5178c5d50a86ad32e1d0e96ebdd386..4a0552d4942843e5a453b6e2e0223ad0c5adf80e 100644
--- a/common/utils/LOG/log.h
+++ b/common/utils/LOG/log.h
@@ -269,20 +269,6 @@ int is_newline( char *str, int size);
int register_log_component(char *name, char *fext, int compidx);
-#define LOG_MEM_SIZE 500*1024*1024
-#define LOG_MEM_FILE "./logmem.log"
-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);
-void close_log_mem(void);
-
-typedef struct {
- char* buf_p;
- int buf_index;
- int enable_flag;
-} log_mem_cnt_t;
-
-
/* @}*/
/*!\fn int32_t write_file_matlab(const char *fname, const char *vname, void *data, int length, int dec, char format);
diff --git a/common/utils/LOG/log_extern.h b/common/utils/LOG/log_extern.h
index b11486173a368234830817b5d5f9b01e1ea30aa9..3c93d517ca76456f57927b34cfb915482b8b87c2 100644
--- a/common/utils/LOG/log_extern.h
+++ b/common/utils/LOG/log_extern.h
@@ -28,6 +28,3 @@ extern mapping log_level_names[];
extern mapping log_options[];
extern mapping log_maskmap[];
-extern int log_mem_flag;
-extern char * log_mem_filename;
-extern char logmem_filename[1024];
diff --git a/common/utils/itti/assertions.h b/common/utils/itti/assertions.h
index bb6c27cbab358db0b8ed54478beb70d4110ce8ed..b872b009e258408e799f6dfaaf0cc2697c1913f4 100644
--- a/common/utils/itti/assertions.h
+++ b/common/utils/itti/assertions.h
@@ -35,6 +35,7 @@
#ifndef ASSERTIONS_H_
#define ASSERTIONS_H_
+void output_log_mem(void);
#define _Assert_Exit_ \
{ \
fprintf(stderr, "\nExiting execution\n"); \
diff --git a/common/utils/itti/signals.c b/common/utils/itti/signals.c
index cfc902552e5feaa13e9f82a3630ef1c64e61ab79..5dd667ae653a115e53ca18362ce1d2cec9d0ed2f 100644
--- a/common/utils/itti/signals.c
+++ b/common/utils/itti/signals.c
@@ -117,21 +117,18 @@ int signal_handle(int *end)
case SIGUSR1:
SIG_DEBUG("Received SIGUSR1\n");
*end = 1;
- close_log_mem();
break;
case SIGSEGV: /* Fall through */
case SIGABRT:
SIG_DEBUG("Received SIGABORT\n");
backtrace_handle_signal(&info);
- close_log_mem();
break;
case SIGINT:
printf("Received SIGINT\n");
itti_send_terminate_message(TASK_UNKNOWN);
*end = 1;
- close_log_mem();
break;
default:
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index b9cefd4a5750b808b38f41a4e488d951de697c70..e84f99e67f4126d2a6ee8b0efe49099a12022a34 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -70,7 +70,6 @@
unsigned short config_frames[4] = {2,9,11,13};
#endif
#include "common/utils/LOG/log.h"
-#include "common/utils/LOG/log_extern.h"
#include "UTIL/OTG/otg_tx.h"
#include "UTIL/OTG/otg_externs.h"
#include "UTIL/MATH/oml.h"
@@ -142,6 +141,7 @@ static int8_t threequarter_fs=0;
uint32_t downlink_frequency[MAX_NUM_CCs][4];
int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
+
// This is a dummy declaration (dlsch_demodulation.c is no longer compiled for eNodeB)
int16_t dlsch_demod_shift = 0;
@@ -550,12 +550,7 @@ static void get_options(void) {
if (start_telnetsrv) {
load_module_shlib("telnetsrv",NULL,0);
}
- if (strlen(logmem_filename) > 0) {
- log_mem_filename = &logmem_filename[0];
- log_mem_flag = 1;
- printf("Enabling OPT for log save at memory %s\n",log_mem_filename);
- logInit_log_mem();
- }
+
if ( !(CONFIG_ISFLAGSET(CONFIG_ABORT)) ) {
diff --git a/targets/RT/USER/lte-softmodem.h b/targets/RT/USER/lte-softmodem.h
index 5412de6365a82f4f7508da1b1d0c250d7be23c08..2f8209f2d311ab5214952e670f4d6c4c19335b51 100644
--- a/targets/RT/USER/lte-softmodem.h
+++ b/targets/RT/USER/lte-softmodem.h
@@ -202,7 +202,6 @@
{"R" , CONFIG_HLP_FLOG, 0, uptr:&online_log_messages, defintval:1, TYPE_INT, 0}, \
{"g" , CONFIG_HLP_LOGL, 0, uptr:&glog_level, defintval:0, TYPE_UINT, 0}, \
{"telnetsrv", CONFIG_HLP_TELN, PARAMFLAG_BOOL, uptr:&start_telnetsrv, defintval:0, TYPE_UINT, 0}, \
-{"log-mem", NULL, 0, strptr:(char **)&logmem_filename, defstrval:"./logmem.log", TYPE_STRING, sizeof(logmem_filename)}, \
}
#define CMDLINE_ONLINELOG_IDX 0
#define CMDLINE_GLOGLEVEL_IDX 1
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index 53d700d076e39d1d9ae8b1a23abdf9fec95694d1..a2a12f9dd9f301a43c0f6a9767db995bc5d2f8a6 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -71,7 +71,6 @@
#include "PHY_INTERFACE/phy_interface_vars.h"
#include "common/utils/LOG/log.h"
-#include "common/utils/LOG/log_extern.h"
#include "UTIL/OTG/otg_tx.h"
#include "UTIL/OTG/otg_externs.h"
#include "UTIL/MATH/oml.h"