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

re-apply fixes lost with last rebase

Browse Source
This commit is contained in:
frtabu
2019-02-12 10:12:07 +01:00
parent efe116abe5
commit d0a3788ca8
32 changed files with 96 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/UTIL/ASYNC_IF/message_queue.c
+2 -1
View File
@@ -193,10 +193,11 @@ int main(void)
sprintf(s, "hello");
if (message_put(q, s, 6, 0)) goto error;
destroy_message_queue(q);
free(s);
return 0;
error:
free(s);
printf("error\n");
return 1;
}
openair2/UTIL/OTG/otg_form.c
+4 -4
View File
@@ -167,7 +167,7 @@ void plot_graphes_ul(int src, int dst, int ctime) { //UE -->eNB
fl_set_xyplot_key_font(form_ul->throughput, FL_BOLD_STYLE, FL_HUGE_SIZE);
fl_set_xyplot_key_position(form_ul->throughput, x_key_position,y_key_position , FL_ALIGN_BOTTOM_LEFT);
otg_kpi_nb_loss_pkts();
sprintf(loss_rate, "%s%d","NB Loss pkts UL=", otg_info->total_loss_ul);
sprintf(loss_rate, "%s%u","NB Loss pkts UL=", otg_info->total_loss_ul);
fl_set_object_label(form_ul->loss_ratio, loss_rate);
sprintf(simu_time, "%s%d","Simulation Time(ms)=", ctime);
fl_set_object_label(form_ul->simu_time, simu_time);
@@ -183,7 +183,7 @@ void plot_graphes_ul(int src, int dst, int ctime) { //UE -->eNB
fl_set_xyplot_key(form_ul->throughput, 0, curve_label);
fl_set_xyplot_key_position(form_ul->throughput, x_key_position,y_key_position , FL_ALIGN_BOTTOM_LEFT);
otg_kpi_nb_loss_pkts();
sprintf(loss_rate, "%s%d","NB Loss pkts UL=",otg_info->total_loss_ul);
sprintf(loss_rate, "%s%u","NB Loss pkts UL=",otg_info->total_loss_ul);
fl_set_object_label(form_ul->loss_ratio, loss_rate);
sprintf(simu_time, "%s%d","Simulation Time(ms)=", ctime);
fl_set_object_label(form_ul->simu_time, simu_time);
@@ -248,7 +248,7 @@ void plot_graphes_dl(int src, int dst, int ctime) { //eNB -->UE
fl_set_xyplot_key(form_dl->throughput, 0, curve_label);
fl_set_xyplot_key_position(form_dl->throughput, x_key_position,y_key_position, FL_ALIGN_BOTTOM_LEFT);
otg_kpi_nb_loss_pkts();
sprintf(loss_rate, "%s%d","NB Loss pkts DL=",otg_info->total_loss_dl);
sprintf(loss_rate, "%s%u","NB Loss pkts DL=",otg_info->total_loss_dl);
fl_set_object_label(form_dl->loss_ratio, loss_rate);
sprintf(simu_time, "%s%d","Simulation Time(ms)=", ctime);
fl_set_object_label(form_dl->simu_time, simu_time);
@@ -264,7 +264,7 @@ void plot_graphes_dl(int src, int dst, int ctime) { //eNB -->UE
fl_set_xyplot_key(form_dl->throughput, 0, curve_label);
fl_set_xyplot_key_position(form_dl->throughput,x_key_position,y_key_position, FL_ALIGN_BOTTOM_LEFT);
otg_kpi_nb_loss_pkts();
sprintf(loss_rate, "%s%d","NB Loss pkts DL=",otg_info->total_loss_dl);
sprintf(loss_rate, "%s%u","NB Loss pkts DL=",otg_info->total_loss_dl);
fl_set_object_label(form_dl->loss_ratio, loss_rate);
sprintf(simu_time, "%s%d","Simulation Time(ms)=", ctime);
fl_set_object_label(form_dl->simu_time, simu_time);
openair2/UTIL/OTG/otg_kpi.c
+1 -1
View File
@@ -845,7 +845,7 @@ void add_log_label(unsigned int label, unsigned int *start_log_metric) {
node_actif++;
if (node_actif>0)
LOG_F(label,"%d->%d ", i, j);
LOG_F(label,"%u->%u ", i, j);
}
}