diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-10-24 18:18:53 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-10-24 18:23:36 +0200 |
| commit | 5de728564c78dcf4e7fde8baf520d8b4f056860b (patch) | |
| tree | 4f980384658b373b9cec67bc21a308b921e3ff04 | |
| parent | 7b1d59c3c49108bf7b64e3a696b6b998ded16b1c (diff) | |
Rename osmo_fsm to avoid illegal space in name + more meaningful name
A FSM doesn't need "FSM" in its name, as it is obvious that it is a
FSM. Also, having two that are called RESET is confusing, so let's
try to come up with better names.
Also, after Change-Id I9ef59432f43a3cdb94e4cbb0c44ac3f9b2aac0f2 in
libosmocore, we now enforce that no FSM identifiers contain spaces
or other illegal characters.
Change-Id: I1b44d26cebc4a47094d7b8b3983e5737b88bf003
| -rw-r--r-- | src/libcommon-cs/a_reset.c | 4 | ||||
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_reset.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libcommon-cs/a_reset.c b/src/libcommon-cs/a_reset.c index c40bc4122..f08d81329 100644 --- a/src/libcommon-cs/a_reset.c +++ b/src/libcommon-cs/a_reset.c @@ -124,7 +124,7 @@ static struct osmo_fsm_state fsm_states[] = { /* State machine definition */ static struct osmo_fsm fsm = { - .name = "FSM RESET", + .name = "A-RESET", .states = fsm_states, .num_states = ARRAY_SIZE(fsm_states), .log_subsys = DMSC, @@ -149,7 +149,7 @@ struct a_reset_ctx *a_reset_alloc(const void *ctx, const char *name, void *cb, v reset->cb = cb; strncpy(reset->name, name, sizeof(reset->name)); reset->conn_loss_counter = 0; - reset->fsm = osmo_fsm_inst_alloc(&fsm, NULL, NULL, LOGL_DEBUG, "FSM RESET INST"); + reset->fsm = osmo_fsm_inst_alloc(&fsm, NULL, NULL, LOGL_DEBUG, NULL); OSMO_ASSERT(reset->fsm); reset->fsm->priv = reset; LOGP(DMSC, LOGL_NOTICE, "(%s) reset handler fsm created.\n", reset->name); diff --git a/src/osmo-bsc/osmo_bsc_reset.c b/src/osmo-bsc/osmo_bsc_reset.c index d28f54824..aadbd866b 100644 --- a/src/osmo-bsc/osmo_bsc_reset.c +++ b/src/osmo-bsc/osmo_bsc_reset.c @@ -124,7 +124,7 @@ static struct osmo_fsm_state fsm_states[] = { /* State machine definition */ static struct osmo_fsm fsm = { - .name = "FSM RESET", + .name = "A-CONNECTION", .states = fsm_states, .num_states = ARRAY_SIZE(fsm_states), .log_subsys = DMSC, @@ -138,7 +138,7 @@ void start_reset_fsm(struct bsc_msc_data *msc) OSMO_ASSERT(msc->msc_con); osmo_fsm_register(&fsm); - msc->msc_con->fsm_reset = osmo_fsm_inst_alloc(&fsm, NULL, NULL, LOGL_DEBUG, "FSM RESET INST"); + msc->msc_con->fsm_reset = osmo_fsm_inst_alloc(&fsm, NULL, NULL, LOGL_DEBUG, NULL); OSMO_ASSERT(msc->msc_con->fsm_reset); msc->msc_con->fsm_reset->priv = msc; |