X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=client.c;h=4121ea5f4f17df7a9565570bcbb51816ae0229fb;hp=c8069a0159acb64929be53c75974698d78d5047e;hb=34fbdab48d2399e8d11a6f40353ba00d2edf9151;hpb=3dd29f7c21538c164fcbd078c3f2e532a9193a04 diff --git a/client.c b/client.c index c8069a01..4121ea5f 100644 --- a/client.c +++ b/client.c @@ -1295,6 +1295,7 @@ static int fio_client_handle_iolog(struct fio_client *client, { struct cmd_iolog_pdu *pdu; bool store_direct; + char *log_pathname; pdu = convert_iolog(cmd, &store_direct); if (!pdu) { @@ -1302,15 +1303,27 @@ static int fio_client_handle_iolog(struct fio_client *client, return 1; } + /* allocate buffer big enough for next sprintf() call */ + log_pathname = malloc( 10 + + strlen((char * )pdu->name) + + strlen(client->hostname)); + if (!log_pathname) { + log_err("fio: memory allocation of unique pathname failed"); + return -1; + } + /* generate a unique pathname for the log file using hostname */ + sprintf(log_pathname, "%s.%s", pdu->name, client->hostname); + if (store_direct) { ssize_t ret; size_t sz; int fd; - fd = open((const char *) pdu->name, + fd = open((const char *) log_pathname, O_WRONLY | O_CREAT | O_TRUNC, 0644); if (fd < 0) { - log_err("fio: open log: %s\n", strerror(errno)); + log_err("fio: open log %s: %s\n", + log_pathname, strerror(errno)); return 1; } @@ -1326,10 +1339,10 @@ static int fio_client_handle_iolog(struct fio_client *client, return 0; } else { FILE *f; - - f = fopen((const char *) pdu->name, "w"); + f = fopen((const char *) log_pathname, "w"); if (!f) { - log_err("fio: fopen log: %s\n", strerror(errno)); + log_err("fio: fopen log %s : %s\n", + log_pathname, strerror(errno)); return 1; }