client/server: pass back job options to client

[fio.git] / server.c

diff --git a/server.c b/server.c
index 7dd615fc3c3d97adc400242ee5c6ef28f2b0d1fc..38a6bf8543c71fc3f0d48b743c222d4b03a9fea0 100644 (file)
--- a/server.c
+++ b/server.c
@@ -169,6 +169,27 @@ void sk_out_drop(void)
                pthread_setspecific(sk_out_key, NULL);
 }
 
+static void __fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
+                              uint32_t pdu_len, uint64_t tag)
+{
+       memset(cmd, 0, sizeof(*cmd));
+
+       cmd->version    = __cpu_to_le16(FIO_SERVER_VER);
+       cmd->opcode     = cpu_to_le16(opcode);
+       cmd->tag        = cpu_to_le64(tag);
+       cmd->pdu_len    = cpu_to_le32(pdu_len);
+}
+
+
+static void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
+                            const void *pdu, uint32_t pdu_len, uint64_t tag)
+{
+       __fio_init_net_cmd(cmd, opcode, pdu_len, tag);
+
+       if (pdu)
+               memcpy(&cmd->payload, pdu, pdu_len);
+}
+
 const char *fio_server_op(unsigned int op)
 {
        static char buf[32];
@@ -228,7 +249,7 @@ static int fio_sendv_data(int sk, struct iovec *iov, int count)
        return 1;
 }
 
-int fio_send_data(int sk, const void *p, unsigned int len)
+static int fio_send_data(int sk, const void *p, unsigned int len)
 {
        struct iovec iov = { .iov_base = (void *) p, .iov_len = len };
 
@@ -237,7 +258,7 @@ int fio_send_data(int sk, const void *p, unsigned int len)
        return fio_sendv_data(sk, &iov, 1);
 }
 
-int fio_recv_data(int sk, void *p, unsigned int len)
+static int fio_recv_data(int sk, void *p, unsigned int len)
 {
        do {
                int ret = recv(sk, p, len, MSG_WAITALL);
@@ -429,7 +450,7 @@ static void free_reply(uint64_t tag)
        free(reply);
 }
 
-void fio_net_cmd_crc_pdu(struct fio_net_cmd *cmd, const void *pdu)
+static void fio_net_cmd_crc_pdu(struct fio_net_cmd *cmd, const void *pdu)
 {
        uint32_t pdu_len;
 
@@ -439,7 +460,7 @@ void fio_net_cmd_crc_pdu(struct fio_net_cmd *cmd, const void *pdu)
        cmd->pdu_crc16 = __cpu_to_le16(fio_crc16(pdu, pdu_len));
 }
 
-void fio_net_cmd_crc(struct fio_net_cmd *cmd)
+static void fio_net_cmd_crc(struct fio_net_cmd *cmd)
 {
        fio_net_cmd_crc_pdu(cmd, cmd->payload);
 }
@@ -496,8 +517,8 @@ int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size,
        return ret;
 }
 
-struct sk_entry *fio_net_prep_cmd(uint16_t opcode, void *buf, off_t size,
-                                 uint64_t *tagptr, int flags)
+static struct sk_entry *fio_net_prep_cmd(uint16_t opcode, void *buf, off_t size,
+                                        uint64_t *tagptr, int flags)
 {
        struct sk_entry *entry;
 
@@ -1201,7 +1222,7 @@ static int handle_connection(struct sk_out *sk_out)
 /* get the address on this host bound by the input socket, 
  * whether it is ipv6 or ipv4 */
 
-int get_my_addr_str(int sk)
+static int get_my_addr_str(int sk)
 {
        struct sockaddr_in6 myaddr6 = { 0, };
        struct sockaddr_in myaddr4 = { 0, };
@@ -1235,7 +1256,7 @@ int get_my_addr_str(int sk)
        return 0;
 }
 
-static int accept_loop(struct sk_out *sk_out, int listen_sk)
+static int accept_loop(int listen_sk)
 {
        struct sockaddr_in addr;
        struct sockaddr_in6 addr6;
@@ -1249,6 +1270,7 @@ static int accept_loop(struct sk_out *sk_out, int listen_sk)
        fio_set_fd_nonblocking(listen_sk, "server");
 
        while (!exit_backend) {
+               struct sk_out *sk_out;
                const char *from;
                char buf[64];
                pid_t pid;
@@ -1490,6 +1512,34 @@ void fio_server_send_gs(struct group_run_stats *rs)
        fio_net_queue_cmd(FIO_NET_CMD_GS, &gs, sizeof(gs), NULL, SK_F_COPY);
 }
 
+void fio_server_send_job_options(struct flist_head *opt_list,
+                                unsigned int groupid)
+{
+       struct cmd_job_option pdu;
+       struct flist_head *entry;
+
+       if (flist_empty(opt_list))
+               return;
+
+       flist_for_each(entry, opt_list) {
+               struct print_option *p;
+
+               p = flist_entry(entry, struct print_option, list);
+               memset(&pdu, 0, sizeof(pdu));
+               if (groupid == -1U) {
+                       pdu.global = __cpu_to_le16(1);
+                       pdu.groupid = 0;
+               } else {
+                       pdu.global = 0;
+                       pdu.groupid = __cpu_to_le16(groupid);
+               }
+               memcpy(pdu.name, p->name, strlen(p->name));
+               if (p->value)
+                       memcpy(pdu.value, p->value, strlen(p->value));
+               fio_net_queue_cmd(FIO_NET_CMD_JOB_OPT, &pdu, sizeof(pdu), NULL, SK_F_COPY);
+       }
+}
+
 static void convert_agg(struct disk_util_agg *dst, struct disk_util_agg *src)
 {
        int i;
@@ -1867,7 +1917,7 @@ static int fio_init_server_connection(void)
 
        log_info("fio: server listening on %s\n", bind_str);
 
-       if (listen(sk, 0) < 0) {
+       if (listen(sk, 4) < 0) {
                log_err("fio: listen: %s\n", strerror(errno));
                close(sk);
                return -1;
@@ -2060,9 +2110,15 @@ static void set_sig_handlers(void)
 
 static int fio_server(void)
 {
-       struct sk_out *sk_out;
        int sk, ret;
 
+       if (pthread_key_create(&sk_out_key, NULL)) {
+               log_err("fio: can't create sk_out backend key\n");
+               return -1;
+       }
+
+       pthread_setspecific(sk_out_key, NULL);
+
        dprint(FD_NET, "starting server\n");
 
        if (fio_handle_server_arg())
@@ -2074,10 +2130,7 @@ static int fio_server(void)
 
        set_sig_handlers();
 
-       if (pthread_key_create(&sk_out_key, NULL))
-               log_err("fio: can't create sk_out backend key\n");
-
-       ret = accept_loop(sk_out, sk);
+       ret = accept_loop(sk);
 
        close(sk);