projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix zones for numjobs=x, where x > 1
[fio.git]
/
log.c
diff --git
a/log.c
b/log.c
index ec3ebce49e2065423c7ebefa54bc28b4dd7a25f7..08509b32b0150f85a55d76c38776d00d856be159 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-12,6
+12,7
@@
int log_valist(const char *str, va_list args)
size_t len;
len = vsnprintf(buffer, sizeof(buffer), str, args);
size_t len;
len = vsnprintf(buffer, sizeof(buffer), str, args);
+ len = min(len, sizeof(buffer) - 1);
if (log_syslog)
syslog(LOG_INFO, "%s", buffer);
if (log_syslog)
syslog(LOG_INFO, "%s", buffer);
@@
-21,6
+22,16
@@
int log_valist(const char *str, va_list args)
return len;
}
return len;
}
+int log_local_buf(const char *buf, size_t len)
+{
+ if (log_syslog)
+ syslog(LOG_INFO, "%s", buf);
+ else
+ len = fwrite(buf, len, 1, f_out);
+
+ return len;
+}
+
int log_local(const char *format, ...)
{
char buffer[1024];
int log_local(const char *format, ...)
{
char buffer[1024];
@@
-30,6
+41,7
@@
int log_local(const char *format, ...)
va_start(args, format);
len = vsnprintf(buffer, sizeof(buffer), format, args);
va_end(args);
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);
if (log_syslog)
syslog(LOG_INFO, "%s", buffer);
@@
-48,10
+60,14
@@
int log_info(const char *format, ...)
va_start(args, format);
len = vsnprintf(buffer, sizeof(buffer), format, args);
va_end(args);
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(buffer, len);
if (is_backend)
return fio_server_text_output(buffer, len);
- else
+ else if (log_syslog) {
+ syslog(LOG_INFO, "%s", buffer);
+ return len;
+ } else
return fwrite(buffer, len, 1, f_out);
}
return fwrite(buffer, len, 1, f_out);
}
@@
-64,12
+80,19
@@
int log_err(const char *format, ...)
va_start(args, format);
len = vsnprintf(buffer, sizeof(buffer), format, args);
va_end(args);
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(buffer, len);
if (is_backend)
return fio_server_text_output(buffer, len);
- else {
- if (f_err != stderr)
- fwrite(buffer, len, 1, stderr);
+ else if (log_syslog) {
+ syslog(LOG_INFO, "%s", buffer);
+ return len;
+ } else {
+ if (f_err != stderr) {
+ int fio_unused ret;
+
+ ret = fwrite(buffer, len, 1, stderr);
+ }
return fwrite(buffer, len, 1, f_err);
}
return fwrite(buffer, len, 1, f_err);
}