Skip to content

O
OpenXG-RAN
Commit ccb876c8 authored by Florian Kaltenberger's avatar Florian Kaltenberger
Browse files
Options

fixing some bugs in previous commit

parent f6cf8d76
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 29 deletions
common/utils/T/tracer/enb.c
View file @ ccb876c8
......@@ -40,8 +40,8 @@ typedef struct {
logger *pucch1_energy_ue_energy_logger;
logger *pucch_iq_ue_logger;
logger *dl_dci_logger[8];
logger *dl_ack_logger[8];
logger *dl_nack_logger[8];
logger *dl_ack_logger[2][8];
logger *dl_nack_logger[2][8];
logger *ul_dci_logger[8];
logger *ul_dci_retransmission_logger[8];
logger *ul_ack_logger[8];
......@@ -113,7 +113,18 @@ static void *gui_thread(void *_g)
return NULL;
}
static filter *ticktime_filter(void *database, char *event, int i, int ue, int tb)
static filter *ticktime_filter(void *database, char *event, int i, int ue)
{
/* filter is harq_pid == i && UE_id == ue && eNB_id == 0" */
return
filter_and(
filter_eq(filter_evarg(database, event, "harq_pid"), filter_int(i)),
filter_and(
filter_eq(filter_evarg(database, event, "UE_id"), filter_int(ue)),
filter_eq(filter_evarg(database, event, "eNB_ID"), filter_int(0))));
}
static filter *ticktime_filter_tb(void *database, char *event, int i, int ue, int tb)
{
/* filter is "tb == tb && harq_pid == i && UE_id == ue && eNB_id == 0" */
return
......@@ -168,23 +179,25 @@ static void set_current_ue(gui *g, enb_data *e, int ue)
filter_eq(
filter_evarg(e->database, "ENB_PHY_PUCCH_1AB_IQ", "UE_ID"),
filter_int(ue)));
for (tb=0; tb<2; tb++)
for (i = 0; i < 8; i++) {
logger_set_filter(e->e->dl_dci_logger[i],
ticktime_filter(e->database, "ENB_PHY_DLSCH_UE_DCI", i, ue,tb));
logger_set_filter(e->e->dl_ack_logger[i],
ticktime_filter(e->database, "ENB_PHY_DLSCH_UE_ACK", i, ue,tb));
logger_set_filter(e->e->dl_nack_logger[i],
ticktime_filter(e->database, "ENB_PHY_DLSCH_UE_NACK", i, ue,tb));
ticktime_filter(e->database, "ENB_PHY_DLSCH_UE_DCI", i, ue));
for (tb=0; tb<2; tb++)
{
logger_set_filter(e->e->dl_ack_logger[tb][i],
ticktime_filter_tb(e->database, "ENB_PHY_DLSCH_UE_ACK", i, ue,tb));
logger_set_filter(e->e->dl_nack_logger[tb][i],
ticktime_filter_tb(e->database, "ENB_PHY_DLSCH_UE_NACK", i, ue,tb));
}
logger_set_filter(e->e->ul_dci_logger[i],
ticktime_filter(e->database, "ENB_PHY_ULSCH_UE_DCI", i, ue,tb));
ticktime_filter(e->database, "ENB_PHY_ULSCH_UE_DCI", i, ue));
logger_set_filter(e->e->ul_dci_retransmission_logger[i],
ticktime_filter(e->database,
"ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", i, ue,tb));
"ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", i, ue));
logger_set_filter(e->e->ul_ack_logger[i],
ticktime_filter(e->database, "ENB_PHY_ULSCH_UE_ACK", i, ue,tb));
ticktime_filter(e->database, "ENB_PHY_ULSCH_UE_ACK", i, ue));
logger_set_filter(e->e->ul_nack_logger[i],
ticktime_filter(e->database, "ENB_PHY_ULSCH_UE_NACK", i, ue,tb));
ticktime_filter(e->database, "ENB_PHY_ULSCH_UE_NACK", i, ue));
}
logger_set_filter(e->e->dl_mcs_logger,
filter_eq(
......@@ -457,24 +470,23 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database,
subview = new_subview_ticktime(timeview,9+8,new_color(g,"#bbb"), 3600*1000);
logger_add_view(timelog, subview);
/* DL DCI */
for (tb = 0; tb < 2; tb++)
for (i = 0; i < 8; i++) {
timelog = new_ticklog(h, database, "ENB_PHY_DLSCH_UE_DCI",
"frame", "subframe");
subview = new_subview_ticktime(timeview, i+1+tb*8,
subview = new_subview_ticktime(timeview, i+1+0*8,
new_color(g,"#55f"), 3600*1000);
logger_add_view(timelog, subview);
e->dl_dci_logger[i] = timelog;
}
/* DL ACK */
for (tb = 0; tb < 2; tb++)
for (tb = 0; tb < 2; tb++)
for (i = 0; i < 8; i++) {
timelog = new_ticklog(h, database, "ENB_PHY_DLSCH_UE_ACK",
"frame", "subframe");
subview = new_subview_ticktime(timeview, i+1+tb*8,
new_color(g,"#282"), 3600*1000);
logger_add_view(timelog, subview);
e->dl_ack_logger[i] = timelog;
e->dl_ack_logger[tb][i] = timelog;
}
/* DL NACK */
for (tb = 0; tb < 2; tb++)
......@@ -484,7 +496,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database,
subview = new_subview_ticktime(timeview, i+1+tb*8,
new_color(g,"#f22"), 3600*1000);
logger_add_view(timelog, subview);
e->dl_nack_logger[i] = timelog;
e->dl_nack_logger[tb][i] = timelog;
}
/* UL DCI/retransmission without DCI */
for (i = 0; i < 8; i++) {
......
openair1/SCHED/phy_procedures_lte_eNb.c
View file @ ccb876c8
......@@ -1720,8 +1720,8 @@ void process_HARQ_feedback(uint8_t UE_id,
}
}
// we always loop over 2 possible max TBs. If its not used it should habe been disabled
for (tb=0;tb<2;tb++) {
// we always loop over 2 possible max TBs. If its not used it should have been disabled
for (tb=0;tb<1;tb++) {
if (tb==0) {
dlsch_harq_proc = dlsch->harq_processes[dl_harq_pid[m]];
dl_harq_pid[m] = dlsch->harq_ids[dl_subframe];
......@@ -1758,8 +1758,7 @@ void process_HARQ_feedback(uint8_t UE_id,
dlsch->rnti,dl_harq_pid[m],M,m,mp,dlsch_harq_proc->round);
#endif
T(T_ENB_PHY_DLSCH_UE_NACK, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id), T_INT(dlsch->rnti),
T_INT(dl_harq_pid[m]),T_INT(tb));
T(T_ENB_PHY_DLSCH_UE_NACK, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id), T_INT(dlsch->rnti),T_INT(dl_harq_pid[m]),T_INT(tb));
if (dlsch_harq_proc->round == 0)
ue_stats->dlsch_NAK_round0++;
......@@ -1794,8 +1793,7 @@ void process_HARQ_feedback(uint8_t UE_id,
dlsch->rnti,dl_harq_pid[m],dlsch_harq_proc->round);
#endif
T(T_ENB_PHY_DLSCH_UE_ACK, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id), T_INT(dlsch->rnti),
T_INT(dl_harq_pid[m]),T_INT(tb));
T(T_ENB_PHY_DLSCH_UE_ACK, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(UE_id), T_INT(dlsch->rnti), T_INT(dl_harq_pid[m]), T_INT(tb));
// TODO: add TB to stats
ue_stats->dlsch_ACK[dl_harq_pid[m]][dlsch_harq_proc->round]++;
......
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @ ccb876c8
......@@ -871,7 +871,7 @@ schedule_ue_spec(
LOG_I(MAC,"Rank Indicator %d, cqi %d, %d\n",eNB_UE_stats->rank+1,eNB_UE_stats->DL_cqi[0],eNB_UE_stats->DL_cqi[1]);
// loop over all transport blocks
for (tb=0;tb<eNB_UE_stats->rank+1;tb++) {
for (tb=0;tb<1/*eNB_UE_stats->rank+1*/;tb++) {
rlc_status.bytes_in_buffer = 0;
// Now check RLC information to compute number of required RBs
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
View file @ ccb876c8
......@@ -17,7 +17,7 @@ eNBs =
mobile_country_code = "208";
mobile_network_code = "92";
mobile_network_code = "94";
////////// Physical parameters:
......@@ -137,7 +137,7 @@ eNBs =
////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.12.26";
mme_ip_address = ( { ipv4 = "192.168.12.70";
ipv6 = "192:168:30::17";
active = "yes";
preference = "ipv4";
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm2.usrpb210.conf
View file @ ccb876c8
......@@ -17,7 +17,7 @@ eNBs =
mobile_country_code = "208";
mobile_network_code = "94";
mobile_network_code = "93";
////////// Physical parameters:
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm3.usrpb210.conf
View file @ ccb876c8
......@@ -17,7 +17,7 @@ eNBs =
mobile_country_code = "208";
mobile_network_code = "92";
mobile_network_code = "94";
////////// Physical parameters:
......
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