summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authorlaranjeiro2009-12-02 15:10:23 +0000
committerlaranjeiro2009-12-02 15:10:23 +0000
commitcecc9a1d4222f41c1e7779b3999213bb631bf6c6 (patch)
treebef27e72e3efc1847a4adcb0e6d84d70b830452c /cesar
parent6146de21b2f8a7d1f38f890d9b643cf9358de37e (diff)
cesar/mac/sar: change expiration traces
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6511 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar')
-rw-r--r--cesar/mac/sar/inc/trace.h14
-rw-r--r--cesar/mac/sar/src/sar.c4
-rw-r--r--cesar/mac/sar/src/sar_expiration.c24
-rw-r--r--cesar/mac/sar/src/trace.c14
4 files changed, 26 insertions, 30 deletions
diff --git a/cesar/mac/sar/inc/trace.h b/cesar/mac/sar/inc/trace.h
index f606644445..517cd8d097 100644
--- a/cesar/mac/sar/inc/trace.h
+++ b/cesar/mac/sar/inc/trace.h
@@ -34,20 +34,20 @@ enum
SAR_TRACE_MPDU_ADD,
SAR_TRACE_MPDU_PB_ERROR,
SAR_TRACE_MPDU_EXP,
- SAR_TRACE_MPDU_PB_SSN_NOT_IN_WIN,
SAR_TRACE_MPDU_PROCESS_CHANDATA,
SAR_TRACE_MFS_INSERT,
SAR_TRACE_MFS_PROVIDE,
- SAR_TRACE_MFS_IN_EXPIRATION,
- SAR_TRACE_MFS_PURGED,
- SAR_TRACE_MFS_NEW_EXPIRATION_DATE,
- SAR_TRACE_MFS_EXPIRATION_ADD,
- SAR_TRACE_MFS_EXPIRATION_REMOVE,
SAR_TRACE_MFS_CMD,
- SAR_TRACE_PB,
SAR_TRACE_WORK,
SAR_TRACE_MF,
SAR_TRACE_MF_PB_NO_MORE,
+ SAR_TRACE_MFS_TX_REMOVED,
+ SAR_TRACE_MFS_RX_REMOVED,
+ SAR_TRACE_MFS_PURGE_TX,
+ SAR_TRACE_MFS_PURGE_RX,
+ SAR_TRACE_MFS_EXPIRATION,
+ SAR_TRACE_MFS_EXPIRATION_ADD,
+ SAR_TRACE_MFS_EXPIRATION_REMOVE,
};
BEGIN_DECLS
diff --git a/cesar/mac/sar/src/sar.c b/cesar/mac/sar/src/sar.c
index 2ad70528e0..5b4df02251 100644
--- a/cesar/mac/sar/src/sar.c
+++ b/cesar/mac/sar/src/sar.c
@@ -1939,6 +1939,8 @@ sar_mfs_free_tx (sar_t *ctx, mfs_tx_t *mfs)
if (mfs->common.unassociated == false)
mac_store_mfs_remove (ctx->expiration.mfs_store, (mfs_t*) mfs);
+
+ SAR_TRACE (MFS_TX_REMOVED, mfs, mfs->common.tei, mfs->common.lid);
}
void
@@ -1954,4 +1956,6 @@ sar_mfs_free_rx (sar_t *ctx, mfs_rx_t *mfs)
while (mfs->head)
mfs->head = sar_pb_release (mfs->head);
+
+ SAR_TRACE (MFS_RX_REMOVED, mfs, mfs->common.tei, mfs->common.lid);
}
diff --git a/cesar/mac/sar/src/sar_expiration.c b/cesar/mac/sar/src/sar_expiration.c
index 736e464519..a3f0bbf8a0 100644
--- a/cesar/mac/sar/src/sar_expiration.c
+++ b/cesar/mac/sar/src/sar_expiration.c
@@ -209,25 +209,19 @@ sar_expiration_mfs_purge_tx (sar_t *ctx, mfs_tx_t *mfs, u32 phy_curr_ntb)
MAC_MS_TO_TCK(SAR_EXPIRATION_MS);
mfs->common.expiration_pb_cache_ntb =
mfs->common.expiration_ntb;
-
- SAR_TRACE (MFS_IN_EXPIRATION, mac_ntb(), mfs);
}
else if (mfs_empty)
{
mfs->head = NULL;
mfs->tail = NULL;
-
- SAR_TRACE (MFS_PURGED, mac_ntb(), mfs);
}
else
{
- SAR_TRACE (MFS_NEW_EXPIRATION_DATE,
- mac_ntb(), mfs,
- mfs->common.expiration_pb_cache_ntb,
- expiration_pb_ntb);
-
mfs->common.expiration_pb_cache_ntb = expiration_pb_ntb;
}
+
+ SAR_TRACE (MFS_PURGE_TX, mfs, mfs_empty, mfs->fsm_state,
+ mfs->common.expiration_pb_cache_ntb);
}
void
@@ -248,8 +242,6 @@ sar_expiration_mfs_purge_rx (sar_t *ctx, mfs_rx_t *mfs, u32 phy_curr_ntb)
if (mfs->head == NULL)
{
mfs_empty = true;
-
- SAR_TRACE (MFS_PURGED, mac_ntb(), mfs);
}
/* If the whole MFS has expired i.e. it does not have PB's. */
@@ -259,16 +251,14 @@ sar_expiration_mfs_purge_rx (sar_t *ctx, mfs_rx_t *mfs, u32 phy_curr_ntb)
{
u32 new_date = phy_curr_ntb +
MAC_MS_TO_TCK(SAR_EXPIRATION_MS);
-
- SAR_TRACE (MFS_NEW_EXPIRATION_DATE,
- mac_ntb(), mfs, mfs->common.expiration_pb_cache_ntb,
- new_date);
-
mfs->release = true;
mfs->common.expiration_ntb = new_date;
mfs->common.expiration_pb_cache_ntb =
mfs->common.expiration_ntb;
}
+
+ SAR_TRACE (MFS_PURGE_RX, mfs, mfs_empty, mfs->release,
+ mfs->common.expiration_pb_cache_ntb);
}
@@ -282,6 +272,8 @@ sar_expiration_mfs (sar_t *ctx, u32 phy_curr_ntb)
while (((mfs = sar_expiration_get_mfs (ctx)) != mfs_prev)
&& (mfs != NULL))
{
+ SAR_TRACE (MFS_EXPIRATION, mac_ntb(), mfs, mfs->common.tx,
+ mfs->common.mme, mfs->common.tei, mfs->common.lid);
mfs_prev = mfs;
/* Check expiration ntb time. */
if (lesseq_mod2p32 (sar_expiration_get_date (mfs), phy_curr_ntb))
diff --git a/cesar/mac/sar/src/trace.c b/cesar/mac/sar/src/trace.c
index 67083ecca4..2a1fed8e59 100644
--- a/cesar/mac/sar/src/trace.c
+++ b/cesar/mac/sar/src/trace.c
@@ -33,20 +33,20 @@ sar_trace_init (sar_t *ctx)
TRACE_EVENT (SAR_TRACE_MPDU_ADD, "MPDU_ADD, tei: %x, lid: %x, mfs: %d, mme: %d, pb_number: %d", TIMESTAMP),
TRACE_EVENT (SAR_TRACE_MPDU_PB_ERROR, "MPDU PROCESS PBs invalid or CRC error, ssn: %d, tei: %x, lid: %x", TIMESTAMP),
TRACE_EVENT (SAR_TRACE_MPDU_EXP, "MDPU Expired, tei: %x, lid: %x", TIMESTAMP),
- TRACE_EVENT (SAR_TRACE_MPDU_PB_SSN_NOT_IN_WIN, "pb wrong ssn: %d, mfs ssn min: %d, mfs ssn max: %d, mfs cmd: %x", TIMESTAMP),
TRACE_EVENT (SAR_TRACE_MPDU_PROCESS_CHANDATA, "Chandata tei: %d, nb: %d"),
TRACE_EVENT (SAR_TRACE_MFS_INSERT, "MFS INSERT: job_mfs: %x, PB quantity: %d"),
TRACE_EVENT (SAR_TRACE_MFS_PROVIDE, "MFS PROVIDE: job_mfs: %x, PB quantity: %d"),
- TRACE_EVENT (SAR_TRACE_MFS_IN_EXPIRATION, "MFS to Expiration state on mfs: %x", TIMESTAMP),
- TRACE_EVENT (SAR_TRACE_MFS_PURGED, "MFS to PURGED on mfs: %x", TIMESTAMP),
- TRACE_EVENT (SAR_TRACE_MFS_NEW_EXPIRATION_DATE, "MFS new Expiration date on mfs: %x, old date: %x, new_date: %x", TIMESTAMP),
- TRACE_EVENT (SAR_TRACE_MFS_EXPIRATION_ADD, "MFS Expiration add, mfs:%x, tx: %d, bcast: %d, mme: %d, lid: %d, tei: %d", TIMESTAMP),
- TRACE_EVENT (SAR_TRACE_MFS_EXPIRATION_REMOVE, "MFS Expiration remove, mfs: %x", TIMESTAMP),
TRACE_EVENT (SAR_TRACE_MFS_CMD, "MFS CMD, mfs: %x, commamd: %d"),
- TRACE_EVENT (SAR_TRACE_PB, "PB ssn=%d crc_error=%d vpbf=%d opsf=%d"),
TRACE_EVENT (SAR_TRACE_WORK, "Work type: %d"),
TRACE_EVENT (SAR_TRACE_MF, "Mac Frame detected, job: %x, first pb ssn: %d, length: %d, mfs: %x, pb_qte: %d"),
TRACE_EVENT (SAR_TRACE_MF_PB_NO_MORE, "No more Mac Frame mfs: %x, mfs ssn_min: %d, pb ssn: %d"),
+ TRACE_EVENT (SAR_TRACE_MFS_TX_REMOVED, "MFS TX freed mfs: %x, tei: %x, lid: %x"),
+ TRACE_EVENT (SAR_TRACE_MFS_RX_REMOVED, "MFS TX freed mfs: %x, tei: %x, lid: %x"),
+ TRACE_EVENT (SAR_TRACE_MFS_PURGE_TX, "MFS Purge TX, mfs: %x, empty: %d, state: %x, expiration date ntb: %x"),
+ TRACE_EVENT (SAR_TRACE_MFS_PURGE_RX, "MFS Purge RX, mfs: %x, empty: %d, release: %d, expiration date ntb: %x"),
+ TRACE_EVENT (SAR_TRACE_MFS_EXPIRATION, "Expiration mfs: %x, TX: %d, MME: %d, TEI: %x, LID: %x", TIMESTAMP),
+ TRACE_EVENT (SAR_TRACE_MFS_EXPIRATION_ADD, "Expiration add, mfs: %x, TX: %d, bcast: %d, MME: %d, LID: %x, TEI: %x", TIMESTAMP),
+ TRACE_EVENT (SAR_TRACE_MFS_EXPIRATION_REMOVE, "Expiration remove, mfs: %x", TIMESTAMP),
};
dbg_assert (ctx);
trace_namespace_init (&namespace, event_ids, COUNT (event_ids));