RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

client: factor out connect request

This commit is contained in:
Thomas Schoebel-Theuer 2020-09-09 13:58:27 +02:00
parent c73ae07c6c
commit 1577438477
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
kernel/mars_client.c
View File

@ -218,6 +218,33 @@ void _maintain_bundle(struct client_bundle *bundle)
}
}
static
int _request_connect(struct client_channel *ch, const char *path)
{
struct mars_cmd cmd = {
.cmd_code = CMD_CONNECT,
.cmd_str1 = path,
};
int status;
status = mars_send_cmd(&ch->socket, &cmd, false);
MARS_DBG("send CMD_CONNECT status = %d\n", status);
return status;
}
static
int _request_info(struct client_channel *ch)
{
struct mars_cmd cmd = {
.cmd_code = CMD_GETINFO,
};
int status;
status = mars_send_cmd(&ch->socket, &cmd, false);
MARS_DBG("send CMD_GETINFO status = %d\n", status);
return status;
}
static
struct client_channel *_get_channel(struct client_bundle *bundle, int min_channel, int max_channel)
{
@ -295,12 +322,9 @@ struct client_channel *_get_channel(struct client_bundle *bundle, int min_channe
// send initial connect command
if (unlikely(!res->is_connected)) {
struct mars_cmd cmd = {
.cmd_code = CMD_CONNECT,
.cmd_str1 = bundle->path,
};
int status = mars_send_cmd(&res->socket, &cmd, false);
MARS_DBG("send CMD_CONNECT status = %d\n", status);
int status;
status = _request_connect(res, bundle->path);
if (unlikely(status < 0)) {
MARS_WRN("connect '%s' @%s on channel %d failed, status = %d\n",
bundle->path,
@ -321,23 +345,6 @@ found:
return res;
}
static
int _request_info(struct client_channel *ch)
{
struct mars_cmd cmd = {
.cmd_code = CMD_GETINFO,
};
int status;
MARS_DBG("\n");
status = mars_send_cmd(&ch->socket, &cmd, false);
MARS_DBG("send CMD_GETINFO status = %d\n", status);
if (unlikely(status < 0)) {
MARS_DBG("send of getinfo failed, status = %d\n", status);
}
return status;
}
static int sender_thread(void *data);
static

2
kernel/mars_client.h
View File

@ -100,9 +100,9 @@ struct client_output {
MARS_OUTPUT(client);
struct mutex mutex;
struct list_head mref_list;
int last_id;
struct client_bundle bundle;
struct mars_info info;
int last_id;
bool get_info;
bool got_info;
struct list_head *hash_table;