paulmataruso/osmo-bts
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-bts.git synced 2025-11-02 05:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

osmo-bts-trx: trx_fn_timer_cb(): fix misleading shutdown reason

Browse Source 
If osmo-bts-trx exit()s due to the PC clock issues, e.g. if the
process stalls, it produces rather confusing logging messages:

  DL1C ERROR PC clock skew: elapsed_us=387574, error_us=382959
  DOML NOTICE ... Shutting down BTS, exit 1, reason: No clock from osmo-trx

The second message suggests that the transceiver (osmo-trx) is the
culprit, but the first one reflects the actual reason (PC clock skew).

Let's pass proper shutdown reason to avoid confusion.

Change-Id: Ibbbbc4e919e6eb812882fc60de4be13fa77934b7
This commit is contained in:
Vadim Yanitskiy
2025-04-25 21:35:12 +07:00
parent d4bb8d61e7
commit 799ad7240b
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osmo-bts-trx/scheduler_trx.c
View File

@@ -411,6 +411,7 @@ static int trx_fn_timer_cb(struct osmo_fd *ofd, unsigned int what)
struct timespec tv_now;
uint64_t expire_count;
int64_t elapsed_us, error_us;
const char *reason = NULL;
int rc, i;
if (!(what & OSMO_FD_READ))
@@ -430,8 +431,9 @@ static int trx_fn_timer_cb(struct osmo_fd *ofd, unsigned int what)
/* check if transceiver is still alive */
if (tcs->fn_without_clock_ind++ == TRX_LOSS_FRAMES) {
LOGP(DL1C, LOGL_NOTICE, "No more clock from transceiver\n");
goto no_clock;
reason = "No more clock from transceiver";
LOGP(DL1C, LOGL_ERROR, "%s\n", reason);
goto shutdown;
}
/* compute actual elapsed time and resulting OS scheduling error */
@@ -446,9 +448,11 @@ static int trx_fn_timer_cb(struct osmo_fd *ofd, unsigned int what)
/* if someone played with clock, or if the process stalled */
if (elapsed_us > GSM_TDMA_FN_DURATION_uS * MAX_FN_SKEW || elapsed_us < 0) {
LOGP(DL1C, LOGL_ERROR, "PC clock skew: elapsed_us=%" PRId64 ", error_us=%" PRId64 "\n",
elapsed_us, error_us);
goto no_clock;
LOGP(DL1C, LOGL_ERROR,
"PC clock skew: elapsed_us=%" PRId64 ", error_us=%" PRId64 "\n",
elapsed_us, error_us);
reason = "PC clock skew too high";
goto shutdown;
}
/* call bts_sched_fn() for all expired FN */
@@ -457,9 +461,9 @@ static int trx_fn_timer_cb(struct osmo_fd *ofd, unsigned int what)
return 0;
no_clock:
shutdown:
osmo_timerfd_disable(&tcs->fn_timer_ofd);
bts_shutdown(bts, "No clock from osmo-trx");
bts_shutdown(bts, reason);
return -1;
}