X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=e8fef21edf567e645fef1d95a5cc83c532ba9d7b;hb=fddc6604f91ebf76d9090741f9d4f5a4d33be0c6;hp=e2f7baba5cba40fd1d276f0462156d8b985c7593;hpb=fa2ea806de0d6410320abd97599bc52f5a3e72cc;p=fio.git diff --git a/init.c b/init.c index e2f7baba..e8fef21e 100644 --- a/init.c +++ b/init.c @@ -194,7 +194,7 @@ static struct option l_opts[FIO_NR_OPTIONS] = { .val = 'S', }, { .name = (char *) "daemonize", - .has_arg = no_argument, + .has_arg = required_argument, .val = 'D', }, { @@ -1121,7 +1121,8 @@ 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--client=hostname Talk to remove backend fio server at hostname\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 "); printf("\n Jens Axboe \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; - int daemonize_server = 0; + void *pid_file = NULL; void *cur_client = NULL; int backend = 0; @@ -1408,7 +1409,7 @@ int parse_cmd_line(int argc, char *argv[]) backend = 1; break; case 'D': - daemonize_server = 1; + pid_file = strdup(optarg); break; case 'C': if (is_backend) { @@ -1445,7 +1446,7 @@ int parse_cmd_line(int argc, char *argv[]) } if (is_backend && backend) - return fio_start_server(daemonize_server); + return fio_start_server(pid_file); if (td) { if (!ret)