summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlaranjeiro2009-11-27 08:50:44 +0000
committerlaranjeiro2009-11-27 08:50:44 +0000
commitee3520503756297450b944fff1881f7cf7a6c7f9 (patch)
treeacdfc978742c55467c1b3b6a6483a62d6e2373e7
parent40da3040c673da692790b649d31f3c81e93eaa2e (diff)
cesar/cl: add more trace for MME sending
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6492 017c9cb6-072f-447c-8318-d5b54f68fe89
-rw-r--r--cesar/cl/inc/trace.h7
-rw-r--r--cesar/cl/src/cl.c24
-rw-r--r--cesar/cl/src/trace.c5
3 files changed, 22 insertions, 14 deletions
diff --git a/cesar/cl/inc/trace.h b/cesar/cl/inc/trace.h
index b293dff337..ab74a3910a 100644
--- a/cesar/cl/inc/trace.h
+++ b/cesar/cl/inc/trace.h
@@ -10,7 +10,7 @@
/**
* \file cl/inc/trace.h
* \brief Trace system for the Convergence Layer.
- * \ingroup cl
+ * \ingroup cl
*
*/
@@ -26,7 +26,10 @@ enum
{
CL_TRACE_INIT,
CL_TRACE_UNINIT,
- CL_TRACE_MME_SEND_AS_MME,
+ CL_TRACE_MME_SEND_MULTIUNICAST,
+ CL_TRACE_MME_SEND_UNASSOC_UNICAST,
+ CL_TRACE_MME_SEND_TO_UNASSOC,
+ CL_TRACE_MME_SEND_UNICAST,
CL_TRACE_MME_SEND_AS_DATA,
CL_TRACE_MME_SEND_TO_DRIVER,
CL_TRACE_MME_SEND_DONE,
diff --git a/cesar/cl/src/cl.c b/cesar/cl/src/cl.c
index 7844d45ceb..e106929d4e 100644
--- a/cesar/cl/src/cl.c
+++ b/cesar/cl/src/cl.c
@@ -177,18 +177,17 @@ cl_data_send_with_tei (cl_t *ctx, u8 *buffer, uint length, uint tei,
* layer.
*/
static cl_send_t *
-cl_send_init (cl_t *cl, u8 *buffer, bool mme)
+cl_send_init (cl_t *ctx, u8 *buffer, bool mme)
{
cl_send_t *cl_data;
- dbg_assert (cl);
+ dbg_assert (ctx);
dbg_assert (buffer);
- cl_data = slab_alloc (&cl->slab_buffer_handler);
+ cl_data = slab_alloc (&ctx->slab_buffer_handler);
- cl_data->cl = cl;
+ cl_data->cl = ctx;
cl_data->buffer = buffer;
cl_data->mme = mme;
-
return cl_data;
}
@@ -217,6 +216,7 @@ cl_send_release (void *object)
{
dbg_assert (ctx->data_tx.cb);
(*ctx->data_tx.cb) (ctx->data_tx.user, cl_data->buffer);
+ CL_TRACE (DATA_SEND_DONE, mac_ntb(), cl_data->buffer);
}
}
@@ -444,7 +444,7 @@ cl_send_unicast (cl_t *ctx, u8 *buffer, uint length, uint tei,
if (added)
sar_mfs_add (ctx->sar, (mfs_t *) mfs);
- CL_TRACE (MME_SEND_AS_MME, mac_ntb(), length, buffer, mfs->common.tei);
+ CL_TRACE (MME_SEND_UNICAST, mac_ntb(), length, buffer, tei);
sar_msdu_add (ctx->sar, buffer, length,
mfs, cl_data, arrival_time_ntb);
@@ -500,8 +500,8 @@ cl_send_multiunicast (cl_t *ctx, u8 *buffer, uint length, bool mme, uint tag,
if (added)
sar_mfs_add (ctx->sar, (mfs_t *) mfs);
- CL_TRACE (MME_SEND_AS_MME, mac_ntb(), length, buffer,
- mfs->common.tei);
+ CL_TRACE (MME_SEND_MULTIUNICAST, mac_ntb(), length,
+ buffer, i);
slab_addref (cl_data);
sar_msdu_add (ctx->sar, buffer, length,
mfs, cl_data, arrival_time_ntb);
@@ -588,7 +588,6 @@ cl_mme_send (cl_t *ctx, u8 *buffer, uint length, uint tei)
|| (tei == MAC_TEI_BCAST)))
&& (MAC_TEI_IS_STA(ctx->mac_config->tei)))
{
- CL_TRACE (MME_SEND_AS_MME, mac_ntb(), length, buffer, tei);
cl_send_unicast (ctx, buffer, length,
tei,
true /* MME */,
@@ -613,7 +612,8 @@ cl_mme_send (cl_t *ctx, u8 *buffer, uint length, uint tei)
cl_data = cl_send_init (ctx, buffer, true /* MME. */);
- CL_TRACE (MME_SEND_AS_MME, mac_ntb(), length, buffer, mfs->common.tei);
+ CL_TRACE (MME_SEND_UNASSOC_UNICAST, mac_ntb(), length, buffer,
+ mfs->common.tei);
sar_msdu_add (ctx->sar, buffer, length,
mfs, cl_data, mac_ntb());
blk_release (mfs);
@@ -649,7 +649,8 @@ cl_mme_send (cl_t *ctx, u8 *buffer, uint length, uint tei)
cl_data = cl_send_init (ctx, buffer, true /* MME. */);
- CL_TRACE (MME_SEND_AS_MME, mac_ntb(), length, buffer, mfs->common.tei);
+ CL_TRACE (MME_SEND_TO_UNASSOC, mac_ntb(), length, buffer,
+ mfs->common.tei);
sar_msdu_add (ctx->sar, buffer, length,
mfs, cl_data, mac_ntb());
@@ -790,6 +791,7 @@ void cl_data_send_done (cl_t *ctx, u8 *buffer, void *cl_data)
/* Give back to upper layer. */
dbg_assert (ctx->data_tx.cb);
(*ctx->data_tx.cb) (ctx->data_tx.user, buffer);
+ CL_TRACE (DATA_SEND_DONE, mac_ntb(), buffer);
}
else
slab_release (cl_data);
diff --git a/cesar/cl/src/trace.c b/cesar/cl/src/trace.c
index 54723dde7d..c99b071e55 100644
--- a/cesar/cl/src/trace.c
+++ b/cesar/cl/src/trace.c
@@ -31,7 +31,10 @@ cl_trace_init (cl_t *ctx)
{
TRACE_EVENT (CL_TRACE_INIT, "CL_INIT", TIMESTAMP),
TRACE_EVENT (CL_TRACE_UNINIT, "CL_UNINIT", TIMESTAMP),
- TRACE_EVENT (CL_TRACE_MME_SEND_AS_MME, "CL_MME_SEND_AS_MME length : %d, buffer @ : %x, dtei : %d", TIMESTAMP),
+ TRACE_EVENT (CL_TRACE_MME_SEND_MULTIUNICAST, "MME Multiunicast, length: %d, buffer: %x, dtei: %d", TIMESTAMP),
+ TRACE_EVENT (CL_TRACE_MME_SEND_UNASSOC_UNICAST, "MME send as unassociated unicast, length: %d, buffer: %x, dtei: %d", TIMESTAMP),
+ TRACE_EVENT (CL_TRACE_MME_SEND_TO_UNASSOC, "MME send to unassociated STA, length: %d, buffer: %x, dtei: %d", TIMESTAMP),
+ TRACE_EVENT (CL_TRACE_MME_SEND_UNICAST, "MME send unicast, length: %d, buffer: %x, dtei: %d", TIMESTAMP),
TRACE_EVENT (CL_TRACE_MME_SEND_AS_DATA, "CL_MME_SEND_AS_DATA length : %d, buffer @ : %x", TIMESTAMP),
TRACE_EVENT (CL_TRACE_MME_SEND_TO_DRIVER, "CL_MME_SEND_TO_DRIVER length : %d, buffer @ : %x", TIMESTAMP),
TRACE_EVENT (CL_TRACE_MME_SEND_DONE, "CL_MME_SEND_DONE buffer : %d", TIMESTAMP),