aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <msuraev@sysmocom.de>2016-02-25 11:40:06 +0100
committerMax <msuraev@sysmocom.de>2016-02-25 11:40:06 +0100
commit86581a56341fc41838eaa1cb7e07adaf8236215d (patch)
tree075420d82e1a861a7dd5bfe776d1607d1f07dbc3
parent0ba0d186a558a9bcf75fabdb4649970439a58c29 (diff)
further expand rlcmac diagmax/pacch
-rw-r--r--src/bts.cpp2
-rw-r--r--src/tbf.cpp13
2 files changed, 11 insertions, 4 deletions
diff --git a/src/bts.cpp b/src/bts.cpp
index 715fb51..75766f1 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -1254,7 +1254,7 @@ int gprs_rlcmac_pdch::rcv_control_block(
bitvec *rlc_block, uint32_t fn)
{
RlcMacUplink_t * ul_control_block = (RlcMacUplink_t *)talloc_zero(tall_pcu_ctx, RlcMacUplink_t);
- LOGP(DRLCMAC, LOGL_DEBUG, "+++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++\n");
+ LOGP(DRLCMAC, LOGL_DEBUG, "+++++++++++++++++++++++++ RX : Uplink Control Block on FN = %d ++++++++++++++\n", fn);
decode_gsm_rlcmac_uplink(rlc_block, ul_control_block);
LOGPC(DCSN1, LOGL_NOTICE, "\n");
LOGP(DRLCMAC, LOGL_DEBUG, "------------------------- RX : Uplink Control Block -------------------------\n");
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 18205fd..634af3e 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -894,8 +894,15 @@ static inline void print_tbf_diag(const struct gprs_rlcmac_tbf * t, bool uplink)
LOGP(DRLCMAC, LOGL_NOTICE, "- MS %s %s\n", d, t->name());
LOGP(DRLCMAC, LOGL_NOTICE, "- MS %s TBF 1st TS = %d, 1st common TS = %d, ctrl TS = %d\n",
d, t->first_ts, t->first_common_ts, t->control_ts);
- LOGP(DRLCMAC, LOGL_NOTICE, "- MS %s TBF TSC = %d, DL: "OSMO_BIT_SPEC", UL: "OSMO_BIT_SPEC"\n",
- d, t->tsc(), OSMO_BIT_PRINT(t->dl_slots()), OSMO_BIT_PRINT(t->ul_slots()));
+ LOGP(DRLCMAC, LOGL_NOTICE, "- MS %s TBF TSC = %d, DL: "OSMO_BIT_SPEC", UL: "OSMO_BIT_SPEC", mslot upgradeable: %d\n",
+ d, t->tsc(), OSMO_BIT_PRINT(t->dl_slots()), OSMO_BIT_PRINT(t->ul_slots()), t->upgrade_to_multislot);
+
+ unsigned i;
+ for (i = 0; i < 8; i++)
+ if (t->pdch[i])
+ if (t->pdch[i]->is_enabled())
+ LOGP(DRLCMAC, LOGL_NOTICE, "- MS %s PDCH[%d] USF = %d, last RTS FN = %d, TSC = %d, TS = %d\n",
+ d, i, t->pdch[i]->assigned_usf(), t->pdch[i]->last_rts_fn, t->pdch[i]->tsc, t->pdch[i]->ts_no);
if (GPRS_RLCMAC_POLL_SCHED == t->poll_state)
LOGP(DRLCMAC, LOGL_NOTICE, "- MS %s TBF poll. scheduled: FN = %d, TS = %d\n", d, t->poll_fn, t->poll_ts);
@@ -910,7 +917,7 @@ void gprs_rlcmac_tbf::rlcmac_diag(const char * context) const
if ((state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)))
LOGP(DRLCMAC, LOGL_NOTICE, "- Assignment was on CCCH\n");
if ((state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH)))
- LOGP(DRLCMAC, LOGL_NOTICE, "- Assignment was on PACCH\n");
+ LOGP(DRLCMAC, LOGL_NOTICE, "- Assignment was on PACCH\n");// add FN to events if possible
if ((state_flags & (1 << GPRS_RLCMAC_FLAG_UL_DATA)))
LOGP(DRLCMAC, LOGL_NOTICE, "- Uplink data was received\n");
else if (direction == GPRS_RLCMAC_UL_TBF)