<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23290">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Improve logging in DATA.req and ACT.req<br><br>Change-Id: Id57d50d8bf528adfef3713c594102d31ab49c149<br>---<br>M src/pcu_l1_if.cpp<br>1 file changed, 19 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/23290/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index b241aa2..1f87666 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -147,14 +147,15 @@</span><br><span> return pcu_sock_send(msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int pcu_tx_act_req(struct gprs_rlcmac_bts *bts, uint8_t trx, uint8_t ts, uint8_t activate)</span><br><span style="color: hsl(120, 100%, 40%);">+static int pcu_tx_act_req(struct gprs_rlcmac_bts *bts, const struct gprs_rlcmac_pdch *pdch,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t activate)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> struct gsm_pcu_if *pcu_prim;</span><br><span> struct gsm_pcu_if_act_req *act_req;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_INFO, "Sending %s request: trx=%d ts=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- (activate) ? "activate" : "deactivate", trx, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPDCH(pdch, DL1IF, LOGL_INFO, "Sending %s request\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ (activate) ? "activate" : "deactivate");</span><br><span> </span><br><span> msg = pcu_msgb_alloc(PCU_IF_MSG_ACT_REQ, bts->nr);</span><br><span> if (!msg)</span><br><span>@@ -162,8 +163,8 @@</span><br><span> pcu_prim = (struct gsm_pcu_if *) msg->data;</span><br><span> act_req = &pcu_prim->u.act_req;</span><br><span> act_req->activate = activate;</span><br><span style="color: hsl(0, 100%, 40%);">- act_req->trx_nr = trx;</span><br><span style="color: hsl(0, 100%, 40%);">- act_req->ts_nr = ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ act_req->trx_nr = pdch->trx_no();</span><br><span style="color: hsl(120, 100%, 40%);">+ act_req->ts_nr = pdch->ts_no;</span><br><span> </span><br><span> return pcu_sock_send(msg);</span><br><span> }</span><br><span>@@ -177,9 +178,9 @@</span><br><span> struct gsm_pcu_if_data *data_req;</span><br><span> int current_fn = bts_current_frame_number(bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_DEBUG, "Sending data request: trx=%d ts=%d sapi=%d "</span><br><span style="color: hsl(0, 100%, 40%);">- "arfcn=%d fn=%d cur_fn=%d block=%d data=%s\n", trx, ts, sapi, arfcn, fn, current_fn,</span><br><span style="color: hsl(0, 100%, 40%);">- block_nr, osmo_hexdump(data, len));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_DEBUG, "(bts=%u,trx=%u,ts=%u) FN=%u Sending data request: sapi=%d "</span><br><span style="color: hsl(120, 100%, 40%);">+ "arfcn=%d cur_fn=%d block=%d data=%s\n", bts->nr, trx, ts, fn, sapi,</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn, current_fn, block_nr, osmo_hexdump(data, len));</span><br><span> </span><br><span> msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_REQ, bts->nr);</span><br><span> if (!msg)</span><br><span>@@ -461,10 +462,12 @@</span><br><span> {</span><br><span> int rc = 0;</span><br><span> int current_fn = bts_current_frame_number(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_pdch *pdch;</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch = &bts->trx[rts_req->trx_nr].pdch[rts_req->ts_nr];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_DEBUG, "RTS request received: trx=%d ts=%d sapi=%d "</span><br><span style="color: hsl(0, 100%, 40%);">- "arfcn=%d fn=%d cur_fn=%d block=%d\n", rts_req->trx_nr, rts_req->ts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- rts_req->sapi, rts_req->arfcn, rts_req->fn, current_fn, rts_req->block_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPDCH(pdch, DL1IF, LOGL_DEBUG, "FN=%u RX RTS.req: sapi=%d "</span><br><span style="color: hsl(120, 100%, 40%);">+ "arfcn=%d cur_fn=%d block=%d\n", rts_req->fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ rts_req->sapi, rts_req->arfcn, current_fn, rts_req->block_nr);</span><br><span> </span><br><span> switch (rts_req->sapi) {</span><br><span> case PCU_IF_SAPI_PDTCH:</span><br><span>@@ -476,8 +479,9 @@</span><br><span> rts_req->fn, rts_req->block_nr);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1IF, LOGL_ERROR, "Received PCU RTS request with "</span><br><span style="color: hsl(0, 100%, 40%);">- "unsupported sapi %d\n", rts_req->sapi);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1IF, LOGL_ERROR, "(bts=%u,trx=%u,ts=%u) FN=%u RX RTS.req with "</span><br><span style="color: hsl(120, 100%, 40%);">+ "unsupported sapi %d\n", bts->nr, rts_req->trx_nr, rts_req->ts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ rts_req->fn, rts_req->sapi);</span><br><span> rc = -EINVAL;</span><br><span> }</span><br><span> </span><br><span>@@ -759,7 +763,7 @@</span><br><span> l1if_connect_pdch(</span><br><span> bts->trx[trx_nr].fl1h, ts_nr);</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_act_req(bts, trx_nr, ts_nr, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_act_req(bts, pdch, 1);</span><br><span> pdch->enable();</span><br><span> }</span><br><span> </span><br><span>@@ -785,7 +789,7 @@</span><br><span> trx_nr, ts_nr, pdch->tsc, pdch->fh.enabled ? "yes" : "no");</span><br><span> } else {</span><br><span> if (pdch->is_enabled()) {</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_act_req(bts, trx_nr, ts_nr, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_act_req(bts, pdch, 0);</span><br><span> pdch->free_resources();</span><br><span> pdch->disable();</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23290">change 23290</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/23290"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id57d50d8bf528adfef3713c594102d31ab49c149 </div>
<div style="display:none"> Gerrit-Change-Number: 23290 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>