Skip to content

O
OpenXG-RAN
Commit 94f70412 authored by Cedric Roux's avatar Cedric Roux
Browse files
Options

T: enb: plot dci/ack/nack for 2nd UE too

parent 9ec8fe49
Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 106 deletions
common/utils/T/tracer/enb.c
View file @ 94f70412
...@@ -86,16 +86,16 @@ static void *gui_thread(void *_g) ...@@ -86,16 +86,16 @@ static void *gui_thread(void *_g)
return NULL; return NULL;
} }
static filter *ticktime_filter(void *database, char *event, int i, int cc) static filter *ticktime_filter(void *database, char *event, int i, int cc, int ue)
{ {
/* filter is "CC_id == cc && harq_pid == i && UE_id == 0 && eNB_id == 0" */ /* filter is "CC_id == cc && harq_pid == i && UE_id == ue && eNB_id == 0" */
return return
filter_and( filter_and(
filter_eq(filter_evarg(database, event, "CC_id"), filter_int(cc)), filter_eq(filter_evarg(database, event, "CC_id"), filter_int(cc)),
filter_and( filter_and(
filter_eq(filter_evarg(database, event, "harq_pid"), filter_int(i)), filter_eq(filter_evarg(database, event, "harq_pid"), filter_int(i)),
filter_and( filter_and(
filter_eq(filter_evarg(database, event, "UE_id"), filter_int(0)), filter_eq(filter_evarg(database, event, "UE_id"), filter_int(ue)),
filter_eq(filter_evarg(database, event, "eNB_ID"),filter_int(0))))); filter_eq(filter_evarg(database, event, "eNB_ID"),filter_int(0)))));
} }
...@@ -217,7 +217,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database) ...@@ -217,7 +217,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
/* UE 0 PUCCH IQ data */ /* UE 0 PUCCH IQ data */
w = new_xy_plot(g, 55, 55, "PUCCH IQ [UE 0]", 50); w = new_xy_plot(g, 55, 55, "PUCCH IQ [UE 0]", 50);
widget_add_child(g, line, w, -1); widget_add_child(g, line, w, -1);
xy_plot_set_range(g, w, -100, 100, -100, 100); xy_plot_set_range(g, w, -3000, 3000, -3000, 3000);
l = new_iqdotlog(h, database, "ENB_PHY_PUCCH_1AB_IQ", "I", "Q"); l = new_iqdotlog(h, database, "ENB_PHY_PUCCH_1AB_IQ", "I", "Q");
v = new_view_xy(500, 10, g, w, new_color(g,"#000"), XY_LOOP_MODE); v = new_view_xy(500, 10, g, w, new_color(g,"#000"), XY_LOOP_MODE);
logger_add_view(l, v); logger_add_view(l, v);
...@@ -240,45 +240,49 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database) ...@@ -240,45 +240,49 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
timeview = new_view_time(3600, 10, g, timeline_plot); timeview = new_view_time(3600, 10, g, timeline_plot);
/* DL tick logging */ /* DL tick logging */
timelog = new_timelog(h, database, "ENB_PHY_DL_TICK"); timelog = new_timelog(h, database, "ENB_PHY_DL_TICK");
subview = new_subview_time(timeview, 0, new_color(g, "#77c"), 3600*1000); subview = new_subview_time(timeview, 0, new_color(g, "#77c"), 600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
/* DL DCI logging */ /* DL DCI logging */
timelog = new_timelog(h, database, "ENB_PHY_DLSCH_UE_DCI"); timelog = new_timelog(h, database, "ENB_PHY_DLSCH_UE_DCI");
subview = new_subview_time(timeview, 1, new_color(g, "#228"), 3600*1000); subview = new_subview_time(timeview, 1, new_color(g, "#228"), 600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
/* DL ACK */ /* DL ACK */
timelog = new_timelog(h, database, "ENB_PHY_DLSCH_UE_ACK"); timelog = new_timelog(h, database, "ENB_PHY_DLSCH_UE_ACK");
subview = new_subview_time(timeview, 2, new_color(g, "#282"), 3600*1000); subview = new_subview_time(timeview, 2, new_color(g, "#282"), 600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
/* DL NACK */ /* DL NACK */
timelog = new_timelog(h, database, "ENB_PHY_DLSCH_UE_NACK"); timelog = new_timelog(h, database, "ENB_PHY_DLSCH_UE_NACK");
subview = new_subview_time(timeview, 3, new_color(g, "#f22"), 3600*1000); subview = new_subview_time(timeview, 3, new_color(g, "#f22"), 600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
/* UL tick logging */ /* UL tick logging */
timelog = new_timelog(h, database, "ENB_PHY_UL_TICK"); timelog = new_timelog(h, database, "ENB_PHY_UL_TICK");
subview = new_subview_time(timeview, 4, new_color(g, "#77c"), 3600*1000); subview = new_subview_time(timeview, 4, new_color(g, "#77c"), 600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
/* UL DCI logging */ /* UL DCI logging */
timelog = new_timelog(h, database, "ENB_PHY_ULSCH_UE_DCI"); timelog = new_timelog(h, database, "ENB_PHY_ULSCH_UE_DCI");
subview = new_subview_time(timeview, 5, new_color(g, "#228"), 3600*1000); subview = new_subview_time(timeview, 5, new_color(g, "#228"), 600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
/* UL retransmission without DCI logging */ /* UL retransmission without DCI logging */
timelog = new_timelog(h,database,"ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION"); timelog = new_timelog(h,database,"ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION");
subview = new_subview_time(timeview, 5, new_color(g, "#f22"), 3600*1000); subview = new_subview_time(timeview, 5, new_color(g, "#f22"), 600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
/* UL ACK */ /* UL ACK */
timelog = new_timelog(h, database, "ENB_PHY_ULSCH_UE_ACK"); timelog = new_timelog(h, database, "ENB_PHY_ULSCH_UE_ACK");
subview = new_subview_time(timeview, 6, new_color(g, "#282"), 3600*1000); subview = new_subview_time(timeview, 6, new_color(g, "#282"), 600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
/* UL NACK */ /* UL NACK */
timelog = new_timelog(h, database, "ENB_PHY_ULSCH_UE_NACK"); timelog = new_timelog(h, database, "ENB_PHY_ULSCH_UE_NACK");
subview = new_subview_time(timeview, 7, new_color(g, "#f22"), 3600*1000); subview = new_subview_time(timeview, 7, new_color(g, "#f22"), 600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
int ue;
for (ue = 0; ue < 2; ue++) {
char s[256];
/* harq processes' ticktime view */ /* harq processes' ticktime view */
sprintf(s, "DL/UL HARQ (x8) [UE %d]", ue);
widget_add_child(g, top_container, widget_add_child(g, top_container,
new_label(g,"DL/UL HARQ (x8) [UE 0]"), -1); new_label(g, s), -1);
line = new_container(g, HORIZONTAL); line = new_container(g, HORIZONTAL);
widget_add_child(g, top_container, line, -1); widget_add_child(g, top_container, line, -1);
timeline_plot = new_timeline(g, 512, 2*8+2+8, 3); timeline_plot = new_timeline(g, 512, 2*8+2+8, 3);
...@@ -294,10 +298,10 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database) ...@@ -294,10 +298,10 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
/* tick */ /* tick */
timelog = new_ticklog(h, database, "ENB_MASTER_TICK", "frame", "subframe"); timelog = new_ticklog(h, database, "ENB_MASTER_TICK", "frame", "subframe");
/* tick on DL view */ /* tick on DL view */
subview = new_subview_ticktime(timeview, 0, new_color(g,"#bbb"), 3600*1000); subview = new_subview_ticktime(timeview, 0, new_color(g,"#bbb"), 600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
/* tick on UL view */ /* tick on UL view */
subview = new_subview_ticktime(timeview,9+8,new_color(g,"#bbb"), 3600*1000); subview = new_subview_ticktime(timeview,9+8,new_color(g,"#bbb"), 600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
/* DL harq pids */ /* DL harq pids */
for (cc = 0; cc < 2; cc++) for (cc = 0; cc < 2; cc++)
...@@ -308,7 +312,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database) ...@@ -308,7 +312,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
new_color(g,"#55f"), 3600*1000); new_color(g,"#55f"), 3600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
logger_set_filter(timelog, logger_set_filter(timelog,
ticktime_filter(database, "ENB_PHY_DLSCH_UE_DCI", i, cc)); ticktime_filter(database, "ENB_PHY_DLSCH_UE_DCI", i, cc, ue));
} }
/* DL ACK */ /* DL ACK */
for (cc = 0; cc < 2; cc++) for (cc = 0; cc < 2; cc++)
...@@ -319,7 +323,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database) ...@@ -319,7 +323,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
new_color(g,"#282"), 3600*1000); new_color(g,"#282"), 3600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
logger_set_filter(timelog, logger_set_filter(timelog,
ticktime_filter(database, "ENB_PHY_DLSCH_UE_ACK", i, cc)); ticktime_filter(database, "ENB_PHY_DLSCH_UE_ACK", i, cc, ue));
} }
/* DL NACK */ /* DL NACK */
for (cc = 0; cc < 2; cc++) for (cc = 0; cc < 2; cc++)
...@@ -330,7 +334,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database) ...@@ -330,7 +334,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
new_color(g,"#f22"), 3600*1000); new_color(g,"#f22"), 3600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
logger_set_filter(timelog, logger_set_filter(timelog,
ticktime_filter(database, "ENB_PHY_DLSCH_UE_NACK", i, cc)); ticktime_filter(database, "ENB_PHY_DLSCH_UE_NACK", i, cc, ue));
} }
/* UL harq pids */ /* UL harq pids */
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
...@@ -341,7 +345,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database) ...@@ -341,7 +345,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
new_color(g,"#55f"), 3600*1000); new_color(g,"#55f"), 3600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
logger_set_filter(timelog, logger_set_filter(timelog,
ticktime_filter(database, "ENB_PHY_ULSCH_UE_DCI", i, 0)); ticktime_filter(database, "ENB_PHY_ULSCH_UE_DCI", i, 0, ue));
/* retransmission */ /* retransmission */
timelog = new_ticklog(h, database, timelog = new_ticklog(h, database,
"ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", "frame", "subframe"); "ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", "frame", "subframe");
...@@ -350,7 +354,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database) ...@@ -350,7 +354,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
logger_set_filter(timelog, logger_set_filter(timelog,
ticktime_filter(database, ticktime_filter(database,
"ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", i, 0)); "ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", i, 0, ue));
} }
/* UL ACK */ /* UL ACK */
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
...@@ -360,7 +364,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database) ...@@ -360,7 +364,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
new_color(g,"#282"), 3600*1000); new_color(g,"#282"), 3600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
logger_set_filter(timelog, logger_set_filter(timelog,
ticktime_filter(database, "ENB_PHY_ULSCH_UE_ACK", i, 0)); ticktime_filter(database, "ENB_PHY_ULSCH_UE_ACK", i, 0, ue));
} }
/* UL NACK */ /* UL NACK */
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
...@@ -370,7 +374,8 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database) ...@@ -370,7 +374,8 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
new_color(g,"#f22"), 3600*1000); new_color(g,"#f22"), 3600*1000);
logger_add_view(timelog, subview); logger_add_view(timelog, subview);
logger_set_filter(timelog, logger_set_filter(timelog,
ticktime_filter(database, "ENB_PHY_ULSCH_UE_NACK", i, 0)); ticktime_filter(database, "ENB_PHY_ULSCH_UE_NACK", i, 0, ue));
}
} }
/* phy/mac/rlc/pdcp/rrc textlog */ /* phy/mac/rlc/pdcp/rrc textlog */
......
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