mirror of https://gerrit.osmocom.org/libosmocore
control_if: Add control interface commands for FSMs
This allows programmatic access to introspection of FSM instances, which is quite handy from e.g. external test cases: Send a message to the code, then use the CTRL interface to check if that message has triggered the right kind of state transition. Change-Id: I0f80340ee9c61c88962fdd6764a6098a844d0d1e
This commit is contained in:
parent
f85861d6eb
commit
31c0fef2fd
|
@ -18,6 +18,8 @@ enum ctrl_node_type {
|
|||
CTRL_NODE_BTS, /* BTS specific (net.btsN.) */
|
||||
CTRL_NODE_TRX, /* TRX specific (net.btsN.trxM.) */
|
||||
CTRL_NODE_TS, /* TS specific (net.btsN.trxM.tsI.) */
|
||||
CTRL_NODE_FSM, /* Finite State Machine (description) */
|
||||
CTRL_NODE_FSM_INST, /* Finite State Machine (instance) */
|
||||
_LAST_CTRL_NODE
|
||||
};
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/incl
|
|||
if ENABLE_CTRL
|
||||
lib_LTLIBRARIES = libosmoctrl.la
|
||||
|
||||
libosmoctrl_la_SOURCES = control_cmd.c control_if.c
|
||||
libosmoctrl_la_SOURCES = control_cmd.c control_if.c fsm_ctrl_commands.c
|
||||
|
||||
libosmoctrl_la_LDFLAGS = $(LTLDFLAGS_OSMOCTRL) $(TALLOC_LIBS) -version-info $(LIBVERSION) -no-undefined
|
||||
libosmoctrl_la_LIBADD = \
|
||||
|
|
|
@ -717,6 +717,10 @@ static int ctrl_init(void)
|
|||
if (ret)
|
||||
goto err_vec;
|
||||
|
||||
ret = osmo_fsm_ctrl_cmds_install();
|
||||
if (ret)
|
||||
goto err_vec;
|
||||
|
||||
ctrl_initialized = 1;
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -0,0 +1,175 @@
|
|||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <osmocom/core/fsm.h>
|
||||
|
||||
#include <osmocom/ctrl/control_cmd.h>
|
||||
#include <osmocom/ctrl/control_if.h>
|
||||
|
||||
/*! \brief control interface lookup function for FSM's
|
||||
* \param[in] data Private data passed to controlif_setup()
|
||||
* \param[in] vline Vector of the line holding the command string
|
||||
* \param[out] node_type type (CTRL_NODE_) that was determined
|
||||
* \param[out] node_data private data of node that was determined
|
||||
* \param i Current index into vline, up to which it is parsed
|
||||
*/
|
||||
static int fsm_ctrl_node_lookup(void *data, vector vline, int *node_type,
|
||||
void **node_data, int *i)
|
||||
{
|
||||
struct osmo_fsm *fsm = NULL;
|
||||
struct osmo_fsm_inst *fi = NULL;;
|
||||
const char *token = vector_slot(vline, *i);
|
||||
|
||||
switch (*node_type) {
|
||||
case CTRL_NODE_ROOT:
|
||||
if (!strcmp(token, "fsm")) {
|
||||
const char *fsm_name;
|
||||
(*i)++;
|
||||
fsm_name = vector_lookup(vline, *i);
|
||||
if (!fsm_name)
|
||||
goto err_index;
|
||||
fsm = osmo_fsm_find_by_name(fsm_name);
|
||||
if (!fsm)
|
||||
goto err_missing;
|
||||
*node_data = fsm;
|
||||
*node_type = CTRL_NODE_FSM;
|
||||
}
|
||||
break;
|
||||
case CTRL_NODE_FSM:
|
||||
fsm = *node_data;
|
||||
if (!strcmp(token, "name")) {
|
||||
const char *inst_name;
|
||||
(*i)++;
|
||||
inst_name = vector_lookup(vline, *i);
|
||||
if (!inst_name)
|
||||
goto err_index;
|
||||
fi = osmo_fsm_inst_find_by_name(fsm, inst_name);
|
||||
if (!fi)
|
||||
goto err_missing;
|
||||
*node_data = fi;
|
||||
*node_type = CTRL_NODE_FSM_INST;
|
||||
} else if (!strcmp(token, "id")) {
|
||||
const char *inst_id;
|
||||
(*i)++;
|
||||
inst_id = vector_lookup(vline, *i);
|
||||
if (!inst_id)
|
||||
goto err_index;
|
||||
fi = osmo_fsm_inst_find_by_id(fsm, inst_id);
|
||||
if (!fi)
|
||||
goto err_missing;
|
||||
*node_data = fi;
|
||||
*node_type = CTRL_NODE_FSM_INST;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
||||
err_index:
|
||||
return -ERANGE;
|
||||
err_missing:
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int get_fsm_inst_state(struct ctrl_cmd *cmd, void *data)
|
||||
{
|
||||
struct osmo_fsm_inst *fi = cmd->node;
|
||||
|
||||
if (!fi) {
|
||||
cmd->reply = "No such FSM found";
|
||||
return CTRL_CMD_ERROR;
|
||||
}
|
||||
|
||||
cmd->reply = talloc_strdup(cmd, osmo_fsm_state_name(fi->fsm, fi->state));
|
||||
return CTRL_CMD_REPLY;
|
||||
}
|
||||
CTRL_CMD_DEFINE_RO(fsm_inst_state, "state");
|
||||
|
||||
static int get_fsm_inst_parent_name(struct ctrl_cmd *cmd, void *data)
|
||||
{
|
||||
struct osmo_fsm_inst *fi = cmd->node;
|
||||
|
||||
if (!fi) {
|
||||
cmd->reply = "No such FSM found";
|
||||
return CTRL_CMD_ERROR;
|
||||
}
|
||||
if (!fi->proc.parent) {
|
||||
cmd->reply = "No parent";
|
||||
return CTRL_CMD_ERROR;
|
||||
}
|
||||
cmd->reply = talloc_strdup(cmd, fi->proc.parent->name);
|
||||
return CTRL_CMD_REPLY;
|
||||
}
|
||||
CTRL_CMD_DEFINE_RO(fsm_inst_parent_name, "parent-name");
|
||||
|
||||
static int get_fsm_inst_timer(struct ctrl_cmd *cmd, void *data)
|
||||
{
|
||||
struct osmo_fsm_inst *fi = cmd->node;
|
||||
struct timeval remaining;
|
||||
|
||||
if (!fi) {
|
||||
cmd->reply = "No such FSM found";
|
||||
return CTRL_CMD_ERROR;
|
||||
}
|
||||
if (osmo_timer_remaining(&fi->timer, NULL, &remaining) < 0)
|
||||
cmd->reply = "0,0,0";
|
||||
else
|
||||
cmd->reply = talloc_asprintf(cmd, "%u,%ld,%ld", fi->T, remaining.tv_sec, remaining.tv_usec);
|
||||
|
||||
return CTRL_CMD_REPLY;
|
||||
}
|
||||
CTRL_CMD_DEFINE_RO(fsm_inst_timer, "timer");
|
||||
|
||||
|
||||
static int get_fsm_inst_dump(struct ctrl_cmd *cmd, void *data)
|
||||
{
|
||||
struct osmo_fsm_inst *fi = cmd->node;
|
||||
struct osmo_fsm_inst *child;
|
||||
|
||||
if (!fi) {
|
||||
cmd->reply = "No such FSM found";
|
||||
return CTRL_CMD_ERROR;
|
||||
}
|
||||
|
||||
/* Fixed Part: Name, ID, log_level, state, timer number */
|
||||
cmd->reply = talloc_asprintf(cmd, "'%s','%s','%s','%s',%u", fi->name, fi->id,
|
||||
log_level_str(fi->log_level),
|
||||
osmo_fsm_state_name(fi->fsm, fi->state), fi->T);
|
||||
|
||||
/* Variable Parts below */
|
||||
if (fi->T) {
|
||||
struct timeval remaining;
|
||||
int rc;
|
||||
rc = osmo_timer_remaining(&fi->timer, NULL, &remaining);
|
||||
if (rc == 0) {
|
||||
cmd->reply = talloc_asprintf_append(cmd->reply, ",timeout_sec=%ld,timeout_usec=%ld",
|
||||
remaining.tv_sec, remaining.tv_usec);
|
||||
}
|
||||
}
|
||||
|
||||
if (fi->proc.parent)
|
||||
cmd->reply = talloc_asprintf_append(cmd->reply, ",parent='%s'", fi->proc.parent->name);
|
||||
|
||||
llist_for_each_entry(child, &fi->proc.children, list) {
|
||||
cmd->reply = talloc_asprintf_append(cmd->reply, ",child='%s'", child->name);
|
||||
}
|
||||
|
||||
return CTRL_CMD_REPLY;
|
||||
}
|
||||
|
||||
CTRL_CMD_DEFINE_RO(fsm_inst_dump, "dump");
|
||||
|
||||
int osmo_fsm_ctrl_cmds_install(void)
|
||||
{
|
||||
int rc = 0;
|
||||
|
||||
rc |= ctrl_cmd_install(CTRL_NODE_FSM_INST, &cmd_fsm_inst_dump);
|
||||
rc |= ctrl_cmd_install(CTRL_NODE_FSM_INST, &cmd_fsm_inst_state);
|
||||
rc |= ctrl_cmd_install(CTRL_NODE_FSM_INST, &cmd_fsm_inst_parent_name);
|
||||
rc |= ctrl_cmd_install(CTRL_NODE_FSM_INST, &cmd_fsm_inst_timer);
|
||||
rc |= ctrl_lookup_register(fsm_ctrl_node_lookup);
|
||||
|
||||
return rc;
|
||||
}
|
|
@ -8,6 +8,7 @@
|
|||
#include <osmocom/core/select.h>
|
||||
#include <osmocom/core/logging.h>
|
||||
#include <osmocom/core/fsm.h>
|
||||
#include <osmocom/ctrl/control_if.h>
|
||||
|
||||
enum {
|
||||
DMAIN,
|
||||
|
@ -83,15 +84,38 @@ static struct osmo_fsm_state test_fsm_states[] = {
|
|||
};
|
||||
|
||||
static struct osmo_fsm fsm = {
|
||||
.name = "Test FSM",
|
||||
.name = "Test_FSM",
|
||||
.states = test_fsm_states,
|
||||
.num_states = ARRAY_SIZE(test_fsm_states),
|
||||
.log_subsys = DMAIN,
|
||||
};
|
||||
|
||||
static struct ctrl_handle *g_ctrl;
|
||||
|
||||
static struct ctrl_cmd *exec_ctrl_cmd(const char *cmdstr)
|
||||
{
|
||||
struct ctrl_cmd *cmd;
|
||||
return ctrl_cmd_exec_from_string(g_ctrl, cmdstr);
|
||||
OSMO_ASSERT(cmd);
|
||||
return cmd;
|
||||
}
|
||||
|
||||
static void assert_cmd_reply(const char *cmdstr, const char *expres)
|
||||
{
|
||||
struct ctrl_cmd *cmd;
|
||||
|
||||
cmd = exec_ctrl_cmd(cmdstr);
|
||||
if (strcmp(cmd->reply, expres)) {
|
||||
fprintf(stderr, "Reply '%s' doesn't match expected '%s'\n", cmd->reply, expres);
|
||||
OSMO_ASSERT(0);
|
||||
}
|
||||
talloc_free(cmd);
|
||||
}
|
||||
|
||||
static struct osmo_fsm_inst *foo(void)
|
||||
{
|
||||
struct osmo_fsm_inst *fi;
|
||||
struct ctrl_cmd *cmd;
|
||||
|
||||
LOGP(DMAIN, LOGL_INFO, "Checking FSM allocation\n");
|
||||
fi = osmo_fsm_inst_alloc(&fsm, g_ctx, NULL, LOGL_DEBUG, "my_id");
|
||||
|
@ -100,20 +124,30 @@ static struct osmo_fsm_inst *foo(void)
|
|||
OSMO_ASSERT(!strncmp(osmo_fsm_inst_name(fi), fsm.name, strlen(fsm.name)));
|
||||
OSMO_ASSERT(fi->state == ST_NULL);
|
||||
OSMO_ASSERT(fi->log_level == LOGL_DEBUG);
|
||||
assert_cmd_reply("GET 1 fsm.Test_FSM.id.my_id.state", "NULL");
|
||||
assert_cmd_reply("GET 1 fsm.Test_FSM.id.my_id.timer", "0,0,0");
|
||||
|
||||
/* Try invalid state transition */
|
||||
osmo_fsm_inst_dispatch(fi, EV_B, (void *) 42);
|
||||
OSMO_ASSERT(fi->state == ST_NULL);
|
||||
assert_cmd_reply("GET 1 fsm.Test_FSM.id.my_id.state", "NULL");
|
||||
|
||||
|
||||
/* Legitimate state transition */
|
||||
osmo_fsm_inst_dispatch(fi, EV_A, (void *) 23);
|
||||
OSMO_ASSERT(fi->state == ST_ONE);
|
||||
assert_cmd_reply("GET 1 fsm.Test_FSM.id.my_id.state", "ONE");
|
||||
|
||||
/* Legitimate transition with timer */
|
||||
fsm.timer_cb = test_fsm_tmr_cb;
|
||||
osmo_fsm_inst_dispatch(fi, EV_B, (void *) 42);
|
||||
OSMO_ASSERT(fi->state == ST_TWO);
|
||||
assert_cmd_reply("GET 1 fsm.Test_FSM.id.my_id.state", "TWO");
|
||||
|
||||
cmd = exec_ctrl_cmd("GET 2 fsm.Test_FSM.id.my_id.dump");
|
||||
const char *exp = "'Test_FSM(my_id)','my_id','DEBUG','TWO',2342,timeout_sec=";
|
||||
OSMO_ASSERT(!strncmp(cmd->reply, exp, strlen(exp)));
|
||||
talloc_free(cmd);
|
||||
|
||||
return fi;
|
||||
}
|
||||
|
@ -142,7 +176,7 @@ int main(int argc, char **argv)
|
|||
stderr_target = log_target_create_stderr();
|
||||
log_add_target(stderr_target);
|
||||
log_set_print_filename(stderr_target, 0);
|
||||
|
||||
g_ctrl = ctrl_handle_alloc(NULL, NULL, NULL);
|
||||
|
||||
g_ctx = NULL;
|
||||
OSMO_ASSERT(osmo_fsm_find_by_name(fsm.name) == NULL);
|
||||
|
@ -152,7 +186,7 @@ int main(int argc, char **argv)
|
|||
OSMO_ASSERT(osmo_fsm_inst_find_by_name(&fsm, "my_id") == NULL);
|
||||
finst = foo();
|
||||
OSMO_ASSERT(osmo_fsm_inst_find_by_id(&fsm, "my_id") == finst);
|
||||
OSMO_ASSERT(osmo_fsm_inst_find_by_name(&fsm, "Test FSM(my_id)") == finst);
|
||||
OSMO_ASSERT(osmo_fsm_inst_find_by_name(&fsm, "Test_FSM(my_id)") == finst);
|
||||
|
||||
while (1) {
|
||||
osmo_select_main(0);
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
Checking FSM allocation
|
||||
[0;mTest FSM(my_id){NULL}: Allocated
|
||||
[0;mTest FSM(my_id){NULL}: Received Event 1
|
||||
[0;mTest FSM(my_id){NULL}: Event 1 not permitted
|
||||
[0;mTest FSM(my_id){NULL}: Received Event 0
|
||||
[0;mTest FSM(my_id){NULL}: state_chg to ONE
|
||||
[0;mTest FSM(my_id){ONE}: Received Event 1
|
||||
[0;mTest FSM(my_id){ONE}: state_chg to TWO
|
||||
[0;mTest FSM(my_id){TWO}: Timeout of T2342
|
||||
[0;mTest_FSM(my_id){NULL}: Allocated
|
||||
[0;mTest_FSM(my_id){NULL}: Received Event 1
|
||||
[0;mTest_FSM(my_id){NULL}: Event 1 not permitted
|
||||
[0;mTest_FSM(my_id){NULL}: Received Event 0
|
||||
[0;mTest_FSM(my_id){NULL}: state_chg to ONE
|
||||
[0;mTest_FSM(my_id){ONE}: Received Event 1
|
||||
[0;mTest_FSM(my_id){ONE}: state_chg to TWO
|
||||
[0;mTest_FSM(my_id){TWO}: Timeout of T2342
|
||||
[0;mTimer
|
||||
[0;m
|
Loading…
Reference in New Issue