projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iolog: don't serialize the writing of all logs
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index c3996a76c12840e3ab3cf6514e5d5dce611a1077..910f2badbcfda054d8a6f300575093eabb572924 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-24,6
+24,7
@@
#include "profile.h"
#include "server.h"
#include "idletime.h"
#include "profile.h"
#include "server.h"
#include "idletime.h"
+#include "filelock.h"
#include "lib/getopt.h"
#include "lib/strcasestr.h"
#include "lib/getopt.h"
#include "lib/strcasestr.h"
@@
-259,6
+260,7
@@
static void free_shm(void)
}
options_free(fio_options, &def_thread);
}
options_free(fio_options, &def_thread);
+ fio_filelock_exit();
scleanup();
}
scleanup();
}
@@
-1963,11
+1965,8
@@
int parse_cmd_line(int argc, char *argv[], int client_type)
if (do_exit && !(is_backend || nr_clients))
exit(exit_val);
if (do_exit && !(is_backend || nr_clients))
exit(exit_val);
- if (nr_clients && fio_clients_connect()) {
- do_exit++;
- exit_val = 1;
- return -1;
- }
+ if (nr_clients && fio_clients_connect())
+ exit(1);
if (is_backend && backend)
return fio_start_server(pid_file);
if (is_backend && backend)
return fio_start_server(pid_file);