Change in osmocom-bb[master]: trxcon: register both l1ctl_fsm and trx_fsm on DSO load

[Vadim Yanitskiy]

Vadim Yanitskiy has submitted this change and it was merged. ( https://gerrit.osmocom.org/12586 )

Change subject: trxcon: register both l1ctl_fsm and trx_fsm on DSO load
......................................................................

trxcon: register both l1ctl_fsm and trx_fsm on DSO load

Change-Id: I7111e368afa47c88ff3c610bae9044f2d5baf037
---
M src/host/trxcon/l1ctl_link.c
M src/host/trxcon/trx_if.c
2 files changed, 10 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/host/trxcon/l1ctl_link.c b/src/host/trxcon/l1ctl_link.c
index 20cb70c..23019fd 100644
--- a/src/host/trxcon/l1ctl_link.c
+++ b/src/host/trxcon/l1ctl_link.c
@@ -269,7 +269,6 @@
 	l1l_new->wq.bfd.fd = -1;
 
 	/* Allocate a new dedicated state machine */
-	osmo_fsm_register(&l1ctl_fsm);
 	l1l_new->fsm = osmo_fsm_inst_alloc(&l1ctl_fsm, l1l_new,
 		NULL, LOGL_DEBUG, "l1ctl_link");
 
@@ -308,3 +307,8 @@
 	osmo_fsm_inst_free(l1l->fsm);
 	talloc_free(l1l);
 }
+
+static __attribute__((constructor)) void on_dso_load(void)
+{
+	OSMO_ASSERT(osmo_fsm_register(&l1ctl_fsm) == 0);
+}
diff --git a/src/host/trxcon/trx_if.c b/src/host/trxcon/trx_if.c
index 982fb40..91b87a2 100644
--- a/src/host/trxcon/trx_if.c
+++ b/src/host/trxcon/trx_if.c
@@ -660,7 +660,6 @@
 		goto error;
 
 	/* Allocate a new dedicated state machine */
-	osmo_fsm_register(&trx_fsm);
 	trx_new->fsm = osmo_fsm_inst_alloc(&trx_fsm, trx_new,
 		NULL, LOGL_DEBUG, "trx_interface");
 
@@ -710,3 +709,8 @@
 	osmo_fsm_inst_free(trx->fsm);
 	talloc_free(trx);
 }
+
+static __attribute__((constructor)) void on_dso_load(void)
+{
+	OSMO_ASSERT(osmo_fsm_register(&trx_fsm) == 0);
+}

-- 
To view, visit https://gerrit.osmocom.org/12586
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I7111e368afa47c88ff3c610bae9044f2d5baf037
Gerrit-Change-Number: 12586
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190117/f6b19190/attachment.htm>