projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
verify: don't adjust verification length based on interval when unaligned
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 7e6b06d3793ffe6a0db4a186a263c1b144afb579..7b61ffca343a2f2742a92dc31fb53e3440e685c5 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-18,7
+18,7
@@
*
* 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 <unistd.h>
@@
-30,6
+30,10
@@
int main(int argc, char *argv[], char *envp[])
{
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;
@@
-37,15
+41,32
@@
int main(int argc, char *argv[], char *envp[])
#error "No available clock source!"
#endif
#error "No available clock source!"
#endif
+ if (fio_server_create_sk_key())
+ goto done;
+
if (parse_options(argc, argv))
if (parse_options(argc, argv))
- return 1;
+ goto done_key;
+
+ /*
+ * line buffer stdout to avoid output lines from multiple
+ * threads getting mixed
+ */
+ setvbuf(stdout, NULL, _IOLBF, 0);
fio_time_init();
if (nr_clients) {
fio_time_init();
if (nr_clients) {
+ set_genesis_time();
+
if (fio_start_all_clients())
if (fio_start_all_clients())
-
return 1
;
- ret
urn
fio_handle_clients(&fio_client_ops);
+
goto done_key
;
+ ret
=
fio_handle_clients(&fio_client_ops);
} else
} else
- return fio_backend();
+ ret = fio_backend(NULL);
+
+done_key:
+ fio_server_destroy_sk_key();
+done:
+ deinitialize_fio();
+ return ret;
}
}