Move fsm_mgcp_client regstration to __attribute__((contructor))
This way we can avoid the runtime overhead of checking whether or not
it is initialized over and over again. It also brings this code more
in line with other users of osmo_fsm_register().
Change-Id: Ia73ba8e46c13d925e88203e08a8966839e573183
diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c b/src/libosmo-mgcp-client/mgcp_client_fsm.c
index e910586..e38a4ba 100644
--- a/src/libosmo-mgcp-client/mgcp_client_fsm.c
+++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c
@@ -606,7 +606,6 @@
uint32_t parent_term_evt, uint32_t parent_evt, struct mgcp_conn_peer *conn_peer)
{
struct mgcp_ctx *mgcp_ctx;
- static bool fsm_registered = false;
struct osmo_fsm_inst *fi;
struct in_addr ip_test;
@@ -618,13 +617,6 @@
if (conn_peer->port && inet_aton(conn_peer->addr, &ip_test) == 0)
return NULL;
- /* Register the fsm description (if not already done) */
- if (fsm_registered == false) {
- if (osmo_fsm_register(&fsm_mgcp_client) < 0)
- return NULL;
- fsm_registered = true;
- }
-
/* Allocate and configure a new fsm instance */
fi = osmo_fsm_inst_alloc_child(&fsm_mgcp_client, parent_fi, parent_term_evt);
OSMO_ASSERT(fi);
@@ -749,3 +741,8 @@
return "empty";
return buf;
}
+
+static __attribute__((constructor)) void osmo_mgcp_client_fsm_init()
+{
+ OSMO_ASSERT(osmo_fsm_register(&fsm_mgcp_client) == 0);
+}