Harald Welte has submitted this change and it was merged.

Change subject: pcu_l1_if: add frame number to log output
......................................................................


pcu_l1_if: add frame number to log output

Currently, the log output lacks the frame number.

 - make get_current_fn() public
 - add frame number to the log statements in pcu_l1_if.cpp

Change-Id: Idce994dbf86a2bbf861907d75418a2a3867244db
Related: SYS#4139
Patch-by: Octasic inc.
---
M src/gsm_timer.cpp
M src/gsm_timer.h
M src/pcu_l1_if.cpp
3 files changed, 21 insertions(+), 10 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gsm_timer.cpp b/src/gsm_timer.cpp
index d3c59cb..f7901d4 100644
--- a/src/gsm_timer.cpp
+++ b/src/gsm_timer.cpp
@@ -43,7 +43,7 @@
  * all time functions schedule based on the BTS they
  * are scheduled on.
  */
-static int get_current_fn()
+int get_current_fn()
 {
        return BTS::main_bts()->current_frame_number();
 }
diff --git a/src/gsm_timer.h b/src/gsm_timer.h
index fc42caf..cfabd0c 100644
--- a/src/gsm_timer.h
+++ b/src/gsm_timer.h
@@ -79,6 +79,12 @@
 int osmo_gsm_timers_update(void);
 int osmo_gsm_timers_check(void);
 
+
+/*
+ * Get Current Frame Number
+ */
+int get_current_fn();
+
 /*! }@ */
 
 #endif // GSM_TIMER_H
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index a9d17b6..4b54707 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -143,9 +143,10 @@
        struct msgb *msg;
        struct gsm_pcu_if *pcu_prim;
        struct gsm_pcu_if_data *data_req;
+       int current_fn = get_current_fn();
 
        LOGP(DL1IF, LOGL_DEBUG, "Sending data request: trx=%d ts=%d sapi=%d "
-               "arfcn=%d fn=%d block=%d data=%s\n", trx, ts, sapi, arfcn, fn,
+               "arfcn=%d fn=%d cur_fn=%d block=%d data=%s\n", trx, ts, sapi, 
arfcn, fn, current_fn,
                block_nr, osmo_hexdump(data, len));
 
        msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_REQ, 0);
@@ -276,11 +277,12 @@
 {
        struct gprs_rlcmac_bts *bts = bts_main_data();
        int rc;
+       int current_fn = get_current_fn();
        pcu_l1_meas meas;
 
        LOGP(DL1IF, LOGL_DEBUG, "Data indication received: sapi=%d arfcn=%d "
-               "block=%d data=%s\n", data_ind->sapi,
-               data_ind->arfcn, data_ind->block_nr,
+               "fn=%d cur_fn=%d block=%d data=%s\n", data_ind->sapi,
+               data_ind->arfcn, data_ind->fn, current_fn, data_ind->block_nr,
                osmo_hexdump(data_ind->data, data_ind->len));
 
        switch (data_ind->sapi) {
@@ -318,9 +320,10 @@
 static int pcu_rx_data_cnf(struct gsm_pcu_if_data *data_cnf)
 {
        int rc = 0;
+       int current_fn = get_current_fn();
 
-       LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d fn=%d\n",
-               data_cnf->sapi, data_cnf->fn);
+       LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d fn=%d 
cur_fn=%d\n",
+               data_cnf->sapi, data_cnf->fn, current_fn);
 
        switch (data_cnf->sapi) {
        case PCU_IF_SAPI_PCH:
@@ -347,10 +350,11 @@
 static int pcu_rx_rts_req(struct gsm_pcu_if_rts_req *rts_req)
 {
        int rc = 0;
+       int current_fn = get_current_fn();
 
        LOGP(DL1IF, LOGL_DEBUG, "RTS request received: trx=%d ts=%d sapi=%d "
-               "arfcn=%d fn=%d block=%d\n", rts_req->trx_nr, rts_req->ts_nr,
-               rts_req->sapi, rts_req->arfcn, rts_req->fn, rts_req->block_nr);
+               "arfcn=%d fn=%d cur_fn=%d block=%d\n", rts_req->trx_nr, 
rts_req->ts_nr,
+               rts_req->sapi, rts_req->arfcn, rts_req->fn, current_fn, 
rts_req->block_nr);
 
        switch (rts_req->sapi) {
        case PCU_IF_SAPI_PDTCH:
@@ -378,10 +382,11 @@
 static int pcu_rx_rach_ind(struct gsm_pcu_if_rach_ind *rach_ind)
 {
        int rc = 0;
+       int current_fn = get_current_fn();
 
        LOGP(DL1IF, LOGL_INFO, "RACH request received: sapi=%d "
-               "qta=%d, ra=%d, fn=%d\n", rach_ind->sapi, rach_ind->qta,
-               rach_ind->ra, rach_ind->fn);
+               "qta=%d, ra=%d, fn=%d, cur_fn=%d, is_11bit=%d\n", 
rach_ind->sapi, rach_ind->qta,
+               rach_ind->ra, rach_ind->fn, current_fn, rach_ind->is_11bit);
 
        switch (rach_ind->sapi) {
        case PCU_IF_SAPI_RACH:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idce994dbf86a2bbf861907d75418a2a3867244db
Gerrit-PatchSet: 1
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Owner: dexter <pma...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder

Reply via email to