server: write pid file for backgrounded server to specified file

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/init.c b/init.c
index f25bbe657374dc3e965af366e9c4dd794c1de663..e8fef21edf567e645fef1d95a5cc83c532ba9d7b 100644 (file)
--- a/init.c
+++ b/init.c
@@ -194,7 +194,7 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
                .val            = 'S',
        },
        {       .name           = (char *) "daemonize",
                .val            = 'S',
        },
        {       .name           = (char *) "daemonize",

-               .has_arg        = no_argument,
+               .has_arg        = required_argument,

                .val            = 'D',
        },
        {
                .val            = 'D',
        },
        {


@@ -1121,6 +1121,7 @@ static void usage(const char *name)
        printf("\t--warnings-fatal Fio parser warnings are fatal\n");
        printf("\t--max-jobs\tMaximum number of threads/processes to support\n");
        printf("\t--server=args\tStart a backend fio server\n");
        printf("\t--warnings-fatal Fio parser warnings are fatal\n");
        printf("\t--max-jobs\tMaximum number of threads/processes to support\n");
        printf("\t--server=args\tStart a backend fio server\n");

+       printf("\t--daemonize=pidfile Background fio server, write pid to file\n");

        printf("\t--client=hostname Talk to remote backend fio server at hostname\n");
        printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>");
        printf("\n                   Jens Axboe <jaxboe@fusionio.com>\n");
        printf("\t--client=hostname Talk to remote backend fio server at hostname\n");
        printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>");
        printf("\n                   Jens Axboe <jaxboe@fusionio.com>\n");


@@ -1253,7 +1254,7 @@ int parse_cmd_line(int argc, char *argv[])
        struct thread_data *td = NULL;
        int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0;
        char *ostr = cmd_optstr;
        struct thread_data *td = NULL;
        int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0;
        char *ostr = cmd_optstr;

-       int daemonize_server = 0;
+       void *pid_file = NULL;

        void *cur_client = NULL;
        int backend = 0;
 
        void *cur_client = NULL;
        int backend = 0;
 


@@ -1408,7 +1409,7 @@ int parse_cmd_line(int argc, char *argv[])
                        backend = 1;
                        break;
                case 'D':
                        backend = 1;
                        break;
                case 'D':

-                       daemonize_server = 1;
+                       pid_file = strdup(optarg);

                        break;
                case 'C':
                        if (is_backend) {
                        break;
                case 'C':
                        if (is_backend) {


@@ -1445,7 +1446,7 @@ int parse_cmd_line(int argc, char *argv[])
        }
 
        if (is_backend && backend)
        }
 
        if (is_backend && backend)

-               return fio_start_server(daemonize_server);
+               return fio_start_server(pid_file);

 
        if (td) {
                if (!ret)
 
        if (td) {
                if (!ret)

diff --git a/server.c b/server.c
index cf3a48ef25058288f698cab03471d5810a91ab71..2de65ad27371de8af4d38baf9205ff624c223a27 100644 (file)
--- a/server.c
+++ b/server.c
@@ -924,22 +924,42 @@ static void server_signal_handler(void)
        sigaction(SIGTERM, &act, NULL);
 }
 
        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;
 {
        pid_t pid;

+       int ret;

 
        server_signal_handler();
 
 
        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");
                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;
                return -1;

-       } else if (pid)
+       } else if (pid) {
+               write_pid(pid, pidfile);

                exit(0);
                exit(0);

+       }

 
        setsid();
        close(STDIN_FILENO);
 
        setsid();
        close(STDIN_FILENO);


@@ -948,7 +968,13 @@ int fio_start_server(int daemonize)
        f_out = NULL;
        f_err = NULL;
        log_syslog = 1;
        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)
 }
 
 void fio_server_set_arg(const char *arg)

diff --git a/server.h b/server.h
index 9f7eeaecc1340f3adc5fe9e90711eff59c714c34..72e4cc888dc8ff9649da36cfe0bb9752d7ec6d86 100644 (file)
--- a/server.h
+++ b/server.h
@@ -75,7 +75,7 @@ struct cmd_line_pdu {
        struct cmd_single_line_pdu options[0];
 };
 
        struct cmd_single_line_pdu options[0];
 };
 

-extern int fio_start_server(int);
+extern int fio_start_server(char *);

 extern int fio_server_text_output(const char *, unsigned int len);
 extern int fio_server_log(const char *format, ...);
 extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t);
 extern int fio_server_text_output(const char *, unsigned int len);
 extern int fio_server_log(const char *format, ...);
 extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t);