summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authorJérôme Jutteau2011-11-04 11:15:00 +0100
committerCyril Jourdan2013-01-18 11:53:46 +0100
commit1b5b86c9dc5947513ab24a1535c322d037e1ead7 (patch)
tree2c7038d82396d381444ea061f4432533e27168f2 /cesar
parentd76c73fd5d1f837a82b41869de258f65d648d303 (diff)
cesar/ce/rx: adapt traces for intervals, refs #2366
Diffstat (limited to 'cesar')
-rw-r--r--cesar/ce/rx/bitloading/src/common.c2
-rw-r--r--cesar/ce/rx/bitloading/src/transition.c19
-rw-r--r--cesar/ce/rx/inc/trace.h5
-rw-r--r--cesar/ce/rx/src/trace.c22
4 files changed, 21 insertions, 27 deletions
diff --git a/cesar/ce/rx/bitloading/src/common.c b/cesar/ce/rx/bitloading/src/common.c
index fa1f8db1f7..8c4a26b9e8 100644
--- a/cesar/ce/rx/bitloading/src/common.c
+++ b/cesar/ce/rx/bitloading/src/common.c
@@ -46,7 +46,7 @@ ce_rx_bl_start_bl (ce_rx_t *ce_rx, sta_t *sta, int fsm_id)
/* Initial CE is used when this is the first time we use a tone map with
* the station. */
bool initial_ce;
- CE_RX_TRACE (BL_INITIAL, sta->tei);
+ CE_RX_TRACE (BL_INITIAL, sta->tei, fsm_id);
ce_debug_gpio_event (CE_DEBUG_GPIO_EVENT_CE_RX_BL_WORKING, true);
tonemask_info_t *ts = &ce_rx->mac_config->tonemask_info;
diff --git a/cesar/ce/rx/bitloading/src/transition.c b/cesar/ce/rx/bitloading/src/transition.c
index eed4f03b43..e91c3a001b 100644
--- a/cesar/ce/rx/bitloading/src/transition.c
+++ b/cesar/ce/rx/bitloading/src/transition.c
@@ -261,8 +261,8 @@ ce_rx_bl_data_treatment (ce_rx_t *ce_rx, sta_t *sta, ce_rx_bitloading_t *bl,
/* Increase frame counter. */
bl->high_pb_error_rate_frame_counter++;
CE_RX_TRACE_VERBOSE
- (PB_ERR_RATE_HIGH, sta->tei,
- measure->rx_params.tmi_av, measure->false_pb_count,
+ (PB_ERR_RATE_HIGH, sta->tei, measure->fsm_id,
+ measure->rx_params.tmi_av, measure->false_pb_count,
measure->total_pb_count,
bl->high_pb_error_rate_frame_counter);
/* Enough frame in this case and not too soon? */
@@ -342,6 +342,10 @@ ce_rx_bl_data_treatment (ce_rx_t *ce_rx, sta_t *sta, ce_rx_bitloading_t *bl,
}
else
{
+ /* Trace if we receive data with wrong TMI on an interval. */
+ CE_RX_TRACE (WRONG_TMI, sta->tei, measure->fsm_id,
+ measure->rx_params.tmi_av, expected_tmi);
+
/* Measure is not received on expected TMI (CE MME with new tone map
* not received by TX for example). */
/* If this is the first measure. */
@@ -519,7 +523,7 @@ ce_rx_bl_fsm__TRACKING__data (ce_rx_t *ce_rx,
ce_debug_gpio_event (
CE_DEBUG_GPIO_EVENT_CE_RX_BL_MEASURE_DATA_HIGH_PB_ERROR_RATE,
true);
- CE_RX_TRACE (RESTART_PB_ERR, sta->tei,
+ CE_RX_TRACE (RESTART_PB_ERR, sta->tei, CE_RX_MEASURE_NO_INTERVAL,
bl->high_pb_error_rate_frame_counter);
ce_rx_bl_stats_update (bl, sta,
CE_RX_BL_RESTART_REASON_PBERR_HIGH);
@@ -540,7 +544,7 @@ ce_rx_bl_fsm__TRACKING__data (ce_rx_t *ce_rx,
ce_debug_gpio_event (
CE_DEBUG_GPIO_EVENT_CE_RX_BL_MEASURE_DATA_BER_LOW,
true);
- CE_RX_TRACE (RESTART_BER, sta->tei);
+ CE_RX_TRACE (RESTART_BER, sta->tei, CE_RX_MEASURE_NO_INTERVAL);
ce_rx_bl_stats_update (bl, sta,
CE_RX_BL_RESTART_REASON_BER_LOW);
@@ -676,8 +680,8 @@ ce_rx_bl_fsm__INTERVAL_TRACKING__interval_data (
ce_debug_gpio_event (
CE_DEBUG_GPIO_EVENT_CE_RX_BL_MEASURE_DATA_HIGH_PB_ERROR_RATE,
true);
- CE_RX_TRACE (INTERVAL_DATA_PB_ERR, sta->tei,
- data.measure->interval);
+ CE_RX_TRACE (RESTART_PB_ERR, sta->tei, fsm_id,
+ bl->high_pb_error_rate_frame_counter);
ce_rx_bl_stats_update (bl, sta,
CE_RX_BL_RESTART_REASON_PBERR_HIGH);
@@ -697,8 +701,7 @@ ce_rx_bl_fsm__INTERVAL_TRACKING__interval_data (
ce_debug_gpio_event (
CE_DEBUG_GPIO_EVENT_CE_RX_BL_MEASURE_DATA_BER_LOW,
true);
- CE_RX_TRACE (INTERVAL_DATA_BER, sta->tei,
- data.measure->interval);
+ CE_RX_TRACE (RESTART_BER, sta->tei, fsm_id);
ce_rx_bl_stats_update (bl, sta,
CE_RX_BL_RESTART_REASON_BER_LOW);
diff --git a/cesar/ce/rx/inc/trace.h b/cesar/ce/rx/inc/trace.h
index 517ab417b1..45d499caf3 100644
--- a/cesar/ce/rx/inc/trace.h
+++ b/cesar/ce/rx/inc/trace.h
@@ -50,10 +50,7 @@ enum
CE_RX_TRACE_RESTART_BER,
CE_RX_TRACE_BMU_STATE,
CE_RX_TRACE_RESTART_BER_MARGIN_UPDATE,
- CE_RX_TRACE_INTERVALS_SOUND_COMPLETE,
- CE_RX_TRACE_INTERVAL_SOUND_COMPLETE,
- CE_RX_TRACE_INTERVAL_DATA_PB_ERR,
- CE_RX_TRACE_INTERVAL_DATA_BER
+ CE_RX_TRACE_WRONG_TMI
};
BEGIN_DECLS
diff --git a/cesar/ce/rx/src/trace.c b/cesar/ce/rx/src/trace.c
index ae3b55162c..482df15039 100644
--- a/cesar/ce/rx/src/trace.c
+++ b/cesar/ce/rx/src/trace.c
@@ -86,7 +86,7 @@ ce_rx_trace_init (ce_rx_t *ctx)
"pb_count=%d, sound=%d, sound_complete=%d",
TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_BL_INITIAL, "tei %d: "
- "initial bit-loading", TIMESTAMP),
+ "[fsm %d] initial bit-loading", TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_SEND_TONEMAP, "tei %d: "
"send tm: new_tmi=%d, old_tmi=%d, initial_ce=%d",
TIMESTAMP),
@@ -98,33 +98,27 @@ ce_rx_trace_init (ce_rx_t *ctx)
"[fsm] %S == %E ==> %S", TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_TONEMAP, "tei %d: "
"tone map generated: sum = %d => %dx0, %dx1, %dx2, %dx3 "
- "%dx4, %dx5, %dx6, %dx7 (fsm id: %dx8)", TIMESTAMP),
+ "%dx4, %dx5, %dx6, %dx7 (fsm id: %d)", TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_WORSE_THAN_ROBO, "tei %d: "
- "ROBO is better (fsm id: %d)", TIMESTAMP),
+ "[fsm %d] ROBO is better", TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_RESTART_FORCED, "tei %d: "
"forced restart of ce rx - sound received",
TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_PB_ERR_RATE_HIGH, "tei %d: "
- "PBErrRate high: on tmi %d, %d false on %d total "
+ "[fsm %d] PBErrRate high: on tmi %d, %d false on %d total "
"since %d frames)", TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_RESTART_PB_ERR, "tei %d: "
- "restart PB error rate too high "
+ "[fsm %d] restart PB error rate too high "
"(since %d frames)", TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_RESTART_BER, "tei %d: "
- "restart BER low", TIMESTAMP),
+ "[fsm %d] restart BER low", TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_BMU_STATE, "PBER=%d, BER_margin_old=%l, "
"BER_margin_new=%l, oscillation_counter=%d, bmu_plus=%b",
TIMESTAMP),
TRACE_EVENT (CE_RX_TRACE_RESTART_BER_MARGIN_UPDATE, "tei %d: "
"restart BER margin update (FEC rate: %u)", TIMESTAMP),
- TRACE_EVENT (CE_RX_TRACE_INTERVALS_SOUND_COMPLETE, "tei %d: ",
- TIMESTAMP),
- TRACE_EVENT (CE_RX_TRACE_INTERVAL_SOUND_COMPLETE, "tei %d: "
- "fsm_id %d: interval %d", TIMESTAMP),
- TRACE_EVENT (CE_RX_TRACE_INTERVAL_DATA_PB_ERR, "tei %d: "
- "interval %d", TIMESTAMP),
- TRACE_EVENT (CE_RX_TRACE_INTERVAL_DATA_BER, "tei %d: "
- "interval %d", TIMESTAMP),
+ TRACE_EVENT (CE_RX_TRACE_WRONG_TMI, "tei %d: "
+ "[fsm %d] received with TMI %d instead of %d", TIMESTAMP),
};
dbg_assert (ctx);
trace_namespace_init (&namespace, event_ids, COUNT (event_ids));