summaryrefslogtreecommitdiff
path: root/cesar/cp/src
diff options
context:
space:
mode:
authorThierry Carré2012-06-12 16:01:15 +0200
committerMilenko Jelisavcic2012-07-20 10:26:31 +0200
commit0575c39596eb323718690783f864176b27034aa4 (patch)
tree82525e00a9609f3aeaa66de2612678ab4e498305 /cesar/cp/src
parente8522c337562c223119eb2b98ef2df8487d01210 (diff)
cesar/cp: trace module modified to be multi-project, refs #3136
Diffstat (limited to 'cesar/cp/src')
-rw-r--r--cesar/cp/src/trace.c89
1 files changed, 14 insertions, 75 deletions
diff --git a/cesar/cp/src/trace.c b/cesar/cp/src/trace.c
index 2b67f9bce3..f3cf135c87 100644
--- a/cesar/cp/src/trace.c
+++ b/cesar/cp/src/trace.c
@@ -225,89 +225,28 @@ cp_trace_format_msg_dispatch_error (char *text, uint text_size, int data)
}
void
-cp_trace_init (cp_t *ctx)
+cp_trace_common_init (cp_t *ctx, trace_namespace_t *ns,
+ const trace_event_id_t *event_ids)
{
- static trace_namespace_t namespace;
- static const trace_event_id_t event_ids[] =
- {
- TRACE_EVENT (CP_TRACE_FSM_POST, "fsm post <%E>"),
- TRACE_EVENT (CP_TRACE_FSM_TRIGGER, "fsm trigger <%E>"),
- TRACE_EVENT (CP_TRACE_FSM_POST_URGENT, "fsm post urgent <%E>"),
- TRACE_EVENT (CP_TRACE_FSM_HANDLE_EVENT, "fsm handle <%E>"),
- TRACE_EVENT (CP_TRACE_FSM_HANDLE_URGENT_EVENT,
- "fsm handle urgent <%E>"),
- TRACE_EVENT (CP_TRACE_FSM_CHANGE_STATE, "fsm %S => %S"),
- TRACE_EVENT (CP_TRACE_MME_ERROR_IND,
- "mme error ind tei %d reason %d mmv %d mmtype %d offset %d"),
- TRACE_EVENT (CP_TRACE_BEACON_BEACON_PROCESS,
- "Beacon processing, nid : %x, snid : %x, stei : %x, bt : %x, bts : %x",
- TIMESTAMP),
- TRACE_EVENT (CP_TRACE_MSG_DISPATCH, "[MSG] receive %M from %d",
- TIMESTAMP),
- TRACE_EVENT (CP_TRACE_MSG_DISPATCH_DROP, "[MSG] drop %M from %d, cause %Y",
- TIMESTAMP),
- TRACE_EVENT (CP_TRACE_MSG_SEND, "[MSG] send %M to %d",
- TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CL_INTERF_PROCESS_MME,
- "[CL Interf] PROCESS MME buffer : %x, length : %d, tei : %x, FMI %x",
- TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CL_INTERF_MME_NOT_CORRECT,
- "[CL Interf] MME NOT CORRECT buffer : %x"),
- TRACE_EVENT (CP_TRACE_CL_INTERF_MME_VS_WITH_FMI,
- "[CL Interf] VS received with FMI mmv %x mmtype %x"),
- TRACE_EVENT (CP_TRACE_CL_INTERF_GET_BUFFER_TX,
- "[CL Interf] GET BUFFER TX buffer : %x", TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CL_INTERF_MME_SEND,
- "[CL Interf] MME SEND buffer : %x, length : %d, tei : %x"),
- TRACE_EVENT (CP_TRACE_CL_INTERF_BUFFER_ADD,
- "[CL Interf] BUFFER ADD buffer : %x"),
- TRACE_EVENT (CP_TRACE_CL_INTERF_MME_RX,
- "[CL Interf] MME RX buffer : %x, length : %d",
- TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CL_INTERF_MME_RX_DROP,
- "[CL Interf] MME RX DROPPED buffer : %x, length : %d, mac: %m",
- TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CCO_ASSOC, "[CCo] Assoc, Mac addr : %m, tei : %x"),
- TRACE_EVENT (CP_TRACE_CCO_ASSOC_RENEW,
- "[CCo] Assoc renew, Mac addr : %m, tei : %x"),
- TRACE_EVENT (CP_TRACE_CCO_TEI_EXPIRED,
- "[CCo] tei expired, Mac addr : %m, tei : %x"),
- TRACE_EVENT (CP_TRACE_CE_TX_NEW_TONEMAP, "[ce_tx] tei %d: "
- "new tone map received: tmi %d", TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CE_TX_NEW_DEFAULT_TMI, "[ce_tx] tei %d: "
- "default tmi changed: %d -> %d", TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CE_TX_DEFAULT_TMI_UNAVAILABLE, "[ce_tx] tei "
- "%d: default tmi unavailable: %d", TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CE_TX_TMI_AVAILABLE_LIST, "[ce_tx] tei %d: "
- "tmi enabled list: %T (default %d)", TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CE_TX_TM_EXPIRATION, "[ce_tx] tei %d: "
- "TM expiration", TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CE_TX_RESETED_BY_PBPROC, "[ce_tx] "
- "reseted (%d) by PBProc", TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CE_TX_RESETED_BY_PEER, "[ce_tx] tei %d: "
- "reset by peer", TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CE_TX_MME_CHAN_EST_ERROR, "[ce_tx] tei %d: "
- "error in CM_CHAN_EST: %Z", TIMESTAMP),
- TRACE_EVENT (CP_TRACE_CE_TX_MME_TM_UPDATE_ERROR, "[ce_tx] tei %d: "
- "error in CM_TM_UPDATE: %Z", TIMESTAMP),
- TRACE_EVENT (CP_TRACE_SPOC, "SPOC compute with rho_q30 %x"),
- };
dbg_assert (ctx);
- trace_namespace_init (&namespace, event_ids, COUNT (event_ids));
- trace_namespace_register_format (&namespace, 'S',
+ dbg_assert (ns);
+ dbg_assert (event_ids);
+
+ trace_namespace_init (ns, event_ids, COUNT (event_ids));
+ trace_namespace_register_format (ns, 'S',
cp_trace_format_fsm_state);
- trace_namespace_register_format (&namespace, 'E',
+ trace_namespace_register_format (ns, 'E',
cp_trace_format_fsm_event);
- trace_namespace_register_format (&namespace, 'M',
+ trace_namespace_register_format (ns, 'M',
cp_trace_format_mmtype);
- trace_namespace_register_format (&namespace, 'Z',
+ trace_namespace_register_format (ns, 'Z',
cp_trace_format_ce_mme_error);
- trace_namespace_register_format (&namespace, 'T',
+ trace_namespace_register_format (ns, 'T',
cp_trace_format_tm_enabled_list);
- trace_namespace_register_format (&namespace, 'Y',
+ trace_namespace_register_format (ns, 'Y',
cp_trace_format_msg_dispatch_error);
- trace_buffer_add (&ctx->trace, "cp", 8, 1, false, &namespace);
- trace_buffer_add (&ctx->trace_verbose, "cp-verbose", 8, 8, true, &namespace);
+ trace_buffer_add (&ctx->trace, "cp", 8, 1, false, ns);
+ trace_buffer_add (&ctx->trace_verbose, "cp-verbose", 8, 8, true, ns);
}
void