Commit 2516216d authored by Cedric Roux's avatar Cedric Roux

T tracer: improve a bit enb tracer

- UE_id 0 is for rnti 65535 (sib)
- UE_id 1 is for rnti 65534 (this is a hack)
- UE_id 2 is for rnti 2     (RA RNTI as of today's code/config)
- we start enb by displaying UE_id 3
- there was a bug: we need to lock when resetting UE ids (reset_ue_ids)
parent 73723a56
...@@ -31,7 +31,10 @@ void reset_ue_ids(void) ...@@ -31,7 +31,10 @@ void reset_ue_ids(void)
int i; int i;
printf("resetting known UEs\n"); printf("resetting known UEs\n");
for (i = 0; i < 65536; i++) ue_id[i] = -1; for (i = 0; i < 65536; i++) ue_id[i] = -1;
next_ue_id = 0; ue_id[65535] = 0;
ue_id[65534] = 1; /* HACK: to be removed */
ue_id[2] = 2; /* this supposes RA RNTI = 2, very openair specific */
next_ue_id = 3;
} }
int ue_id_from_rnti(void *_priv, int rnti) int ue_id_from_rnti(void *_priv, int rnti)
...@@ -228,13 +231,15 @@ static void click(void *private, gui *g, ...@@ -228,13 +231,15 @@ static void click(void *private, gui *g,
enb_data *ed = private; enb_data *ed = private;
enb_gui *e = ed->e; enb_gui *e = ed->e;
int ue = ed->ue; int ue = ed->ue;
int do_reset = 0;
if (button != 1) return; if (button != 1) return;
if (w == e->prev_ue_button) { ue--; if (ue < 0) ue = 0; } if (w == e->prev_ue_button) { ue--; if (ue < 0) ue = 0; }
if (w == e->next_ue_button) ue++; if (w == e->next_ue_button) ue++;
if (w == e->current_ue_button) reset_ue_ids(); if (w == e->current_ue_button) do_reset = 1;
if (pthread_mutex_lock(&ed->lock)) abort(); if (pthread_mutex_lock(&ed->lock)) abort();
if (do_reset) reset_ue_ids();
if (ue != ed->ue) { if (ue != ed->ue) {
set_current_ue(g, ed, ue); set_current_ue(g, ed, ue);
ed->ue = ue; ed->ue = ue;
...@@ -619,7 +624,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database, ...@@ -619,7 +624,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database,
container_set_child_growable(g, top_container, text, 1); container_set_child_growable(g, top_container, text, 1);
e->legacy = new_view_textlist(10000, 10, g, text); e->legacy = new_view_textlist(10000, 10, g, text);
set_current_ue(g, ed, 0); set_current_ue(g, ed, ed->ue);
register_notifier(g, "click", e->current_ue_button, click, ed); register_notifier(g, "click", e->current_ue_button, click, ed);
register_notifier(g, "click", e->prev_ue_button, click, ed); register_notifier(g, "click", e->prev_ue_button, click, ed);
register_notifier(g, "click", e->next_ue_button, click, ed); register_notifier(g, "click", e->next_ue_button, click, ed);
...@@ -735,7 +740,7 @@ int main(int n, char **v) ...@@ -735,7 +740,7 @@ int main(int n, char **v)
g = gui_init(); g = gui_init();
new_thread(gui_thread, g); new_thread(gui_thread, g);
enb_data.ue = 0; enb_data.ue = 3;
enb_data.e = &eg; enb_data.e = &eg;
enb_data.database = database; enb_data.database = database;
......
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