Merge branch 'develop_nfapi_rm2162' into develop

common/utils/LOG/log.h

@@ -118,6 +118,8 @@ extern "C" {
 #define FLAG_NOCOLOR     0x0001  /*!< \brief use colors in log messages, depending on level */
 #define FLAG_THREAD      0x0008  /*!< \brief display thread name in log messages */
 #define FLAG_LEVEL       0x0010  /*!< \brief display log level in log messages */
+#define FLAG_FUNCT       0x0020
+#define FLAG_FILE_LINE   0x0040
 #define FLAG_TIME        0x0100
 #define FLAG_INITIALIZED 0x8000
 
@@ -302,6 +304,20 @@ 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);

common/utils/LOG/log_extern.h

@@ -28,3 +28,6 @@ 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];

openair2/ENB_APP/enb_app.c

@@ -231,8 +231,8 @@ void *eNB_app_task(void *args_p)
 #endif
 
   /* Try to register each eNB with each other */
-  x2_registered_enb = 0;
-  x2_register_enb_pending = eNB_app_register_x2 (enb_id_start, enb_id_end);
+//  x2_registered_enb = 0;
+//  x2_register_enb_pending = eNB_app_register_x2 (enb_id_start, enb_id_end);
 
   do {
     // Wait for a message

targets/RT/USER/lte-softmodem-common.c

@@ -78,6 +78,13 @@ void get_common_options(void) {
     load_module_shlib("telnetsrv",NULL,0,NULL);
   }
 
+  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 (noS1) {
     set_softmodem_optmask(SOFTMODEM_NOS1_BIT);
   }

targets/RT/USER/lte-softmodem.c

@@ -286,6 +286,7 @@ void exit_function(const char *file, const char *function, const int line, const
     printf("%s:%d %s() Exiting OAI softmodem: %s\n",file,line, function, s);
   }
 
+  close_log_mem();
   oai_exit = 1;
 
   if (RC.ru == NULL)

targets/RT/USER/lte-softmodem.h

@@ -225,6 +225,7 @@
     {"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},        \
     {"msc",                CONFIG_HLP_MSC,  PARAMFLAG_BOOL,   uptr:&START_MSC,            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
@@ -236,6 +237,7 @@
     { .s2=  { config_check_intrange,           {0,4}}},               \
     { .s5= {NULL }} ,                   \
     { .s5= {NULL }} ,                   \
+    { .s5= {NULL }} ,                   \
   }
 
 /***************************************************************************************************************************************/