Commit 40f72965 authored by Swetank Srivastava's avatar Swetank Srivastava Committed by Vijay C

Logging changes

parent 4c5e1cb5
......@@ -161,6 +161,17 @@ extern "C" {
#define DEBUG_DLSCH_DECOD (1<<14)
#define UE_TIMING (1<<20)
#define DEBUG_ENB_SS (1<<21)
#define DEBUG_ENB_SS_PORTMAN (1<<22)
#define DEBUG_ENB_SS_SYS_TASK (1<<23)
#define DEBUG_ENB_SS_SRB_ACP (1<<24)
#define DEBUG_ENB_SS_SYSIND (1<<25)
#define DEBUG_ENB_SS_SYSIND_ACP (1<<26)
#define DEBUG_ENB_SS_SRB (1<<27)
#define DEBUG_ENB_SS_DRB (1<<28)
#define DEBUG_ENB_SS_DRB_ACP (1<<29)
#define DEBUG_ENB_SS_VNG (1<<30)
#define DEBUG_ENB_SS_VTP (1<<31)
#define DEBUG_ENB_SS_VT_TIMER (1<<32)
#define LOG_MASKMAP_INIT {\
{"PRACH", DEBUG_PRACH},\
......@@ -180,6 +191,17 @@ extern "C" {
{"DLSCH_DECOD", DEBUG_DLSCH_DECOD},\
{"UE_TIMING", UE_TIMING},\
{"ENB_SS", DEBUG_ENB_SS},\
{"ENB_SS_PORTMAN", DEBUG_ENB_SS_PORTMAN},\
{"ENB_SS_SYS_TASK", DEBUG_ENB_SS_SYS_TASK},\
{"ENB_SS_SRB_ACP", DEBUG_ENB_SS_SRB_ACP},\
{"ENB_SS_SYSIND", DEBUG_ENB_SS_SYSIND},\
{"ENB_SS_SYSIND_ACP", DEBUG_ENB_SS_SYSIND_ACP},\
{"ENB_SS_SRB", DEBUG_ENB_SS_SRB},\
{"ENB_SS_DRB", DEBUG_ENB_SS_DRB},\
{"ENB_SS_DRB_ACP", DEBUG_ENB_SS_DRB_ACP},\
{"ENB_SS_VNG", DEBUG_ENB_SS_VNG},\
{"ENB_SS_VTP", DEBUG_ENB_SS_VTP},\
{"ENB_SS_VT_TIMER", DEBUG_ENB_SS_VT_TIMER},\
{NULL,-1}\
}
......
......@@ -634,6 +634,237 @@ ID = LEGACY_ENB_SS_TRACE
GROUP = ALL:LEGACY_ENB_SS:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_PORTMAN_INFO
DESC = ENB_SS_PORTMAN legacy logs - info level
GROUP = ALL:LEGACY_ENB_SS_PORTMAN:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_PORTMAN_ERROR
DESC = ENB_SS_PORTMAN legacy logs - error level
GROUP = ALL:LEGACY_ENB_SS_PORTMAN:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_PORTMAN_WARNING
DESC = ENB_SS_PORTMAN legacy logs - warning level
GROUP = ALL:LEGACY_ENB_SS_PORTMAN:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_PORTMAN_DEBUG
DESC = ENB_SS_PORTMAN legacy logs - debug level
GROUP = ALL:LEGACY_ENB_SS_PORTMAN:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_PORTMAN_TRACE
DESC = ENB_SS_PORTMAN legacy logs - trace level
GROUP = ALL:LEGACY_ENB_SS_PORTMAN:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYS_TASK_INFO
DESC = ENB_SS_SYS_TASK legacy logs - info level
GROUP = ALL:LEGACY_ENB_SS_SYS_TASK:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYS_TASK_ERROR
DESC = ENB_SS_SYS_TASK legacy logs - error level
GROUP = ALL:LEGACY_ENB_SS_SYS_TASK:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYS_TASK_WARNING
DESC = ENB_SS_SYS_TASK legacy logs - warning level
GROUP = ALL:LEGACY_ENB_SS_SYS_TASK:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYS_TASK_DEBUG
DESC = ENB_SS_SYS_TASK legacy logs - debug level
GROUP = ALL:LEGACY_ENB_SS_SYS_TASK:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYS_TASK_TRACE
DESC = ENB_SS_SYS_TASK legacy logs - trace level
GROUP = ALL:LEGACY_ENB_SS_SYS_TASK:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SRB_ACP_INFO
DESC = ENB_SS_SRB_ACP legacy logs - info level
GROUP = ALL:LEGACY_ENB_SS_SRB_ACP:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SRB_ACP_ERROR
DESC = ENB_SS_SRB_ACP legacy logs - error level
GROUP = ALL:LEGACY_ENB_SS_SRB_ACP:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SRB_ACP_WARNING
DESC = ENB_SS_SRB_ACP legacy logs - warning level
GROUP = ALL:LEGACY_ENB_SS_SRB_ACP:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SRB_ACP_DEBUG
DESC = ENB_SS_SRB_ACP legacy logs - debug level
GROUP = ALL:LEGACY_ENB_SS_SRB_ACP:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SRB_ACP_TRACE
DESC = ENB_SS_SRB_ACP legacy logs - trace level
GROUP = ALL:LEGACY_ENB_SS_SRB_ACP:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYSIND_INFO
DESC = ENB_SS_SYSIND legacy logs - info level
GROUP = ALL:LEGACY_ENB_SS_SYSIND:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYSIND_ERROR
DESC = ENB_SS_SYSIND legacy logs - error level
GROUP = ALL:LEGACY_ENB_SS_SYSIND:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYSIND_WARNING
DESC = ENB_SS_SYSIND legacy logs - warning level
GROUP = ALL:LEGACY_ENB_SS_SYSIND:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYSIND_DEBUG
DESC = ENB_SS_SYSIND legacy logs - debug level
GROUP = ALL:LEGACY_ENB_SS_SYSIND:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYSIND_TRACE
DESC = ENB_SS_SYSIND legacy logs - trace level
GROUP = ALL:LEGACY_ENB_SS_SYSIND:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYSIND_ACP_INFO
DESC = ENB_SS_SYSIND_ACP legacy logs - info level
GROUP = ALL:LEGACY_ENB_SS_SYSIND_ACP:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYSIND_ACP_ERROR
DESC = ENB_SS_SYSIND_ACP legacy logs - error level
GROUP = ALL:LEGACY_ENB_SS_SYSIND_ACP:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYSIND_ACP_WARNING
DESC = ENB_SS_SYSIND_ACP legacy logs - warning level
GROUP = ALL:LEGACY_ENB_SS_SYSIND_ACP:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYSIND_ACP_DEBUG
DESC = ENB_SS_SYSIND_ACP legacy logs - debug level
GROUP = ALL:LEGACY_ENB_SS_SYSIND_ACP:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SYSIND_ACP_TRACE
DESC = ENB_SS_SYSIND_ACP legacy logs - trace level
GROUP = ALL:LEGACY_ENB_SS_SYSIND_ACP:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SRB_INFO
DESC = ENB_SS_SRB legacy logs - info level
GROUP = ALL:LEGACY_ENB_SS_SRB:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SRB_ERROR
DESC = ENB_SS_SRB legacy logs - error level
GROUP = ALL:LEGACY_ENB_SS_SRB:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SRB_WARNING
DESC = ENB_SS_SRB legacy logs - warning level
GROUP = ALL:LEGACY_ENB_SS_SRB:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SRB_DEBUG
DESC = ENB_SS_SRB legacy logs - debug level
GROUP = ALL:LEGACY_ENB_SS_SRB:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_SRB_TRACE
DESC = ENB_SS_SRB legacy logs - trace level
GROUP = ALL:LEGACY_ENB_SS_SRB:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_DRB_INFO
DESC = ENB_SS_DRB legacy logs - info level
GROUP = ALL:LEGACY_ENB_SS_DRB:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_DRB_ERROR
DESC = ENB_SS_DRB legacy logs - error level
GROUP = ALL:LEGACY_ENB_SS_DRB:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_DRB_WARNING
DESC = ENB_SS_DRB legacy logs - warning level
GROUP = ALL:LEGACY_ENB_SS_DRB:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_DRB_DEBUG
DESC = ENB_SS_DRB legacy logs - debug level
GROUP = ALL:LEGACY_ENB_SS_DRB:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_DRB_TRACE
DESC = ENB_SS_DRB legacy logs - trace level
GROUP = ALL:LEGACY_ENB_SS_DRB:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_DRB_ACP_INFO
DESC = ENB_SS_DRB_ACP legacy logs - info level
GROUP = ALL:LEGACY_ENB_SS_DRB_ACP:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_DRB_ACP_ERROR
DESC = ENB_SS_DRB_ACP legacy logs - error level
GROUP = ALL:LEGACY_ENB_SS_DRB_ACP:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_DRB_ACP_WARNING
DESC = ENB_SS_DRB_ACP legacy logs - warning level
GROUP = ALL:LEGACY_ENB_SS_DRB_ACP:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_DRB_ACP_DEBUG
DESC = ENB_SS_DRB_ACP legacy logs - debug level
GROUP = ALL:LEGACY_ENB_SS_DRB_ACP:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_DRB_ACP_TRACE
DESC = ENB_SS_DRB_ACP legacy logs - trace level
GROUP = ALL:LEGACY_ENB_SS_DRB_ACP:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VNG_INFO
DESC = ENB_SS_VNG legacy logs - info level
GROUP = ALL:LEGACY_ENB_SS_VNG:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VNG_ERROR
DESC = ENB_SS_VNG legacy logs - error level
GROUP = ALL:LEGACY_ENB_SS_VNG:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VNG_WARNING
DESC = ENB_SS_VNG legacy logs - warning level
GROUP = ALL:LEGACY_ENB_SS_VNG:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VNG_DEBUG
DESC = ENB_SS_VNG legacy logs - debug level
GROUP = ALL:LEGACY_ENB_SS_VNG:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VNG_TRACE
DESC = ENB_SS_VNG legacy logs - trace level
GROUP = ALL:LEGACY_ENB_SS_VNG:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VTP_INFO
DESC = ENB_SS_VTP legacy logs - info level
GROUP = ALL:LEGACY_ENB_SS_VTP:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VTP_ERROR
DESC = ENB_SS_VTP legacy logs - error level
GROUP = ALL:LEGACY_ENB_SS_VTP:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VTP_WARNING
DESC = ENB_SS_VTP legacy logs - warning level
GROUP = ALL:LEGACY_ENB_SS_VTP:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VTP_DEBUG
DESC = ENB_SS_VTP legacy logs - debug level
GROUP = ALL:LEGACY_ENB_SS_VTP:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VTP_TRACE
DESC = ENB_SS_VTP legacy logs - trace level
GROUP = ALL:LEGACY_ENB_SS_VTP:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VT_TIMER_INFO
DESC = ENB_SS_VT_TIMER legacy logs - info level
GROUP = ALL:LEGACY_ENB_SS_VT_TIMER:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VT_TIMER_ERROR
DESC = ENB_SS_VT_TIMER legacy logs - error level
GROUP = ALL:LEGACY_ENB_SS_VT_TIMER:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VT_TIMER_WARNING
DESC = ENB_SS_VT_TIMER legacy logs - warning level
GROUP = ALL:LEGACY_ENB_SS_VT_TIMER:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VT_TIMER_DEBUG
DESC = ENB_SS_VT_TIMER legacy logs - debug level
GROUP = ALL:LEGACY_ENB_SS_VT_TIMER:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_ENB_SS_VT_TIMER_TRACE
DESC = ENB_SS_VT_TIMER legacy logs - trace level
GROUP = ALL:LEGACY_ENB_SS_VT_TIMER:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_GNB_APP_INFO
DESC = GNB_APP legacy logs - info level
GROUP = ALL:LEGACY_GNB_APP:LEGACY_GROUP_INFO:LEGACY
......
......@@ -2467,13 +2467,6 @@ schedule_ulsch_rnti(module_id_t module_idP,
bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, uint8_t SR_received)
{
static uint8_t first_scheduling = 0;
static frame_t next_scheduling_frame = 0;
static sub_frame_t next_scheduling_subframe = 0;
static uint32_t num_frame = 0;
static uint32_t num_subframe = 0;
LOG_I(MAC, "%s current frame:%d subframe:%d subframe_counter value:%d\n", __FUNCTION__, frameP, subframeP, RC.ss.ulgrant_info[CC_id].periodiGrantInfo.subframe_counter);
if (RC.ss.ulgrant_info[CC_id].ulGrantType == NONE_PRESENT)
......
......@@ -656,6 +656,8 @@ int sys_add_reconfig_cell(struct SYSTEM_CTRL_REQ *req)
}
uint8_t msg_queued = 0;
ss_set_timinfo_t tinfo, timer_tinfo;
timer_tinfo.sfn = req->Common.TimingInfo.v.SubFrame.SFN.v.Number;
timer_tinfo.sf = req->Common.TimingInfo.v.SubFrame.Subframe.v.Number;
#if 0
if (req->Common.TimingInfo.d == TimingInfo_Type_SubFrame)
{
......@@ -1036,13 +1038,13 @@ int sys_handle_cell_config_req(struct SYSTEM_CTRL_REQ *req)
//Increment the nb_CC supported as new cell is confiured.
if ((RC.nb_CC[0] ) >= MAX_NUM_CCs) {
LOG_E (ENB_SS,"[SYS] Can't add cell, MAX_NUM_CC reached (%d > %d) \n", RC.nb_CC[0], MAX_NUM_CCs);
LOG_E (ENB_SS_SYS_TASK,"[SYS] Can't add cell, MAX_NUM_CC reached (%d > %d) \n", RC.nb_CC[0], MAX_NUM_CCs);
} else {
RC.nb_CC[0] ++;
//Set the number of MAC_CC to current configured CC value
*RC.nb_mac_CC= RC.nb_CC[0];
LOG_I (ENB_SS,"[SYS] CC-MGMT nb_cc is incremented current Configured CC are %d current CC_index %d nb_mac_CC %d\n",
LOG_I (ENB_SS_SYS_TASK,"[SYS] CC-MGMT nb_cc is incremented current Configured CC are %d current CC_index %d nb_mac_CC %d\n",
RC.nb_CC[0],cell_index,*RC.nb_mac_CC);
}
}
......
......@@ -37,6 +37,7 @@ extern SSConfigContext_t SS_context;
extern RAN_CONTEXT_t RC;
int cellIndex = 0;
int ss_eNB_vtp_init(void);
static acpCtx_t ctx_vtp_g = NULL;
extern SSConfigContext_t SS_context;
enum MsgUserId
......@@ -398,7 +399,6 @@ static void ss_eNB_wait_first_msg(void)
const size_t size = 16 * 1024;
unsigned char *buffer = (unsigned char *)acpMalloc(size);
assert(buffer);
size_t msg_sz = size;
while (1)
{
ss_eNB_read_from_vtp_socket(ctx_vtp_g, true);
......
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