maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/asn1_log_issue' into integration_2023_w30

Browse Source
This commit is contained in:
Robert Schmidt
2023-07-29 07:24:15 +02:00
parent e188faa377 5f5b8f2914
commit f79bab42fa
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -268,7 +268,7 @@ add_library(ITTI ${OCP_ITTI}/intertask_interface.cpp)
target_link_libraries(ITTI PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs) target_link_libraries(ITTI PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
# asn1c skeletons have hardcoded this flag to make customized debug logs # asn1c skeletons have hardcoded this flag to make customized debug logs
# OAI uses this feature to re-use OAI LOG_I(ASN, ...) # OAI uses this feature to re-use OAI LOG_I(ASN1, ...)
if (DEBUG_ASN1C) if (DEBUG_ASN1C)
add_definitions(-DHAVE_CONFIG_H) add_definitions(-DHAVE_CONFIG_H)
endif() endif()
common/utils/LOG/log.c
+1 -1
View File
@@ -487,7 +487,7 @@ int logInit (void)
register_log_component("SCTP","",SCTP); register_log_component("SCTP","",SCTP);
register_log_component("X2AP","",X2AP); register_log_component("X2AP","",X2AP);
register_log_component("LOADER","log",LOADER); register_log_component("LOADER","log",LOADER);
register_log_component("ASN","log",ASN); register_log_component("ASN1","log",ASN1);
register_log_component("NFAPI_VNF","log",NFAPI_VNF); register_log_component("NFAPI_VNF","log",NFAPI_VNF);
register_log_component("NFAPI_PNF","log",NFAPI_PNF); register_log_component("NFAPI_PNF","log",NFAPI_PNF);
register_log_component("GNB_APP","log",GNB_APP); register_log_component("GNB_APP","log",GNB_APP);
common/utils/LOG/log.h
+1 -1
View File
@@ -240,7 +240,7 @@ typedef enum {
NR_MAC, NR_MAC,
NR_PHY, NR_PHY,
LOADER, LOADER,
ASN, ASN1,
NFAPI_VNF, NFAPI_VNF,
NFAPI_PNF, NFAPI_PNF,
ITTI, ITTI,
common/utils/config.h
+6 -6
View File
@@ -27,28 +27,28 @@
/* /*
* This file "config.h" will be used by asn1c if HAVE_CONFIG_H_ is defined and * This file "config.h" will be used by asn1c if HAVE_CONFIG_H_ is defined and
* included. This logs asn1c encoder and decoder traces at execution time using * included. This logs asn1c encoder and decoder traces at execution time using
* the regular OAI logging system, i.e., LOG_I(ASN...); * the regular OAI logging system, i.e., LOG_I(ASN1...);
* *
* As it is very verbose, note that you can change the log level per module in * As it is very verbose, note that you can change the log level per module in
* source or in gdb, e.g., to only activate it for a short time. * source or in gdb, e.g., to only activate it for a short time.
* *
* In code: * In code:
* ``` * ```
* set_log(ASN, OAI_INFO); // enable logging * set_log(ASN1, OAI_INFO); // enable logging
* // do your encoding here * // do your encoding here
* set_log(ASN, OAI_ERR); // disable logging * set_log(ASN1, OAI_ERR); // disable logging
* ``` * ```
* *
* in gdb: * in gdb:
* ``` * ```
* gdb> p set_log(ASN, 1) // disable log, 1 == OAI_ERR * gdb> p set_log(ASN1, 1) // disable log, 1 == OAI_ERR
* gdb> p set_log(ASN, 5) // enable log, 5 == OAI_INFO * gdb> p set_log(ASN1, 5) // enable log, 5 == OAI_INFO
* ``` * ```
*/ */
#include "common/utils/LOG/log.h" #include "common/utils/LOG/log.h"
#if DEBUG_ASN1C #if DEBUG_ASN1C
#define ASN_DEBUG(x...) do{ LOG_I(ASN,x);LOG_I(ASN,"\n"); } while(false) #define ASN_DEBUG(x...) do{ LOG_I(ASN1,x);LOG_I(ASN1,"\n"); } while(false)
#else #else
#define ASN_DEBUG(x...) #define ASN_DEBUG(x...)
#endif #endif