summaryrefslogtreecommitdiff
path: root/ce
diff options
context:
space:
mode:
authorschodet2008-01-28 13:36:09 +0000
committerschodet2008-01-28 13:36:09 +0000
commita27da22d829cfd9bf7bdd36f9e7a1039e3fd9232 (patch)
treeb980ece341caacce73d641f7110ffd17545d33f1 /ce
parent6618601dc5694a3c266be852caceae336a671bb0 (diff)
* lib/trace:
- new lighter trace declaration syntax. - new TIMESTAMP option. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1339 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'ce')
-rwxr-xr-xce/inc/rx.h2
-rw-r--r--ce/inc/trace.h7
-rw-r--r--ce/src/trace.c17
3 files changed, 11 insertions, 15 deletions
diff --git a/ce/inc/rx.h b/ce/inc/rx.h
index 5d5a60187c..3d47a96776 100755
--- a/ce/inc/rx.h
+++ b/ce/inc/rx.h
@@ -60,8 +60,6 @@ struct rxce_t
#if CONFIG_TRACE
/** cl Trace */
trace_buffer_t trace;
- /** cl trace namespace */
- trace_namespace_t trace_namespace;
#endif /* !CONFIG_TRACE */
};
typedef struct rxce_t rxce_t;
diff --git a/ce/inc/trace.h b/ce/inc/trace.h
index 330439109b..249dcf3a40 100644
--- a/ce/inc/trace.h
+++ b/ce/inc/trace.h
@@ -23,13 +23,10 @@
#if CONFIG_TRACE
-#define RXCE_ID(id, ord, args) \
- RXCE_TRACE_ ## id = TRACE_ID (ord, args)
-
enum
{
- RXCE_ID(INIT, 1, 1),
- RXCE_ID(PB_MEASUREMENT, 2, 1),
+ RXCE_TRACE_INIT,
+ RXCE_TRACE_PB_MEASUREMENT,
};
BEGIN_DECLS
diff --git a/ce/src/trace.c b/ce/src/trace.c
index 1a57219f6e..3ed107aaad 100644
--- a/ce/src/trace.c
+++ b/ce/src/trace.c
@@ -6,7 +6,7 @@
*
* }}} */
/**
- * \file ../../src/trace.c
+ * \file ce/src/trace.c
* \brief « brief description »
* \ingroup « module »
*
@@ -21,13 +21,15 @@
void
rxce_trace_init (rxce_t *ctx)
{
- static trace_event_id_t rxce_init_id = TRACE_EVENT (RXCE_TRACE_INIT, "[%d] RXCE_INIT");
- static trace_event_id_t rxce_pb_measurement_cb_id = TRACE_EVENT (RXCE_TRACE_PB_MEASUREMENT, "[%d] RXCE_PB_MEASUREMENT_CB");
+ static trace_namespace_t namespace;
+ static const trace_event_id_t event_ids[] =
+ {
+ TRACE_EVENT (RXCE_TRACE_INIT, "RXCE_INIT", TIMESTAMP),
+ TRACE_EVENT (RXCE_TRACE_PB_MEASUREMENT, "RXCE_PB_MEASUREMENT_CB", TIMESTAMP);
+ };
dbg_assert (ctx);
- trace_namespace_init (&ctx->trace_namespace);
- trace_namespace_register_event_id (&ctx->trace_namespace, &rxce_init_id );
- trace_namespace_register_event_id (&ctx->trace_namespace, &rxce_pb_measurement_cb_id );
- trace_buffer_add (&ctx->trace, 8, 4, true, &ctx->trace_namespace);
+ trace_namespace_init (&namespace, event_ids, COUNT (event_ids));
+ trace_buffer_add (&ctx->trace, "ce", 8, 4, true, &namespace);
}
void
@@ -35,7 +37,6 @@ rxce_trace_uninit (rxce_t *ctx)
{
dbg_assert (ctx);
trace_buffer_remove(&ctx->trace);
- trace_namespace_uninit (&ctx->trace_namespace);
}
void