server: write pid file for backgrounded server to specified file

[fio.git] / server.c

diff --git a/server.c b/server.c
index 5afd8d455f72c3178f9b9560719bd8e982cfca31..2de65ad27371de8af4d38baf9205ff624c223a27 100644 (file)
--- a/server.c
+++ b/server.c
@@ -208,8 +208,8 @@ void fio_net_cmd_crc(struct fio_net_cmd *cmd)
 int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size,
                     uint64_t tag)
 {
-       struct fio_net_cmd *cmd;
-       size_t this_len;
+       struct fio_net_cmd *cmd = NULL;
+       size_t this_len, cur_len = 0;
        int ret;
 
        do {
@@ -217,7 +217,13 @@ int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size,
                if (this_len > FIO_SERVER_MAX_PDU)
                        this_len = FIO_SERVER_MAX_PDU;
 
-               cmd = malloc(sizeof(*cmd) + this_len);
+               if (!cmd || cur_len < sizeof(*cmd) + this_len) {
+                       if (cmd)
+                               free(cmd);
+
+                       cur_len = sizeof(*cmd) + this_len;
+                       cmd = malloc(cur_len);
+               }
 
                fio_init_net_cmd(cmd, opcode, buf, this_len, tag);
 
@@ -227,11 +233,13 @@ int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size,
                fio_net_cmd_crc(cmd);
 
                ret = fio_send_data(fd, cmd, sizeof(*cmd) + this_len);
-               free(cmd);
                size -= this_len;
                buf += this_len;
        } while (!ret && size);
 
+       if (cmd)
+               free(cmd);
+
        return ret;
 }
 
@@ -332,13 +340,11 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
 {
        struct jobs_eta *je;
        size_t size;
-       void *buf;
        int i;
 
        size = sizeof(*je) + thread_number * sizeof(char);
-       buf = malloc(size);
-       memset(buf, 0, size);
-       je = buf;
+       je = malloc(size);
+       memset(je, 0, size);
 
        if (!calc_thread_status(je, 1)) {
                free(je);
@@ -364,7 +370,7 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
        je->elapsed_sec         = cpu_to_le32(je->nr_running);
        je->eta_sec             = cpu_to_le64(je->eta_sec);
 
-       fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, buf, size, cmd->tag);
+       fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, cmd->tag);
        free(je);
        return 0;
 }
@@ -373,7 +379,7 @@ static int handle_command(struct fio_net_cmd *cmd)
 {
        int ret;
 
-       dprint(FD_NET, "server: got opcode %d\n", cmd->opcode);
+       dprint(FD_NET, "server: got opcode %d, pdu=%u\n", cmd->opcode, cmd->pdu_len);
 
        switch (cmd->opcode) {
        case FIO_NET_CMD_QUIT:
@@ -918,22 +924,42 @@ static void server_signal_handler(void)
        sigaction(SIGTERM, &act, NULL);
 }
 
-int fio_start_server(int daemonize)
+static void write_pid(pid_t pid, const char *pidfile)
+{
+       FILE *fpid;
+
+       fpid = fopen(pidfile, "w");
+       if (!fpid) {
+               log_err("fio: failed opening pid file %s\n", pidfile);
+               return;
+       }
+
+       fprintf(fpid, "%u\n", (unsigned int) pid);
+}
+
+/*
+ * If pidfile is specified, background us.
+ */
+int fio_start_server(char *pidfile)
 {
        pid_t pid;
+       int ret;
 
        server_signal_handler();
 
-       if (!daemonize)
+       if (!pidfile)
                return fio_server();
 
        openlog("fio", LOG_NDELAY|LOG_NOWAIT|LOG_PID, LOG_USER);
        pid = fork();
        if (pid < 0) {
                syslog(LOG_ERR, "failed server fork");
+               free(pidfile);
                return -1;
-       } else if (pid)
+       } else if (pid) {
+               write_pid(pid, pidfile);
                exit(0);
+       }
 
        setsid();
        close(STDIN_FILENO);
@@ -942,7 +968,13 @@ int fio_start_server(int daemonize)
        f_out = NULL;
        f_err = NULL;
        log_syslog = 1;
-       return fio_server();
+
+       ret = fio_server();
+
+       closelog();
+       unlink(pidfile);
+       free(pidfile);
+       return ret;
 }
 
 void fio_server_set_arg(const char *arg)