diff options
| -rw-r--r-- | include/osmocom/core/fsm.h | 4 | ||||
| -rw-r--r-- | src/fsm.c | 21 |
2 files changed, 16 insertions, 9 deletions
diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 401ee04a..ce0db15a 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -26,6 +26,8 @@ enum osmo_fsm_term_cause { OSMO_FSM_TERM_REGULAR, /*! \brief erroneous termination of process */ OSMO_FSM_TERM_ERROR, + /*! \brief termination due to time-out */ + OSMO_FSM_TERM_TIMEOUT, }; /*! \brief description of a rule in the FSM */ @@ -63,7 +65,7 @@ struct osmo_fsm { /*! \breif clean-up function, called during termination */ void (*cleanup)(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause); /*! \brief timer call-back for states with time-out */ - void (*timer_cb)(struct osmo_fsm_inst *fi); + int (*timer_cb)(struct osmo_fsm_inst *fi); /*! \brief logging sub-system for this FSM */ int log_subsys; /*! \brief human-readable names of events */ @@ -136,10 +136,20 @@ static void fsm_tmr_cb(void *data) { struct osmo_fsm_inst *fi = data; struct osmo_fsm *fsm = fi->fsm; + uint32_t T = fi->T; LOGPFSM(fi, "Timeout of T%u\n", fi->T); - fsm->timer_cb(fi); + if (fsm->timer_cb) { + int rc = fsm->timer_cb(fi); + if (rc != 1) + return; + LOGPFSM(fi, "timer_cb requested termination\n"); + } else + LOGPFSM(fi, "No timer_cb, automatic termination\n"); + + /* if timer_cb returns 1 or there is no timer_cb */ + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_TIMEOUT, &T); } /*! \brief allocate a new instance of a specified FSM @@ -317,13 +327,8 @@ int osmo_fsm_inst_state_chg(struct osmo_fsm_inst *fi, uint32_t new_state, st->onenter(fi, old_state); if (timeout_secs) { - if (!fsm->timer_cb) - LOGP(fsm->log_subsys, LOGL_ERROR, "cannot start " - "timer for FSM without timer call-back\n"); - else { - fi->T = T; - osmo_timer_schedule(&fi->timer, timeout_secs, 0); - } + fi->T = T; + osmo_timer_schedule(&fi->timer, timeout_secs, 0); } return 0; |