diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2019-04-08 00:33:53 +0200 |
---|---|---|
committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2019-04-11 05:36:36 +0000 |
commit | 3b414a4adc8687af1a32f36fc1553bc65fb6b348 (patch) | |
tree | cccdbc0a83ec0789968a73293520c960584b0996 /src | |
parent | 223d66a41455033e77e8c2cbb8170eaf0217b954 (diff) |
fsm: add flag to ensure osmo_fsm_inst_term() happens only once
To prevent re-entering osmo_fsm_inst_term() twice for the same osmo_fsm_inst,
add flag osmo_fsm_inst.proc.terminating. osmo_fsm_inst_term() sets this to
true, or exits if it already is true.
Update fsm_dealloc_test.err for illustration. It is not relevant for unit
testing yet, just showing the difference.
Change-Id: I0c02d76a86f90c49e0eae2f85db64704c96a7674
Diffstat (limited to 'src')
-rw-r--r-- | src/fsm.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -710,6 +710,12 @@ void _osmo_fsm_inst_term(struct osmo_fsm_inst *fi, struct osmo_fsm_inst *parent; uint32_t parent_term_event = fi->proc.parent_term_event; + if (fi->proc.terminating) { + LOGPFSMSRC(fi, file, line, "Ignoring trigger to terminate: already terminating\n"); + return; + } + fi->proc.terminating = true; + LOGPFSMSRC(fi, file, line, "Terminating (cause = %s)\n", osmo_fsm_term_cause_name(cause)); |