The following changes since commit c656b9056e45f9acd1d374a85c5becf7cc6a00ca: Merge branch 'doc_fixes' of https://github.com/sitsofe/fio (2019-10-24 12:04:09 -0600) are available in the Git repository at: git://git.kernel.dk/fio.git master for you to fetch changes up to 8c302eb9706963e07d6d79998e15bede77b94520: Merge branch 'patch-1' of https://github.com/hannesweisbach/fio (2019-10-29 13:39:14 -0600) ---------------------------------------------------------------- Jens Axboe (2): Merge branch '1029_tet' of https://github.com/optimistyzy/fio Merge branch 'patch-1' of https://github.com/hannesweisbach/fio Ziye Yang (1): backend: fix the memory leak if fio_memalign fails, hannesweisbach (1): Fix output redirection of exec_prerun/_postrun backend.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- Diff of recent changes: diff --git a/backend.c b/backend.c index fe868271..1c339408 100644 --- a/backend.c +++ b/backend.c @@ -1236,7 +1236,7 @@ static int init_io_u(struct thread_data *td) ptr = fio_memalign(cl_align, sizeof(*io_u), td_offload_overlap(td)); if (!ptr) { log_err("fio: unable to allocate aligned memory\n"); - break; + return 1; } io_u = ptr; @@ -1469,12 +1469,12 @@ static bool keep_running(struct thread_data *td) static int exec_string(struct thread_options *o, const char *string, const char *mode) { - size_t newlen = strlen(string) + strlen(o->name) + strlen(mode) + 9 + 1; + size_t newlen = strlen(string) + strlen(o->name) + strlen(mode) + 13 + 1; int ret; char *str; str = malloc(newlen); - sprintf(str, "%s &> %s.%s.txt", string, o->name, mode); + sprintf(str, "%s > %s.%s.txt 2>&1", string, o->name, mode); log_info("%s : Saving output of %s in %s.%s.txt\n",o->name, mode, o->name, mode); ret = system(str);
