diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2021-02-12 02:50:44 +0100 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2021-02-12 08:57:24 +0000 |
| commit | ab0e8646c4aa022abc13e6d5bc961c4194439123 (patch) | |
| tree | 2293ed51b750a2e3a106b15c663b56a00527b72c | |
| parent | c4704769237537478b2671225344aa64ad7bdb60 (diff) | |
gprs_ns2_vc_fsm: use CLOCK_MONOTONIC for alive elapsed timer
gettimeofday can jump and the comment says it should not be used for elapsed timer.
Related: OS#4997
Change-Id: I41989d8f9f82f4d1f7b97f11577653699365c8ae
| -rw-r--r-- | src/gb/gprs_ns2_vc_fsm.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 66ee4505..88ce8aeb 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -70,7 +70,7 @@ struct gprs_ns2_vc_priv { struct osmo_timer_list timer; enum ns2_timeout mode; int N; - struct timeval timer_started; + struct timespec timer_started; } alive; }; @@ -155,7 +155,7 @@ static void start_test_procedure(struct gprs_ns2_vc_priv *priv) priv->alive.mode = NS_TOUT_TNS_ALIVE; priv->alive.N = 0; - osmo_gettimeofday(&priv->alive.timer_started, NULL); + osmo_clock_gettime(CLOCK_MONOTONIC, &priv->alive.timer_started); ns2_tx_alive(priv->nsvc); osmo_timer_schedule(&priv->alive.timer, nsi->timeout[NS_TOUT_TNS_ALIVE], 0); } @@ -167,11 +167,15 @@ static void stop_test_procedure(struct gprs_ns2_vc_priv *priv) static int alive_timer_elapsed_ms(struct gprs_ns2_vc_priv *priv) { - struct timeval now, elapsed; - osmo_gettimeofday(&now, NULL); - timersub(&now, &priv->alive.timer_started, &elapsed); + struct timespec now, elapsed; - return 1000 * elapsed.tv_sec + elapsed.tv_usec / 1000; + if (osmo_clock_gettime(CLOCK_MONOTONIC, &now) != 0) + return 0; + + timespecsub(&now, &priv->alive.timer_started, &elapsed); + LOGNSVC(priv->nsvc, LOGL_ERROR, "elapsed: %ld, now: %ld, saved: %ld.\n", + elapsed.tv_sec, now.tv_sec, priv->alive.timer_started.tv_sec); + return elapsed.tv_sec * 1000 + (elapsed.tv_nsec / 1000000); } static void recv_test_procedure(struct osmo_fsm_inst *fi) |