projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: initialize first iolog header properly
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 44354e289ee873dc52eeffca2385ee76a1d5db85..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>
@@
-32,6
+32,8
@@
int main(int argc, char *argv[], char *envp[])
{
int ret = 1;
{
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;
@@
-43,7
+45,7
@@
int main(int argc, char *argv[], char *envp[])
goto done;
if (parse_options(argc, argv))
goto done;
if (parse_options(argc, argv))
- goto done;
+ goto done
_key
;
/*
* line buffer stdout to avoid output lines from multiple
/*
* line buffer stdout to avoid output lines from multiple
@@
-57,11
+59,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;