summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/src
diff options
context:
space:
mode:
authorJérémy Dufour2011-01-06 16:42:28 +0100
committerJérémy Dufour2011-01-17 14:25:31 +0100
commit05588cb2a5611a82640a8880d7feb1f05e19948a (patch)
treef6d9c7b4e3440df7e3faa55143e11c6cf0b8bf42 /cesar/ce/rx/src
parent70e1c9bdb36a44caec27bce3fee72e104007a6a8 (diff)
cesar/ce/rx: improve trace of ce rx, closes #2199
This commit includes: - rewrite of some traces for better understanding, - support of timestamps, - new traces to detect the reason for making the ce restart.
Diffstat (limited to 'cesar/ce/rx/src')
-rw-r--r--cesar/ce/rx/src/measure.c4
-rw-r--r--cesar/ce/rx/src/trace.c55
2 files changed, 37 insertions, 22 deletions
diff --git a/cesar/ce/rx/src/measure.c b/cesar/ce/rx/src/measure.c
index 3bca62ac35..d960a3c6de 100644
--- a/cesar/ce/rx/src/measure.c
+++ b/cesar/ce/rx/src/measure.c
@@ -64,7 +64,9 @@ ce_rx_measure_sar_cb (void *data, pbproc_rx_params_t *rx_params,
< CE_RX_MEASURE_MBOX_MAX_SIZE))
{
/* Trace it. */
- CE_RX_TRACE_VERBOSE (SAR_CB, rx_params->tei, chan_data_count, total_pb_count);
+ CE_RX_TRACE_VERBOSE (SAR_CB, rx_params->tei, rx_params->tmi_av,
+ chan_data_count, total_pb_count,
+ rx_params->sound, rx_params->sound_complete);
/* Allocate a measure. */
ce_rx_measure_mbox_t *measure = slab_alloc (&ce_rx->measure_cache);
diff --git a/cesar/ce/rx/src/trace.c b/cesar/ce/rx/src/trace.c
index 148e782239..a8ffa94f48 100644
--- a/cesar/ce/rx/src/trace.c
+++ b/cesar/ce/rx/src/trace.c
@@ -68,27 +68,40 @@ ce_rx_trace_init (ce_rx_t *ctx)
static const trace_event_id_t event_ids[] =
{
TRACE_EVENT (CE_RX_TRACE_INIT, "init"),
- TRACE_EVENT (CE_RX_TRACE_UNINIT, "uninit"),
- TRACE_EVENT (CE_RX_TRACE_MEASURE_HANDLING, "Handling measure for "
- "TEI %d on TMI %d: CD = %d & PBs = %d (Si = %d, "
- "SC = %d)"),
- TRACE_EVENT (CE_RX_TRACE_SAR_CB, "Callback from SAR for TEI %d: "
- "CD = %d & PBM = %d"),
- TRACE_EVENT (CE_RX_TRACE_BL_INITIAL, "Starting initial bit-loading"),
- TRACE_EVENT (CE_RX_TRACE_SEND_TONEMAP, "Sending tone map to TEI %d "
- "(TMI: new %d - old %d, initial_ce : %d)"),
- TRACE_EVENT (CE_RX_TRACE_SEND_TONEMAP_REFRESH,
- "Sending tone map refresh list to TEI %d"),
- TRACE_EVENT (CE_RX_TRACE_FSM_FROM_TO,
- "FSM: %S == %E ==> %S"),
- TRACE_EVENT (CE_RX_TRACE_FSM_HANDLING_EVENT,
- "FSM: %S == %E ==..."),
- TRACE_EVENT (CE_RX_TRACE_TONEMAP_INITIAL, "Tone map initial : %x %x %x %x"),
- TRACE_EVENT (CE_RX_TRACE_INITIAL_WORSE_THAN_ROBO, "Using ROBO rather "
- "than CE generated tone map"),
- TRACE_EVENT (CE_RX_TRACE_RESTART_CE, "Restart CE for TEI %d"),
- TRACE_EVENT (CE_RX_TRACE_PB_ERR_RATE_HIGH, "PB Error Rate high (for "
- "%d, %d / %d since %d frames)"),
+ TRACE_EVENT (CE_RX_TRACE_UNINIT, "uninit", TIMESTAMP),
+ TRACE_EVENT (CE_RX_TRACE_MEASURE_HANDLING, "tei %d: "
+ "handling measure: tmi=%d, channel_data=%d, "
+ "pb_count=%d, sound=%d, sound_complete=%d",
+ TIMESTAMP),
+ TRACE_EVENT (CE_RX_TRACE_SAR_CB, "tei %d: "
+ "[sar] enqueue measure: tmi=%d, channel_data=%d, "
+ "pb_count=%d, sound=%d, sound_complete=%d",
+ TIMESTAMP),
+ TRACE_EVENT (CE_RX_TRACE_BL_INITIAL, "tei %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),
+ TRACE_EVENT (CE_RX_TRACE_SEND_TONEMAP_REFRESH, "tei %d: "
+ "send tm refresh", TIMESTAMP),
+ TRACE_EVENT (CE_RX_TRACE_FSM_FROM_TO, "tei %d: "
+ "[fsm] %S == %E ==> %S", TIMESTAMP),
+ TRACE_EVENT (CE_RX_TRACE_TONEMAP, "tei %d: "
+ "tone map generated: %dx0, %dx1, %dx2, %dx3 "
+ "%dx4, %dx5, %dx6, %dx7", TIMESTAMP),
+ TRACE_EVENT (CE_RX_TRACE_INITIAL_WORSE_THAN_ROBO, "tei %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 "
+ "since %d frames)", TIMESTAMP),
+ TRACE_EVENT (CE_RX_TRACE_RESTART_PB_ERR, "tei %d: "
+ "restart PB error rate too high "
+ "(since %d frames)", TIMESTAMP),
+ TRACE_EVENT (CE_RX_TRACE_RESTART_BER, "tei %d: "
+ "restart BER low", TIMESTAMP),
};
dbg_assert (ctx);
trace_namespace_init (&namespace, event_ids, COUNT (event_ids));