X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=a05a7ec5d3f28f2bc2fd67b08fa8afc132585da4;hp=a26dee8775cb751eb786cb562cfafbcf4decdca5;hb=03a0825286c82d79b8d489faf33a76d50713474b;hpb=c41a9d06a1957ba7c5a019e3d6088a5e8e8e0a47 diff --git a/log.c b/log.c index a26dee87..a05a7ec5 100644 --- a/log.c +++ b/log.c @@ -12,7 +12,10 @@ int log_valist(const char *str, va_list args) size_t len; len = vsnprintf(buffer, sizeof(buffer), str, args); + len = min(len, sizeof(buffer) - 1); + if (is_backend) + len = fio_server_text_output(FIO_LOG_INFO, buffer, len); if (log_syslog) syslog(LOG_INFO, "%s", buffer); else @@ -40,6 +43,7 @@ int log_local(const char *format, ...) va_start(args, format); len = vsnprintf(buffer, sizeof(buffer), format, args); va_end(args); + len = min(len, sizeof(buffer) - 1); if (log_syslog) syslog(LOG_INFO, "%s", buffer); @@ -58,6 +62,7 @@ int log_info(const char *format, ...) va_start(args, format); len = vsnprintf(buffer, sizeof(buffer), format, args); va_end(args); + len = min(len, sizeof(buffer) - 1); if (is_backend) return fio_server_text_output(FIO_LOG_INFO, buffer, len); @@ -68,6 +73,14 @@ int log_info(const char *format, ...) return fwrite(buffer, len, 1, f_out); } +int log_info_flush(void) +{ + if (is_backend || log_syslog) + return 0; + + return fflush(f_out); +} + int log_err(const char *format, ...) { char buffer[1024]; @@ -77,6 +90,7 @@ int log_err(const char *format, ...) va_start(args, format); len = vsnprintf(buffer, sizeof(buffer), format, args); va_end(args); + len = min(len, sizeof(buffer) - 1); if (is_backend) return fio_server_text_output(FIO_LOG_ERR, buffer, len);