From: Christian Brauner Date: Sun, 2 Jul 2017 12:47:02 +0000 (+0200) Subject: commands: rename to lxc_cmd_add_state_client() X-Git-Tag: lxc-2.1.0~57^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54446942fea68b01be9af90cb4a52981265c112b;p=thirdparty%2Flxc.git commands: rename to lxc_cmd_add_state_client() The new wait commands API is not yet stable so this change is ok. Signed-off-by: Christian Brauner --- diff --git a/src/lxc/commands.c b/src/lxc/commands.c index 1333b8c57..c39db35d2 100644 --- a/src/lxc/commands.c +++ b/src/lxc/commands.c @@ -78,16 +78,16 @@ lxc_log_define(lxc_commands, lxc); static const char *lxc_cmd_str(lxc_cmd_t cmd) { static const char * const cmdname[LXC_CMD_MAX] = { - [LXC_CMD_CONSOLE] = "console", - [LXC_CMD_STOP] = "stop", - [LXC_CMD_GET_STATE] = "get_state", - [LXC_CMD_GET_INIT_PID] = "get_init_pid", - [LXC_CMD_GET_CLONE_FLAGS] = "get_clone_flags", - [LXC_CMD_GET_CGROUP] = "get_cgroup", - [LXC_CMD_GET_CONFIG_ITEM] = "get_config_item", - [LXC_CMD_GET_NAME] = "get_name", - [LXC_CMD_GET_LXCPATH] = "get_lxcpath", - [LXC_CMD_STATE_SERVER] = "state_server", + [LXC_CMD_CONSOLE] = "console", + [LXC_CMD_STOP] = "stop", + [LXC_CMD_GET_STATE] = "get_state", + [LXC_CMD_GET_INIT_PID] = "get_init_pid", + [LXC_CMD_GET_CLONE_FLAGS] = "get_clone_flags", + [LXC_CMD_GET_CGROUP] = "get_cgroup", + [LXC_CMD_GET_CONFIG_ITEM] = "get_config_item", + [LXC_CMD_GET_NAME] = "get_name", + [LXC_CMD_GET_LXCPATH] = "get_lxcpath", + [LXC_CMD_ADD_STATE_CLIENT] = "add_state_client", }; if (cmd >= LXC_CMD_MAX) @@ -232,7 +232,7 @@ static int lxc_cmd(const char *name, struct lxc_cmd_rr *cmd, int *stopped, bool stay_connected = false; if (cmd->req.cmd == LXC_CMD_CONSOLE || - cmd->req.cmd == LXC_CMD_STATE_SERVER) + cmd->req.cmd == LXC_CMD_ADD_STATE_CLIENT) stay_connected = true; *stopped = 0; @@ -813,15 +813,15 @@ static int lxc_cmd_get_lxcpath_callback(int fd, struct lxc_cmd_req *req, } /* - * lxc_cmd_state_server: register a client fd in the handler list + * lxc_cmd_add_state_client: register a client fd in the handler list * * @name : name of container to connect to * @lxcpath : the lxcpath in which the container is running * * Returns the lxcpath on success, NULL on failure. */ -int lxc_cmd_state_server(const char *name, const char *lxcpath, - lxc_state_t states[MAX_STATE]) +int lxc_cmd_add_state_client(const char *name, const char *lxcpath, + lxc_state_t states[MAX_STATE]) { int stopped; ssize_t ret; @@ -829,14 +829,14 @@ int lxc_cmd_state_server(const char *name, const char *lxcpath, struct lxc_msg msg = {0}; struct lxc_cmd_rr cmd = { .req = { - .cmd = LXC_CMD_STATE_SERVER, + .cmd = LXC_CMD_ADD_STATE_CLIENT, .data = states, .datalen = (sizeof(lxc_state_t) * MAX_STATE) }, }; - /* Lock the whole lxc_cmd_state_server_callback() call to ensure that - * lxc_set_state() doesn't cause us to miss a state. + /* Lock the whole lxc_cmd_add_state_client_callback() call to ensure + * that lxc_set_state() doesn't cause us to miss a state. */ process_lock(); /* Check if already in requested state. */ @@ -912,8 +912,8 @@ again: return msg.value; } -static int lxc_cmd_state_server_callback(int fd, struct lxc_cmd_req *req, - struct lxc_handler *handler) +static int lxc_cmd_add_state_client_callback(int fd, struct lxc_cmd_req *req, + struct lxc_handler *handler) { struct lxc_cmd_rsp rsp = {0}; struct state_client *newclient; @@ -957,17 +957,17 @@ static int lxc_cmd_process(int fd, struct lxc_cmd_req *req, typedef int (*callback)(int, struct lxc_cmd_req *, struct lxc_handler *); callback cb[LXC_CMD_MAX] = { - [LXC_CMD_CONSOLE] = lxc_cmd_console_callback, - [LXC_CMD_CONSOLE_WINCH] = lxc_cmd_console_winch_callback, - [LXC_CMD_STOP] = lxc_cmd_stop_callback, - [LXC_CMD_GET_STATE] = lxc_cmd_get_state_callback, - [LXC_CMD_GET_INIT_PID] = lxc_cmd_get_init_pid_callback, - [LXC_CMD_GET_CLONE_FLAGS] = lxc_cmd_get_clone_flags_callback, - [LXC_CMD_GET_CGROUP] = lxc_cmd_get_cgroup_callback, - [LXC_CMD_GET_CONFIG_ITEM] = lxc_cmd_get_config_item_callback, - [LXC_CMD_GET_NAME] = lxc_cmd_get_name_callback, - [LXC_CMD_GET_LXCPATH] = lxc_cmd_get_lxcpath_callback, - [LXC_CMD_STATE_SERVER] = lxc_cmd_state_server_callback, + [LXC_CMD_CONSOLE] = lxc_cmd_console_callback, + [LXC_CMD_CONSOLE_WINCH] = lxc_cmd_console_winch_callback, + [LXC_CMD_STOP] = lxc_cmd_stop_callback, + [LXC_CMD_GET_STATE] = lxc_cmd_get_state_callback, + [LXC_CMD_GET_INIT_PID] = lxc_cmd_get_init_pid_callback, + [LXC_CMD_GET_CLONE_FLAGS] = lxc_cmd_get_clone_flags_callback, + [LXC_CMD_GET_CGROUP] = lxc_cmd_get_cgroup_callback, + [LXC_CMD_GET_CONFIG_ITEM] = lxc_cmd_get_config_item_callback, + [LXC_CMD_GET_NAME] = lxc_cmd_get_name_callback, + [LXC_CMD_GET_LXCPATH] = lxc_cmd_get_lxcpath_callback, + [LXC_CMD_ADD_STATE_CLIENT] = lxc_cmd_add_state_client_callback, }; if (req->cmd >= LXC_CMD_MAX) { diff --git a/src/lxc/commands.h b/src/lxc/commands.h index 999c08d7d..6b48f69f0 100644 --- a/src/lxc/commands.h +++ b/src/lxc/commands.h @@ -43,7 +43,7 @@ typedef enum { LXC_CMD_GET_CONFIG_ITEM, LXC_CMD_GET_NAME, LXC_CMD_GET_LXCPATH, - LXC_CMD_STATE_SERVER, + LXC_CMD_ADD_STATE_CLIENT, LXC_CMD_MAX, } lxc_cmd_t; @@ -85,8 +85,8 @@ extern char *lxc_cmd_get_lxcpath(const char *hashed_sock); extern pid_t lxc_cmd_get_init_pid(const char *name, const char *lxcpath); extern int lxc_cmd_get_state(const char *name, const char *lxcpath); extern int lxc_cmd_stop(const char *name, const char *lxcpath); -extern int lxc_cmd_state_server(const char *name, const char *lxcpath, - lxc_state_t states[MAX_STATE]); +extern int lxc_cmd_add_state_client(const char *name, const char *lxcpath, + lxc_state_t states[MAX_STATE]); struct lxc_epoll_descr; struct lxc_handler; diff --git a/src/lxc/start.c b/src/lxc/start.c index ad8c9f86d..8291fda12 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -354,7 +354,7 @@ static int lxc_serve_state_clients(const char *name, process_lock(); /* Only set state under process lock held so that we don't cause - * lxc_cmd_state_server() to miss a state. + * lxc_cmd_add_state_client() to miss a state. */ handler->state = state; TRACE("set container state to %s", lxc_state2str(state)); diff --git a/src/lxc/state.c b/src/lxc/state.c index 31c6590ab..cab34d78b 100644 --- a/src/lxc/state.c +++ b/src/lxc/state.c @@ -114,7 +114,7 @@ extern int lxc_wait(const char *lxcname, const char *states, int timeout, if (fillwaitedstates(states, s)) return -1; - state = lxc_cmd_state_server(lxcname, lxcpath, s); + state = lxc_cmd_add_state_client(lxcname, lxcpath, s); if (state < 0) { SYSERROR("failed to receive state from monitor"); return -1;