laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/32087 )
Change subject: Introduce LOGPLCFN() for logging lchan-name + frame number
......................................................................
Introduce LOGPLCFN() for logging lchan-name + frame number
So far, we've had LOGPLCHAN() and LOGPFN(). This resulted in a number
of log lines containing frame numbers *not* containing the lchan
context, which makes it difficult to deterine which of potentially many
concurrently active lchans is logging.
Let's introduce LOGPLCFN() for a FN-extended version of LOGPLCHAN(),
and convert all callers that have the related context.
Change-Id: I214af0448652a9f321ccbab77977b67663ba28f9
---
M include/osmo-bts/logging.h
M src/common/measurement.c
M src/osmo-bts-lc15/l1_if.c
M src/osmo-bts-lc15/tch.c
M src/osmo-bts-oc2g/l1_if.c
M src/osmo-bts-oc2g/tch.c
M src/osmo-bts-octphy/l1_if.c
M src/osmo-bts-octphy/l1_tch.c
M src/osmo-bts-sysmo/l1_if.c
M src/osmo-bts-sysmo/tch.c
10 files changed, 110 insertions(+), 97 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/include/osmo-bts/logging.h b/include/osmo-bts/logging.h
index 1e69d9f..70f07dd 100644
--- a/include/osmo-bts/logging.h
+++ b/include/osmo-bts/logging.h
@@ -37,4 +37,8 @@
#define DEBUGPFN(ss, fn, fmt, args...) \
LOGP(ss, LOGL_DEBUG, "%s " fmt, gsm_fn_as_gsmtime_str(fn), ## args)
+/* LOGP with lchan + frame number prefix */
+#define LOGPLCFN(lchan, ss, lvl, fn, fmt, args...) \
+ LOGP(ss, lvl, "%s %s " fmt, gsm_lchan_name(lchan),
gsm_fn_as_gsmtime_str(fn), ## args)
+
#endif /* _LOGGING_H */
diff --git a/src/common/measurement.c b/src/common/measurement.c
index ff6f640..388f710 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -73,8 +73,8 @@
* SUB */
return true;
default:
- LOGPFN(DMEAS, LOGL_ERROR, fn, "%s: Unsupported
lchan->tch_mode %u\n",
- gsm_lchan_name(lchan), lchan->tch_mode);
+ LOGPLCFN(lchan, DMEAS, LOGL_ERROR, fn, "Unsupported
lchan->tch_mode %u\n",
+ lchan->tch_mode);
break;
}
break;
@@ -89,8 +89,8 @@
* SUB */
return true;
default:
- LOGPFN(DMEAS, LOGL_ERROR, fn, "%s: Unsupported
lchan->tch_mode %u\n",
- gsm_lchan_name(lchan), lchan->tch_mode);
+ LOGPLCFN(lchan, DMEAS, LOGL_ERROR, fn, "Unsupported
lchan->tch_mode %u\n",
+ lchan->tch_mode);
break;
}
break;
@@ -269,9 +269,9 @@
}
if (rc == 1) {
- DEBUGP(DMEAS,
- "%s meas period end fn:%u, fn_mod:%i, status:%d,
pchan:%s\n",
- gsm_lchan_name(lchan), fn, fn_mod, rc,
gsm_pchan_name(pchan));
+ LOGPLCFN(lchan, DMEAS, LOGL_DEBUG, fn,
+ "meas period end fn_mod:%d, status:%d, pchan:%s\n",
+ fn_mod, rc, gsm_pchan_name(pchan));
}
return rc;
@@ -307,16 +307,15 @@
struct bts_ul_meas *dest;
if (lchan->state != LCHAN_S_ACTIVE) {
- LOGPFN(DMEAS, LOGL_NOTICE, fn,
- "%s measurement during state: %s, num_ul_meas=%d,
fn_mod=%u\n",
- gsm_lchan_name(lchan), gsm_lchans_name(lchan->state),
- lchan->meas.num_ul_meas, fn_mod);
+ LOGPLCFN(lchan, DMEAS, LOGL_NOTICE, fn,
+ "measurement during state: %s, num_ul_meas=%d,
fn_mod=%u\n",
+ gsm_lchans_name(lchan->state),
lchan->meas.num_ul_meas, fn_mod);
}
if (lchan->meas.num_ul_meas >= ARRAY_SIZE(lchan->meas.uplink)) {
- LOGPFN(DMEAS, LOGL_NOTICE, fn,
- "%s no space for uplink measurement, num_ul_meas=%d,
fn_mod=%u\n",
- gsm_lchan_name(lchan), lchan->meas.num_ul_meas, fn_mod);
+ LOGPLCFN(lchan, DMEAS, LOGL_NOTICE, fn,
+ "no space for uplink measurement, num_ul_meas=%d,
fn_mod=%u\n",
+ lchan->meas.num_ul_meas, fn_mod);
return -ENOSPC;
}
diff --git a/src/osmo-bts-lc15/l1_if.c b/src/osmo-bts-lc15/l1_if.c
index 987b6e3..2955440 100644
--- a/src/osmo-bts-lc15/l1_if.c
+++ b/src/osmo-bts-lc15/l1_if.c
@@ -395,9 +395,8 @@
else
sapi = GsmL1_Sapi_Agch;
} else {
- LOGPFN(DL1C, LOGL_NOTICE, u32Fn, "unknown prim %d op %d "
- "chan_nr %d link_id %d\n", l1sap->oph.primitive,
- l1sap->oph.operation, chan_nr, link_id);
+ LOGPLCFN(lchan, DL1C, LOGL_NOTICE, u32Fn, "unknown prim %d op
%d chan_nr %d link_id %d\n",
+ l1sap->oph.primitive, l1sap->oph.operation, chan_nr,
link_id);
msgb_free(l1msg);
return -EINVAL;
}
@@ -458,9 +457,9 @@
memcpy(l1p->u.phDataReq.msgUnitParam.u8Buffer, msg->l2h,
msgb_l2len(msg));
}
- LOGPFN(DL1P, LOGL_DEBUG, u32Fn, "PH-DATA.req(%s)\n",
- osmo_hexdump(l1p->u.phDataReq.msgUnitParam.u8Buffer,
-
l1p->u.phDataReq.msgUnitParam.u8Size));
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, u32Fn, "PH-DATA.req(%s)\n",
+ osmo_hexdump(l1p->u.phDataReq.msgUnitParam.u8Buffer,
+ l1p->u.phDataReq.msgUnitParam.u8Size));
} else {
/* empty frame */
GsmL1_Prim_t *l1p = msgb_l1prim(l1msg);
@@ -470,7 +469,7 @@
/* send message to DSP's queue */
if (osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], l1msg) != 0) {
- LOGPFN(DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue full.
Dropping msg.\n");
+ LOGPLCFN(lchan, DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue
full. Dropping msg.\n");
msgb_free(l1msg);
} else
dtx_int_signal(lchan);
@@ -553,7 +552,7 @@
}
/* send message to DSP's queue */
if (osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], nmsg) < 0) {
- LOGPFN(DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue full.
Dropping msg.\n");
+ LOGPLCFN(lchan, DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue
full. Dropping msg.\n");
msgb_free(nmsg);
return -ENOBUFS;
}
diff --git a/src/osmo-bts-lc15/tch.c b/src/osmo-bts-lc15/tch.c
index ff93c75..bd84bee 100644
--- a/src/osmo-bts-lc15/tch.c
+++ b/src/osmo-bts-lc15/tch.c
@@ -368,7 +368,7 @@
return -EAGAIN;
if (data_ind->msgUnitParam.u8Size < 1) {
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "chan_nr %d Rx
Payload size 0\n", chan_nr);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "chan_nr %d
Rx Payload size 0\n", chan_nr);
/* Push empty payload to upper layers */
rmsg = msgb_alloc_headroom(256, 128, "L1P-to-RTP");
return add_l1sap_header(trx, rmsg, lchan, chan_nr,
data_ind->u32Fn,
@@ -399,8 +399,8 @@
if (lchan->type != GSM_LCHAN_TCH_H &&
lchan->type != GSM_LCHAN_TCH_F)
goto err_payload_match;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received ONSET
from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received ONSET from L1 "
+ "(%d bytes)\n", payload_len);
/* according to 3GPP TS 26.093 ONSET frames precede the first
speech frame of a speech burst - set the marker for next RTP
frame */
@@ -409,33 +409,32 @@
case GsmL1_TchPlType_Amr_SidFirstP1:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_FIRST_P1 from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_FIRST_P1 from L1 "
+ "(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidFirstP2:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_FIRST_P2 from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_FIRST_P2 from L1 "
+ "(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidFirstInH:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
lchan->rtp_tx_marker = true;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_FIRST_INH from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_FIRST_INH from L1 "
+ "(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidUpdateInH:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
lchan->rtp_tx_marker = true;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_UPDATE_INH from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_UPDATE_INH from L1 "
+ "(%d bytes)\n", payload_len);
break;
default:
- LOGPFN(DL1P, LOGL_NOTICE, data_ind->u32Fn, "%s Rx Payload Type
%s is unsupported\n",
- gsm_lchan_name(lchan),
- get_value_string(lc15bts_tch_pl_names, payload_type));
+ LOGPLCFN(lchan, DL1P, LOGL_NOTICE, data_ind->u32Fn, "%s Rx
Payload Type %s is unsupported\n",
+ gsm_lchan_name(lchan),
get_value_string(lc15bts_tch_pl_names, payload_type));
break;
}
@@ -470,8 +469,8 @@
return 0;
err_payload_match:
- LOGPFN(DL1P, LOGL_ERROR, data_ind->u32Fn, "%s Rx Payload Type %s
incompatible with lchan\n",
- gsm_lchan_name(lchan), get_value_string(lc15bts_tch_pl_names,
payload_type));
+ LOGPLCFN(lchan, DL1P, LOGL_ERROR, data_ind->u32Fn, "%s Rx Payload Type
%s incompatible with lchan\n",
+ gsm_lchan_name(lchan), get_value_string(lc15bts_tch_pl_names,
payload_type));
return -EINVAL;
}
diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c
index 3308a46..8762063 100644
--- a/src/osmo-bts-oc2g/l1_if.c
+++ b/src/osmo-bts-oc2g/l1_if.c
@@ -440,9 +440,9 @@
else
sapi = GsmL1_Sapi_Agch;
} else {
- LOGPFN(DL1C, LOGL_NOTICE, u32Fn, "unknown prim %d op %d "
- "chan_nr %d link_id %d\n", l1sap->oph.primitive,
- l1sap->oph.operation, chan_nr, link_id);
+ LOGPLCFN(lchan, DL1C, LOGL_NOTICE, u32Fn, "unknown prim %d op
%d "
+ "chan_nr %d link_id %d\n", l1sap->oph.primitive,
+ l1sap->oph.operation, chan_nr, link_id);
msgb_free(l1msg);
return -EINVAL;
}
@@ -503,9 +503,9 @@
memcpy(l1p->u.phDataReq.msgUnitParam.u8Buffer, msg->l2h,
msgb_l2len(msg));
}
- LOGPFN(DL1P, LOGL_DEBUG, u32Fn, "PH-DATA.req(%s)\n",
- osmo_hexdump(l1p->u.phDataReq.msgUnitParam.u8Buffer,
-
l1p->u.phDataReq.msgUnitParam.u8Size));
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, u32Fn, "PH-DATA.req(%s)\n",
+ osmo_hexdump(l1p->u.phDataReq.msgUnitParam.u8Buffer,
+ l1p->u.phDataReq.msgUnitParam.u8Size));
} else {
GsmL1_Prim_t *l1p = msgb_l1prim(l1msg);
if (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN)
@@ -523,7 +523,7 @@
/* send message to DSP's queue */
if (osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], l1msg) != 0) {
- LOGPFN(DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue full.
Dropping msg.\n");
+ LOGPLCFN(lchan, DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue
full. Dropping msg.\n");
msgb_free(l1msg);
} else
dtx_int_signal(lchan);
@@ -606,7 +606,7 @@
}
/* send message to DSP's queue */
if (osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], nmsg) < 0) {
- LOGPFN(DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue full.
Dropping msg.\n");
+ LOGPLCFN(lchan, DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue
full. Dropping msg.\n");
msgb_free(nmsg);
return -ENOBUFS;
}
diff --git a/src/osmo-bts-oc2g/tch.c b/src/osmo-bts-oc2g/tch.c
index d039b5e..d469740 100644
--- a/src/osmo-bts-oc2g/tch.c
+++ b/src/osmo-bts-oc2g/tch.c
@@ -368,7 +368,7 @@
return -EAGAIN;
if (data_ind->msgUnitParam.u8Size < 1) {
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "chan_nr %d Rx
Payload size 0\n", chan_nr);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "chan_nr %d
Rx Payload size 0\n", chan_nr);
/* Push empty payload to upper layers */
rmsg = msgb_alloc_headroom(256, 128, "L1P-to-RTP");
return add_l1sap_header(trx, rmsg, lchan, chan_nr,
data_ind->u32Fn,
@@ -403,8 +403,8 @@
if (lchan->type != GSM_LCHAN_TCH_H &&
lchan->type != GSM_LCHAN_TCH_F)
goto err_payload_match;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received ONSET
from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received ONSET from L1 "
+ "(%d bytes)\n", payload_len);
/* according to 3GPP TS 26.093 ONSET frames precede the first
speech frame of a speech burst - set the marker for next RTP
frame */
@@ -414,43 +414,40 @@
case GsmL1_TchPlType_Amr_SidFirstP1:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_FIRST_P1 from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_FIRST_P1 from L1 "
+ "(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidFirstP2:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_FIRST_P2 from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_FIRST_P2 from L1 "
+ "(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidFirstInH:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
lchan->tch.dtx.is_speech_resume = true;
lchan->rtp_tx_marker = true;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_FIRST_INH from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_FIRST_INH from L1 "
+ "(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidUpdateInH:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
lchan->tch.dtx.is_speech_resume = true;
lchan->rtp_tx_marker = true;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_UPDATE_INH from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_UPDATE_INH from L1 "
+ "(%d bytes)\n", payload_len);
break;
default:
- LOGPFN(DL1P, LOGL_NOTICE, data_ind->u32Fn, "%s Rx Payload Type
%s is unsupported\n",
- gsm_lchan_name(lchan),
- get_value_string(oc2gbts_tch_pl_names, payload_type));
+ LOGPLCFN(lchan, DL1P, LOGL_NOTICE, data_ind->u32Fn, "%s Rx
Payload Type %s is unsupported\n",
+ gsm_lchan_name(lchan),
get_value_string(oc2gbts_tch_pl_names, payload_type));
break;
}
- LOGP(DL1P, LOGL_DEBUG, "%s %s lchan->rtp_tx_marker = %s, len=%u\n",
- gsm_lchan_name(lchan),
- get_value_string(oc2gbts_tch_pl_names, payload_type),
- lchan->rtp_tx_marker ? "true" : "false",
- payload_len);
+ LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "%s lchan->rtp_tx_marker = %s,
len=%u\n",
+ get_value_string(oc2gbts_tch_pl_names, payload_type),
+ lchan->rtp_tx_marker ? "true" : "false", payload_len);
switch (payload_type) {
case GsmL1_TchPlType_Fr:
@@ -482,8 +479,8 @@
return 0;
err_payload_match:
- LOGPFN(DL1P, LOGL_ERROR, data_ind->u32Fn, "%s Rx Payload Type %s
incompatible with lchan\n",
- gsm_lchan_name(lchan), get_value_string(oc2gbts_tch_pl_names,
payload_type));
+ LOGPLCFN(lchan, DL1P, LOGL_ERROR, data_ind->u32Fn, "%s Rx Payload Type
%s incompatible with lchan\n",
+ gsm_lchan_name(lchan), get_value_string(oc2gbts_tch_pl_names,
payload_type));
return -EINVAL;
}
diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index 4898eb6..1488a9d 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -589,7 +589,7 @@
if (msg) {
nmsg = l1p_msgb_alloc();
if (!nmsg) {
- LOGPFN(DL1C, LOGL_FATAL, u32Fn, "L1SAP PH-TCH.req msg
alloc failed\n");
+ LOGPLCFN(lchan, DL1C, LOGL_FATAL, u32Fn, "L1SAP
PH-TCH.req msg alloc failed\n");
return -ENOMEM;
}
diff --git a/src/osmo-bts-octphy/l1_tch.c b/src/osmo-bts-octphy/l1_tch.c
index bffa1e9..bce55f1 100644
--- a/src/osmo-bts-octphy/l1_tch.c
+++ b/src/osmo-bts-octphy/l1_tch.c
@@ -146,7 +146,7 @@
&trx->ts[L1SAP_CHAN2TS(chan_nr)].lchan[l1sap_chan2ss(chan_nr)];
if (data_ind->Data.ulDataLength < 1) {
- LOGPFN(DL1P, LOGL_DEBUG, fn, "chan_nr %d Rx Payload size 0\n",
chan_nr);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, fn, "chan_nr %d Rx Payload
size 0\n", chan_nr);
/* Push empty payload to upper layers */
rmsg = msgb_alloc_headroom(256, 128, "L1P-to-RTP");
return add_l1sap_header(trx, rmsg, lchan, chan_nr,
@@ -173,13 +173,13 @@
goto err_payload_match;
break;
default:
- LOGPFN(DL1P, LOGL_NOTICE, fn, "%s Rx Payload Type %d is
unsupported\n",
- gsm_lchan_name(lchan), payload_type);
+ LOGPLCFN(lchan, DL1P, LOGL_NOTICE, fn, "%s Rx Payload Type %d
is unsupported\n",
+ gsm_lchan_name(lchan), payload_type);
break;
}
- LOGPFN(DL1P, LOGL_DEBUG, fn, "%s Rx codec frame (%u): %s\n",
gsm_lchan_name(lchan),
- payload_len, osmo_hexdump(payload, payload_len));
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, fn, "%s Rx codec frame (%u): %s\n",
gsm_lchan_name(lchan),
+ payload_len, osmo_hexdump(payload, payload_len));
switch (payload_type) {
case cOCTVC1_GSM_PAYLOAD_TYPE_ENUM_FULL_RATE:
@@ -201,7 +201,7 @@
rmsg = l1_to_rtppayload_amr(payload, payload_len,
&lchan->tch.amr_mr);
#else
- LOGPFN(DL1P, LOGL_ERROR, fn, "OctPHY only supports FR!\n");
+ LOGPLCFN(lchan, DL1P, LOGL_ERROR, fn, "OctPHY only supports
FR!\n");
return -1;
#endif
break;
@@ -215,8 +215,8 @@
return 0;
err_payload_match:
- LOGPFN(DL1P, LOGL_ERROR, fn, "%s Rx Payload Type %d incompatible with
lchan\n",
- gsm_lchan_name(lchan), payload_type);
+ LOGPLCFN(lchan, DL1P, LOGL_ERROR, fn, "%s Rx Payload Type %d
incompatible with lchan\n",
+ gsm_lchan_name(lchan), payload_type);
return -EINVAL;
}
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 646cf01..19f0c5a 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -392,7 +392,7 @@
else
sapi = GsmL1_Sapi_Agch;
} else {
- LOGPFN(DL1C, LOGL_NOTICE, u32Fn, "unknown prim %d op %d "
+ LOGPLCFN(lchan, DL1C, LOGL_NOTICE, u32Fn, "unknown prim %d op
%d "
"chan_nr %d link_id %d\n", l1sap->oph.primitive,
l1sap->oph.operation, chan_nr, link_id);
msgb_free(l1msg);
@@ -455,7 +455,7 @@
memcpy(l1p->u.phDataReq.msgUnitParam.u8Buffer, msg->l2h,
msgb_l2len(msg));
}
- LOGPFN(DL1P, LOGL_DEBUG, u32Fn, "PH-DATA.req(%s)\n",
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, u32Fn, "PH-DATA.req(%s)\n",
osmo_hexdump(l1p->u.phDataReq.msgUnitParam.u8Buffer,
l1p->u.phDataReq.msgUnitParam.u8Size));
} else {
@@ -467,7 +467,7 @@
/* send message to DSP's queue */
if (osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], l1msg) != 0) {
- LOGPFN(DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue full.
Dropping msg.\n");
+ LOGPLCFN(lchan, DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue
full. Dropping msg.\n");
msgb_free(l1msg);
} else
dtx_int_signal(lchan);
@@ -550,7 +550,7 @@
}
/* send message to DSP's queue */
if (osmo_wqueue_enqueue(&fl1->write_q[MQ_L1_WRITE], nmsg) != 0) {
- LOGPFN(DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue full.
Dropping msg.\n");
+ LOGPLCFN(lchan, DL1P, LOGL_ERROR, u32Fn, "MQ_L1_WRITE queue
full. Dropping msg.\n");
msgb_free(nmsg);
return -ENOBUFS;
}
diff --git a/src/osmo-bts-sysmo/tch.c b/src/osmo-bts-sysmo/tch.c
index fc9af77..b308a5f 100644
--- a/src/osmo-bts-sysmo/tch.c
+++ b/src/osmo-bts-sysmo/tch.c
@@ -513,7 +513,7 @@
return -EAGAIN;
if (data_ind->msgUnitParam.u8Size < 1) {
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "chan_nr %d Rx
Payload size 0\n", chan_nr);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "chan_nr %d
Rx Payload size 0\n", chan_nr);
/* Push empty payload to upper layers */
rmsg = msgb_alloc_headroom(256, 128, "L1P-to-RTP");
return add_l1sap_header(trx, rmsg, lchan, chan_nr,
data_ind->u32Fn,
@@ -549,8 +549,8 @@
if (lchan->type != GSM_LCHAN_TCH_H &&
lchan->type != GSM_LCHAN_TCH_F)
goto err_payload_match;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received ONSET
from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received ONSET from L1 "
+ "(%d bytes)\n", payload_len);
/* according to 3GPP TS 26.093 ONSET frames precede the first
speech frame of a speech burst - set the marker for next RTP
frame */
@@ -559,33 +559,32 @@
case GsmL1_TchPlType_Amr_SidFirstP1:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_FIRST_P1 from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_FIRST_P1 from L1 "
+ "(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidFirstP2:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_FIRST_P2 from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_FIRST_P2 from L1 "
+ "(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidFirstInH:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
lchan->rtp_tx_marker = true;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_FIRST_INH from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_FIRST_INH from L1 "
+ "(%d bytes)\n", payload_len);
break;
case GsmL1_TchPlType_Amr_SidUpdateInH:
if (lchan->type != GSM_LCHAN_TCH_H)
goto err_payload_match;
lchan->rtp_tx_marker = true;
- LOGPFN(DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX: received
SID_UPDATE_INH from L1 "
- "(%d bytes)\n", payload_len);
+ LOGPLCFN(lchan, DL1P, LOGL_DEBUG, data_ind->u32Fn, "DTX:
received SID_UPDATE_INH from L1 "
+ "(%d bytes)\n", payload_len);
break;
default:
- LOGPFN(DL1P, LOGL_NOTICE, data_ind->u32Fn, "%s Rx Payload Type
%s is unsupported\n",
- gsm_lchan_name(lchan),
- get_value_string(femtobts_tch_pl_names, payload_type));
+ LOGPLCFN(lchan, DL1P, LOGL_NOTICE, data_ind->u32Fn, "%s Rx
Payload Type %s is unsupported\n",
+ gsm_lchan_name(lchan),
get_value_string(femtobts_tch_pl_names, payload_type));
break;
}
@@ -626,9 +625,8 @@
return 0;
err_payload_match:
- LOGPFN(DL1P, LOGL_ERROR, data_ind->u32Fn, "%s Rx Payload Type %s
incompatible with lchan\n",
- gsm_lchan_name(lchan),
- get_value_string(femtobts_tch_pl_names, payload_type));
+ LOGPLCFN(lchan, DL1P, LOGL_ERROR, data_ind->u32Fn, "%s Rx Payload Type
%s incompatible with lchan\n",
+ gsm_lchan_name(lchan), get_value_string(femtobts_tch_pl_names,
payload_type));
return -EINVAL;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32087
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I214af0448652a9f321ccbab77977b67663ba28f9
Gerrit-Change-Number: 32087
Gerrit-PatchSet: 4
Gerrit-Owner: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-CC: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
