summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authorlaranjeiro2009-06-03 11:03:43 +0000
committerlaranjeiro2009-06-03 11:03:43 +0000
commitf6d4581f5ffec3bd441fe86604f12e815d0ff7d9 (patch)
tree25fe3d8f0a942e204287c28d9362d0e49304d342 /cesar
parent2018b51608fddc8371a19ef2e830b423e740208a (diff)
*cp: (See #388)
* Merge the cl_interf trace's to CP's traces. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@4739 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar')
-rw-r--r--cesar/cp/cl_interf/Module3
-rw-r--r--cesar/cp/cl_interf/inc/trace.h68
-rw-r--r--cesar/cp/cl_interf/src/cl_interf.c16
-rw-r--r--cesar/cp/cl_interf/src/trace.c67
-rw-r--r--cesar/cp/inc/trace.h8
-rw-r--r--cesar/cp/src/trace.c14
6 files changed, 27 insertions, 149 deletions
diff --git a/cesar/cp/cl_interf/Module b/cesar/cp/cl_interf/Module
index c5af45e4b5..789759acdc 100644
--- a/cesar/cp/cl_interf/Module
+++ b/cesar/cp/cl_interf/Module
@@ -1,4 +1 @@
SOURCES := cl_interf.c
-ifeq ($(CONFIG_TRACE),y)
-SOURCES += trace.c
-endif
diff --git a/cesar/cp/cl_interf/inc/trace.h b/cesar/cp/cl_interf/inc/trace.h
deleted file mode 100644
index 69d95247bf..0000000000
--- a/cesar/cp/cl_interf/inc/trace.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef cp_cl_interf_inc_trace_h
-#define cp_cl_interf_inc_trace_h
-/* Cesar project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file cp/cl_interf/inc/trace.h
- * \brief « brief description »
- * \ingroup « module »
- *
- */
-#include "lib/trace.h"
-#include "cp/cp.h"
-
-/** Shortcut for tracing inside the HLE. */
-#define CP_CL_INTERF_TRACE(id, args...)\
- TRACE_FAST_SHORT(CP_CL_INTERF_TRACE_, &ctx->cl_interf.trace, id, ## args)
-
-#if CONFIG_TRACE
-
-enum
-{
- CP_CL_INTERF_TRACE_PROCESS_MME,
- CP_CL_INTERF_TRACE_MME_NOT_CORRECT,
- CP_CL_INTERF_TRACE_GET_BUFFER_TX,
- CP_CL_INTERF_TRACE_MME_SEND,
- CP_CL_INTERF_TRACE_BUFFER_ADD,
- CP_CL_INTERF_TRACE_MME_RX
-};
-
-BEGIN_DECLS
-
-/**
- * Initialize the trace buffer
- * \param ctx the cp_cl_interf context.
- */
-void
-cp_cl_interf_trace_init (cp_t *ctx);
-
-/**
- * Uninit the trace buffer
- * \param ctx the cp_cl_interf context
- */
-void
-cp_cl_interf_trace_uninit (cp_t *ctx);
-
-/**
- * Print the trace buffers
- * \param ctx the cp_cl_interf context
- */
-void
-cp_cl_interf_trace_print (cp_t *ctx);
-
-END_DECLS
-
-#else /* !CONFIG_TRACE */
-
-#define cp_cl_interf_trace_init(ctx) ((void) 0)
-#define cp_cl_interf_trace_uninit(ctx) ((void) 0)
-#define cp_cl_interf_trace_print(ctx) ((void) 0)
-
-#endif /* !CONFIG_TRACE */
-
-#endif /* cp_cl_interf_inc_trace_h */
diff --git a/cesar/cp/cl_interf/src/cl_interf.c b/cesar/cp/cl_interf/src/cl_interf.c
index d548fd6d2a..067dd19f9e 100644
--- a/cesar/cp/cl_interf/src/cl_interf.c
+++ b/cesar/cp/cl_interf/src/cl_interf.c
@@ -29,7 +29,6 @@
#include "cp/cl_interf/inc/context.h"
#include "cp/cl_interf/inc/cl_interf.h"
#include "cp/cl_interf/inc/cl_interf_msg.h"
-#include "cp/cl_interf/inc/trace.h"
#include <cyg/kernel/kapi.h>
@@ -55,7 +54,6 @@ cp_cl_interf_init (cp_t *ctx)
(interface_mme_buffer_add_cb_t)
cp_cl_interf_add_buffer_tx,
ctx);
- cp_cl_interf_trace_init (ctx);
// Initialise the cache.
slab_cache_init (&ctx->cl_interf.msg_slab, "CL_INTERF MSG",
@@ -98,8 +96,6 @@ cp_cl_interf_uninit (cp_t *ctx)
// Delete the mailbox.
mbox_uninit (&ctx->cl_interf.buffers_mbox);
- cp_cl_interf_trace_uninit (ctx);
-
// Uninitialise the slab alloc.
slab_cache_uninit (&ctx->cl_interf.msg_slab);
}
@@ -134,7 +130,7 @@ cp_cl_interf_process_mme (cp_t *ctx)
mme = cp_msg_mme_read_header (ctx, msg->buffer, msg->length,
msg->tei,
&fmi);
- CP_CL_INTERF_TRACE (PROCESS_MME,
+ CP_TRACE (CL_INTERF_PROCESS_MME,
mac_ntb(),
msg->buffer,
msg->length,
@@ -146,7 +142,7 @@ cp_cl_interf_process_mme (cp_t *ctx)
if (!mme)
{
interface_mme_recv_done (ctx->interface, msg->buffer, msg->cl_data);
- CP_CL_INTERF_TRACE (MME_NOT_CORRECT, msg->buffer);
+ CP_TRACE (CL_INTERF_MME_NOT_CORRECT, msg->buffer);
}
else
{
@@ -220,7 +216,7 @@ cp_cl_interf_get_buffer_tx (cp_t *ctx)
dbg_assert (ctx);
buffer = (u8 *) mbox_get (&ctx->cl_interf.buffers_mbox);
- CP_CL_INTERF_TRACE (GET_BUFFER_TX, mac_ntb(), buffer);
+ CP_TRACE (CL_INTERF_GET_BUFFER_TX, mac_ntb(), buffer);
return buffer;
}
@@ -239,7 +235,7 @@ cp_cl_interf_mme_send (cp_t *ctx, cp_mme_tx_t * mme)
interface_mme_send (ctx->interface, mme->p_mme,
mme->length, mme->peer.tei);
- CP_CL_INTERF_TRACE (MME_SEND, mme->p_mme, mme->length, mme->peer.tei);
+ CP_TRACE (CL_INTERF_MME_SEND, mme->p_mme, mme->length, mme->peer.tei);
/* Remove the MME from the MME TX object. */
mme->p_mme = NULL;
@@ -258,7 +254,7 @@ cp_cl_interf_add_buffer_tx (cp_t *ctx, u8 * buffer)
dbg_assert (buffer);
mbox_put (&ctx->cl_interf.buffers_mbox, (mbox_node_t *) buffer);
- CP_CL_INTERF_TRACE (BUFFER_ADD, buffer);
+ CP_TRACE (CL_INTERF_BUFFER_ADD, buffer);
}
/**
@@ -309,7 +305,7 @@ cp_cl_interf_rx_mme (void *cp, cp_tei_t tei,
msg->cl_data = cl_data;
msg->hard_encrypt = hardware_encrypt;
- CP_CL_INTERF_TRACE (MME_RX, mac_ntb(), buffer, length);
+ CP_TRACE (CL_INTERF_MME_RX, mac_ntb(), buffer, length);
// Store the message in the mailbox.
mbox_put (&ctx->cl_interf.mme_rx_mbox, &msg->node);
diff --git a/cesar/cp/cl_interf/src/trace.c b/cesar/cp/cl_interf/src/trace.c
deleted file mode 100644
index ee55cd5d13..0000000000
--- a/cesar/cp/cl_interf/src/trace.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Cesar project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file cp/cl_interf/src/trace.c
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-#include "common/std.h"
-
-#include "cp/cl_interf/inc/trace.h"
-#include "cp/inc/context.h"
-
-/**
- * Initialize the trace buffer
- * \param ctx the cp_cl_interf context.
- */
-void
-cp_cl_interf_trace_init (cp_t *ctx)
-{
- dbg_assert (ctx);
-
- static trace_namespace_t namespace;
- static const trace_event_id_t event_ids[] =
- {
- TRACE_EVENT (CP_CL_INTERF_TRACE_PROCESS_MME, "PROCESS MME buffer : %x, length : %d, tei : %x, FMI %x", TIMESTAMP),
- TRACE_EVENT (CP_CL_INTERF_TRACE_MME_NOT_CORRECT, "MME NOT CORRECT buffer : %x"),
- TRACE_EVENT (CP_CL_INTERF_TRACE_GET_BUFFER_TX, "GET BUFFER TX buffer : %x", TIMESTAMP),
- TRACE_EVENT (CP_CL_INTERF_TRACE_MME_SEND, "MME SEND buffer : %x, length : %d, tei : %x"),
- TRACE_EVENT (CP_CL_INTERF_TRACE_BUFFER_ADD, "BUFFER ADD buffer : %x"),
- TRACE_EVENT (CP_CL_INTERF_TRACE_MME_RX, "MME RX buffer : %x, length : %d", TIMESTAMP)
- };
-
- trace_namespace_init (&namespace, event_ids, COUNT (event_ids));
- trace_buffer_add (&ctx->cl_interf.trace, "cp_cl_interf", 8, 4, true, &namespace);
-}
-
-/**
- * Uninit the trace buffer
- * \param ctx the cp_cl_interf context
- */
-void
-cp_cl_interf_trace_uninit (cp_t *ctx)
-{
- dbg_assert (ctx);
-
- trace_buffer_remove (&ctx->cl_interf.trace);
-}
-
-/**
- * Print the trace buffers
- * \param ctx the cp_cl_interf context
- */
-void
-cp_cl_interf_trace_print (cp_t *ctx)
-{
- dbg_assert (ctx);
-
- trace_buffer_dbg_dump(&ctx->cl_interf.trace);
-}
-
diff --git a/cesar/cp/inc/trace.h b/cesar/cp/inc/trace.h
index 45e2a4a4da..c60a471432 100644
--- a/cesar/cp/inc/trace.h
+++ b/cesar/cp/inc/trace.h
@@ -40,7 +40,13 @@ enum
CP_TRACE_PWL_STA_COMP_BPS,
CP_TRACE_PWL_CCO_COMP_BPS,
CP_TRACE_MSG_DISPATCH,
- CP_TRACE_MSG_SEND
+ CP_TRACE_MSG_SEND,
+ CP_TRACE_CL_INTERF_PROCESS_MME,
+ CP_TRACE_CL_INTERF_MME_NOT_CORRECT,
+ CP_TRACE_CL_INTERF_GET_BUFFER_TX,
+ CP_TRACE_CL_INTERF_MME_SEND,
+ CP_TRACE_CL_INTERF_BUFFER_ADD,
+ CP_TRACE_CL_INTERF_MME_RX
};
BEGIN_DECLS
diff --git a/cesar/cp/src/trace.c b/cesar/cp/src/trace.c
index 3f25f3d273..ce7231c295 100644
--- a/cesar/cp/src/trace.c
+++ b/cesar/cp/src/trace.c
@@ -106,6 +106,20 @@ cp_trace_init (cp_t *ctx)
TIMESTAMP),
TRACE_EVENT (CP_TRACE_MSG_SEND, "[MSG] send -- MMType : %x, DTEI : %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_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)
};
dbg_assert (ctx);
trace_namespace_init (&namespace, event_ids, COUNT (event_ids));