[MERGED] libosmocore[master]: fsm: term: get parent pointer as late as possible

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: fsm: term: get parent pointer as late as possible
......................................................................


fsm: term: get parent pointer as late as possible

During FSM instance termination, fetch the parent pointer every time just
before using it, in case the child termination or cleanup callback wish to
change anything about the parent, e.g. to prevent event dispatch.

This patch was created to try and fix a problem that was in the end solved
differently. There is no actual need or use case for this at the moment, but it
generally makes sense to get the parent pointer as late as possible.

Change-Id: I999d7f29ba10281d4005c5163130bb2d80148362
---
M src/fsm.c
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/fsm.c b/src/fsm.c
index 5c47a44..19705b9 100644
--- a/src/fsm.c
+++ b/src/fsm.c
@@ -421,7 +421,7 @@
 			 enum osmo_fsm_term_cause cause, void *data,
 			 const char *file, int line)
 {
-	struct osmo_fsm_inst *parent = fi->proc.parent;
+	struct osmo_fsm_inst *parent;
 	uint32_t parent_term_event = fi->proc.parent_term_event;
 
 	LOGPFSMSRC(fi, file, line, "Terminating (cause = %s)\n",
@@ -431,6 +431,7 @@
 				     file, line);
 
 	/* delete ourselves from the parent */
+	parent = fi->proc.parent;
 	if (parent)
 		LOGPFSMSRC(fi, file, line, "Removing from parent %s\n",
 			   osmo_fsm_inst_name(parent));
@@ -441,6 +442,8 @@
 		fi->fsm->cleanup(fi, cause);
 
 	LOGPFSMSRC(fi, file, line, "Freeing instance\n");
+	/* Fetch parent again in case it has changed. */
+	parent = fi->proc.parent;
 	osmo_fsm_inst_free(fi);
 
 	/* indicate our termination to the parent */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I999d7f29ba10281d4005c5163130bb2d80148362
Gerrit-PatchSet: 3
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>