projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'samples-colnames' of https://github.com/parallel-fs-utils/fio
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index bd3e260b40cfd575030c3276e247f8f4f28ec0f0..f19db1be6f024b0a0420f8a298eca863851a01e4 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-18,20
+18,17
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 5
9 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
*
*/
-#include <unistd.h>
-#include <locale.h>
-#include <time.h>
-
#include "fio.h"
#include "fio.h"
-#include "smalloc.h"
int main(int argc, char *argv[], char *envp[])
{
int ret = 1;
int main(int argc, char *argv[], char *envp[])
{
int ret = 1;
+ compiletime_assert(TD_NR <= TD_ENG_FLAG_SHIFT, "TD_ENG_FLAG_SHIFT");
+
if (initialize_fio(envp))
return 1;
if (initialize_fio(envp))
return 1;
@@
-39,9
+36,12
@@
int main(int argc, char *argv[], char *envp[])
#error "No available clock source!"
#endif
#error "No available clock source!"
#endif
- if (
parse_options(argc, argv
))
+ if (
fio_server_create_sk_key(
))
goto done;
goto done;
+ if (parse_options(argc, argv))
+ goto done_key;
+
/*
* line buffer stdout to avoid output lines from multiple
* threads getting mixed
/*
* line buffer stdout to avoid output lines from multiple
* threads getting mixed
@@
-54,11
+54,13
@@
int main(int argc, char *argv[], char *envp[])
set_genesis_time();
if (fio_start_all_clients())
set_genesis_time();
if (fio_start_all_clients())
- goto done;
+ goto done
_key
;
ret = fio_handle_clients(&fio_client_ops);
} else
ret = fio_backend(NULL);
ret = fio_handle_clients(&fio_client_ops);
} else
ret = fio_backend(NULL);
+done_key:
+ fio_server_destroy_sk_key();
done:
deinitialize_fio();
return ret;
done:
deinitialize_fio();
return ret;