Skip to content

O
OpenXG-RAN
Commit 24d30ae7 authored by Laurent THOMAS's avatar Laurent THOMAS
Browse files
Options

log module improvement: remove redundant declarations y using C macro, remove... 

log module improvement: remove redundant declarations y using C macro, remove unused variables, remove unused log components, move information to smaller visibility
parent bc6d1ad4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 244 additions and 305 deletions
common/utils/LOG/log.c
View file @ 24d30ae7
This diff is collapsed.
common/utils/LOG/log.h
View file @ 24d30ae7
...@@ -85,31 +85,6 @@ extern "C" { ...@@ -85,31 +85,6 @@ extern "C" {
#define NUM_LOG_LEVEL 6 /*!< \brief the number of message levels users have with LOG (OAILOG_DISABLE is not available to user as a level, so it is not included)*/ #define NUM_LOG_LEVEL 6 /*!< \brief the number of message levels users have with LOG (OAILOG_DISABLE is not available to user as a level, so it is not included)*/
/** @}*/ /** @}*/
/** @defgroup _log_format Defined log format
* @ingroup _macro
* @brief Macro of log formats defined by LOG
* @{*/
/* .log_format = 0x13 uncolored standard messages
* .log_format = 0x93 colored standard messages */
/* keep white space in first position; switching it to 0 allows colors to be disabled*/
#define LOG_RED "\033[1;31m" /*!< \brief VT100 sequence for bold red foreground */
#define LOG_GREEN "\033[32m" /*!< \brief VT100 sequence for green foreground */
#define LOG_ORANGE "\033[93m" /*!< \brief VT100 sequence for orange foreground */
#define LOG_BLUE "\033[34m" /*!< \brief VT100 sequence for blue foreground */
#define LOG_CYBL "\033[40;36m" /*!< \brief VT100 sequence for cyan foreground on black background */
#define LOG_RESET "\033[0m" /*!< \brief VT100 sequence for reset (black) foreground */
#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_THREAD_ID 0x0200
#define FLAG_REAL_TIME 0x0400
#define FLAG_INITIALIZED 0x8000
/** @}*/
#define SET_LOG_OPTION(O) g_log->flag = (g_log->flag | O) #define SET_LOG_OPTION(O) g_log->flag = (g_log->flag | O)
#define CLEAR_LOG_OPTION(O) g_log->flag = (g_log->flag & (~O)) #define CLEAR_LOG_OPTION(O) g_log->flag = (g_log->flag & (~O))
...@@ -138,92 +113,73 @@ extern "C" { ...@@ -138,92 +113,73 @@ extern "C" {
#define DEBUG_DLSCH_DECOD (1<<14) #define DEBUG_DLSCH_DECOD (1<<14)
#define UE_TIMING (1<<20) #define UE_TIMING (1<<20)
#define LOG_MASKMAP_INIT {\
{"PRACH", DEBUG_PRACH},\
{"RU", DEBUG_RU},\
{"UE_PHYPROC", DEBUG_UE_PHYPROC},\
{"LTEESTIM", DEBUG_LTEESTIM},\
{"DLCELLSPEC", DEBUG_DLCELLSPEC},\
{"ULSCH", DEBUG_ULSCH},\
{"RRC", DEBUG_RRC},\
{"PDCP", DEBUG_PDCP},\
{"DFT", DEBUG_DFT},\
{"ASN1", DEBUG_ASN1},\
{"CTRLSOCKET", DEBUG_CTRLSOCKET},\
{"SECURITY", DEBUG_SECURITY},\
{"NAS", DEBUG_NAS},\
{"RLC", DEBUG_RLC},\
{"DLSCH_DECOD", DEBUG_DLSCH_DECOD},\
{"UE_TIMING", UE_TIMING},\
{NULL,-1}\
}
#define SET_LOG_DEBUG(B) g_log->debug_mask = (g_log->debug_mask | B) #define SET_LOG_DEBUG(B) g_log->debug_mask = (g_log->debug_mask | B)
#define CLEAR_LOG_DEBUG(B) g_log->debug_mask = (g_log->debug_mask & (~B)) #define CLEAR_LOG_DEBUG(B) g_log->debug_mask = (g_log->debug_mask & (~B))
#define SET_LOG_DUMP(B) g_log->dump_mask = (g_log->dump_mask | B) #define SET_LOG_DUMP(B) g_log->dump_mask = (g_log->dump_mask | B)
#define CLEAR_LOG_DUMP(B) g_log->dump_mask = (g_log->dump_mask & (~B)) #define CLEAR_LOG_DUMP(B) g_log->dump_mask = (g_log->dump_mask & (~B))
typedef enum { #define FOREACH_COMP(COMP_DEF) \
MIN_LOG_COMPONENTS = 0, COMP_DEF(PHY, log) \
PHY = MIN_LOG_COMPONENTS, COMP_DEF(MAC, log) \
MAC, COMP_DEF(EMU, log) \
EMU, COMP_DEF(SIM, txt) \
SIM, COMP_DEF(OMG, csv) \
OMG, COMP_DEF(OPT, log) \
OPT, COMP_DEF(OTG, log) \
OTG, COMP_DEF(OTG_LATENCY, dat) \
OTG_LATENCY, COMP_DEF(OTG_LATENCY_BG, dat) \
OTG_LATENCY_BG, COMP_DEF(OTG_GP, dat) \
OTG_GP, COMP_DEF(OTG_GP_BG, dat) \
OTG_GP_BG, COMP_DEF(OTG_JITTER, dat) \
OTG_JITTER, COMP_DEF(RLC, ) \
RLC, COMP_DEF(PDCP, ) \
PDCP, COMP_DEF(RRC, ) \
RRC, COMP_DEF(NAS, log) \
NAS, COMP_DEF(OIP, ) \
PERF, COMP_DEF(CLI, ) \
OIP, COMP_DEF(OCM, ) \
CLI, COMP_DEF(GTPU, ) \
OCM, COMP_DEF(SDAP, ) \
UDP_, COMP_DEF(SPGW, ) \
GTPU, COMP_DEF(S1AP, ) \
SDAP, COMP_DEF(F1AP, ) \
SPGW, COMP_DEF(E1AP, ) \
S1AP, COMP_DEF(SCTP, ) \
F1AP, COMP_DEF(HW, ) \
E1AP, COMP_DEF(OSA, ) \
SCTP, COMP_DEF(ENB_APP, log) \
HW, COMP_DEF(MCE_APP, log) \
OSA, COMP_DEF(MME_APP, log) \
RAL_ENB, COMP_DEF(TMR, ) \
RAL_UE, COMP_DEF(USIM, log) \
ENB_APP, COMP_DEF(F1U, ) \
MCE_APP, COMP_DEF(X2AP, ) \
MME_APP, COMP_DEF(M2AP, ) \
TMR, COMP_DEF(M3AP, ) \
USIM, COMP_DEF(NGAP, ) \
LOCALIZE, COMP_DEF(GNB_APP, log) \
F1U, COMP_DEF(NR_RRC, log) \
X2AP, COMP_DEF(NR_MAC, log) \
M2AP, COMP_DEF(NR_MAC_DCI, log) \
M3AP, COMP_DEF(NR_PHY_DCI, log) \
NGAP, COMP_DEF(NR_PHY, log) \
GNB_APP, COMP_DEF(LOADER, log) \
NR_RRC, COMP_DEF(ASN1, log) \
NR_MAC, COMP_DEF(NFAPI_VNF, log) \
NR_MAC_DCI, COMP_DEF(NFAPI_PNF, log) \
NR_PHY_DCI, COMP_DEF(ITTI, log) \
NR_PHY, COMP_DEF(UTIL, log) \
LOADER, COMP_DEF(MAX_LOG_PREDEF_COMPONENTS, )
ASN1,
NFAPI_VNF, #define COMP_ENUM(comp, file_extension) comp,
NFAPI_PNF, typedef enum { FOREACH_COMP(COMP_ENUM) } comp_name_t;
ITTI,
UTIL, #define COMP_TEXT(comp, file_extension) #comp,
MAX_LOG_PREDEF_COMPONENTS, static const char *const comp_name[] = {FOREACH_COMP(COMP_TEXT)};
} comp_name_t;
#define COMP_EXTENSION(comp, file_extension) #file_extension,
static const char *const comp_extension[] = {FOREACH_COMP(COMP_EXTENSION)};
#define MAX_LOG_DYNALLOC_COMPONENTS 20 #define MAX_LOG_DYNALLOC_COMPONENTS 20
#define MAX_LOG_COMPONENTS (MAX_LOG_PREDEF_COMPONENTS + MAX_LOG_DYNALLOC_COMPONENTS) #define MAX_LOG_COMPONENTS (MAX_LOG_PREDEF_COMPONENTS + MAX_LOG_DYNALLOC_COMPONENTS)
...@@ -242,7 +198,7 @@ typedef struct { ...@@ -242,7 +198,7 @@ typedef struct {
typedef struct { typedef struct {
const char *name; const char *name;
int level; int level;
int filelog; int filelog;
FILE *stream; FILE *stream;
log_vprint_func_t vprint; log_vprint_func_t vprint;
...@@ -282,6 +238,9 @@ void log_dump(int component, void *buffer, int buffsize,int datatype, const char ...@@ -282,6 +238,9 @@ void log_dump(int component, void *buffer, int buffsize,int datatype, const char
int set_log(int component, int level); int set_log(int component, int level);
void set_glog(int level); void set_glog(int level);
mapping * log_level_names_ptr(void);
mapping * log_option_names_ptr(void);
mapping * log_maskmap_ptr(void);
void set_glog_onlinelog(int enable); void set_glog_onlinelog(int enable);
void set_glog_filelog(int enable); void set_glog_filelog(int enable);
void set_component_filelog(int comp); void set_component_filelog(int comp);
...@@ -290,9 +249,8 @@ void set_component_consolelog(int comp); ...@@ -290,9 +249,8 @@ void set_component_consolelog(int comp);
int map_str_to_int(const mapping *map, const char *str); int map_str_to_int(const mapping *map, const char *str);
char *map_int_to_str(const mapping *map, const int val); char *map_int_to_str(const mapping *map, const int val);
void logClean (void); void logClean (void);
int is_newline( char *str, int size);
int register_log_component(char *name, char *fext, int compidx); int register_log_component(const char *name, const char *fext, int compidx);
int logInit_log_mem(char*); int logInit_log_mem(char*);
void close_log_mem(void); void close_log_mem(void);
......
common/utils/telnetsrv/telnetsrv_proccmd.c
View file @ 24d30ae7
This diff is collapsed.
openair2/LAYER2/PDCP_v10.1.0/pdcp_sequence_manager.c
View file @ 24d30ae7
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
*/ */
#include "pdcp_sequence_manager.h" #include "pdcp_sequence_manager.h"
#include "common/utils//LOG/log.h" #include "common/utils/LOG/log.h"
#include "pdcp_util.h" #include "pdcp_util.h"
/* /*
......
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