[PATCH] osmo-bts[master]: add/improve various logging

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/8040

add/improve various logging

This logging turned up while I was debugging dynamic timeslots:
* OML Set Channel Attributes logging.
* a specific dyn TS pchan error.
* show pchan and lchan types on CHAN ACT ACK and REL ACK logging.
* move a dyn TS logging from DL1C to DRSL, where all the other dyn ts logging
  seems to be.

Change-Id: Ia89c134060e85f7065afd5642d1c541c65dd25ea
---
M src/common/oml.c
M src/common/rsl.c
2 files changed, 18 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/8040/1

diff --git a/src/common/oml.c b/src/common/oml.c
index a1e7fda..0ab7f84 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -941,6 +941,7 @@
 	/* Call into BTS driver to check attribute values */
 	rc = bts_model_check_oml(bts, foh->msg_type, ts->mo.nm_attr, tp_merged, ts);
 	if (rc < 0) {
+		LOGP(DOML, LOGL_ERROR, "SET CHAN ATTR: invalid attribute value, rc=%d\n", rc);
 		talloc_free(tp_merged);
 		/* Send NACK */
 		return oml_fom_ack_nack(msg, -rc);
@@ -956,6 +957,9 @@
 		ts->pchan = abis_nm_pchan4chcomb(comb);
 		rc = conf_lchans(ts);
 		if (rc < 0) {
+			LOGP(DOML, LOGL_ERROR, "SET CHAN ATTR: invalid Chan Comb 0x%x"
+			     " (pchan=%s, conf_lchans()->%d)\n",
+			     comb, gsm_pchan_name(ts->pchan), rc);
 			talloc_free(tp_merged);
 			/* Send NACK */
 			return oml_fom_ack_nack(msg, -rc);
@@ -971,8 +975,8 @@
 		/* If there is no TSC specified, use the BCC */
 		ts->tsc = BSIC2BCC(bts->bsic);
 	}
-	LOGP(DOML, LOGL_INFO, "%s SET CHAN ATTR (TSC = %u)\n",
-		gsm_abis_mo_name(&ts->mo), ts->tsc);
+	LOGP(DOML, LOGL_INFO, "%s SET CHAN ATTR (TSC=%u pchan=%s)\n",
+		gsm_abis_mo_name(&ts->mo), ts->tsc, gsm_pchan_name(ts->pchan));
 
 	/* call into BTS driver to apply new attributes to hardware */
 	return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_CHANNEL, ts);
diff --git a/src/common/rsl.c b/src/common/rsl.c
index 52eb5f4..850bc66 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -667,7 +667,9 @@
 		return 0;
 	}
 
-	LOGP(DRSL, LOGL_NOTICE, "%s Tx RF CHAN REL ACK\n", gsm_lchan_name(lchan));
+	LOGP(DRSL, LOGL_NOTICE, "%s (ss=%d) %s Tx CHAN REL ACK\n",
+	     gsm_ts_and_pchan_name(lchan->ts), lchan->nr,
+	     gsm_lchant_name(lchan->type));
 
 	/*
 	 * Free the LAPDm resources now that the BTS
@@ -693,7 +695,9 @@
 	uint8_t chan_nr = gsm_lchan2chan_nr(lchan);
 	uint8_t ie[2];
 
-	LOGP(DRSL, LOGL_NOTICE, "%s Tx CHAN ACT ACK\n", gsm_lchan_name(lchan));
+	LOGP(DRSL, LOGL_NOTICE, "%s (ss=%d) %s Tx CHAN ACT ACK\n",
+	     gsm_ts_and_pchan_name(lchan->ts), lchan->nr,
+	     gsm_lchant_name(lchan->type));
 
 	msg = rsl_msgb_alloc(sizeof(struct abis_rsl_dchan_hdr));
 	if (!msg)
@@ -978,6 +982,9 @@
 			return 1;
 		}
 	}
+
+	LOGP(DRSL, LOGL_DEBUG, "%s: rx Channel Activation in state: %s.\n",
+	     gsm_lchan_name(lchan), gsm_lchans_name(lchan->state));
 
 	/* Initialize channel defaults */
 	lchan->ms_power = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0);
@@ -2187,8 +2194,8 @@
 		break;
 	default:
 		LOGP(DRSL, LOGL_ERROR,
-		     "%s Dyn TS disconnected, but invalid desired pchan",
-		     gsm_ts_and_pchan_name(ts));
+		     "%s Dyn TS disconnected, but invalid desired pchan: %s\n",
+		     gsm_ts_and_pchan_name(ts), gsm_pchan_name(ts->dyn.pchan_want));
 		ts->dyn.pchan_want = GSM_PCHAN_NONE;
 		/* TODO: how would this recover? */
 		return;
@@ -2326,7 +2333,7 @@
 		ts->flags |= TS_F_PDCH_ACTIVE;
 	else
 		ts->flags &= ~TS_F_PDCH_ACTIVE;
-	DEBUGP(DL1C, "%s %s switched to %s mode (ts->flags == %x)\n",
+	DEBUGP(DRSL, "%s %s switched to %s mode (ts->flags == %x)\n",
 	       gsm_lchan_name(ts->lchan), gsm_pchan_name(ts->pchan),
 	       pdch_act? "PDCH" : "TCH/F", ts->flags);
 

-- 
To view, visit https://gerrit.osmocom.org/8040
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia89c134060e85f7065afd5642d1c541c65dd25ea
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>