The following changes since commit e57758c12bdb24885e32ba143a04fcc8f98565ca: Merge branch 'fiopr_compressfixes' of https://github.com/PCPartPicker/fio (2022-09-01 12:03:23 -0600) are available in the Git repository at: git://git.kernel.dk/fio.git master for you to fetch changes up to 0b2c736174402afc742a7ed97c37f872fa93ee25: Merge branch 'fiopr_windows_log_compression_storage_fixes' of https://github.com/PCPartPicker/fio (2022-09-02 17:29:45 -0600) ---------------------------------------------------------------- Jens Axboe (1): Merge branch 'fiopr_windows_log_compression_storage_fixes' of https://github.com/PCPartPicker/fio aggieNick02 (1): Fix log compression storage on windows iolog.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) --- Diff of recent changes: diff --git a/iolog.c b/iolog.c index 41d3e473..aa9c3bb1 100644 --- a/iolog.c +++ b/iolog.c @@ -1218,7 +1218,7 @@ int iolog_file_inflate(const char *file) void *buf; FILE *f; - f = fopen(file, "r"); + f = fopen(file, "rb"); if (!f) { perror("fopen"); return 1; @@ -1300,10 +1300,21 @@ void flush_log(struct io_log *log, bool do_append) void *buf; FILE *f; + /* + * If log_gz_store is true, we are writing a binary file. + * Set the mode appropriately (on all platforms) to avoid issues + * on windows (line-ending conversions, etc.) + */ if (!do_append) - f = fopen(log->filename, "w"); + if (log->log_gz_store) + f = fopen(log->filename, "wb"); + else + f = fopen(log->filename, "w"); else - f = fopen(log->filename, "a"); + if (log->log_gz_store) + f = fopen(log->filename, "ab"); + else + f = fopen(log->filename, "a"); if (!f) { perror("fopen log"); return;
