projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: always end back ETA reply
[fio.git]
/
log.c
diff --git
a/log.c
b/log.c
index e3ca29cd2c388f1c861e1663599f39acebad650c..d508267676b7f9d71f609d6ee5bf058c69897ef5 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-6,22
+6,25
@@
#include "fio.h"
#include "fio.h"
+size_t log_info_buf(const char *buf, size_t len)
+{
+ if (is_backend)
+ return fio_server_text_output(FIO_LOG_INFO, buf, len);
+ else if (log_syslog) {
+ syslog(LOG_INFO, "%s", buf);
+ return len;
+ } else
+ return fwrite(buf, len, 1, f_out);
+}
+
size_t log_valist(const char *str, va_list args)
{
char buffer[1024];
size_t len;
len = vsnprintf(buffer, sizeof(buffer), str, args);
size_t log_valist(const char *str, va_list args)
{
char buffer[1024];
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
- len = fwrite(buffer, len, 1, f_out);
- return l
en
;
+ return l
og_info_buf(buffer, min(len, sizeof(buffer) - 1))
;
}
size_t log_local_buf(const char *buf, size_t len)
}
size_t log_local_buf(const char *buf, size_t len)
@@
-43,15
+46,8
@@
size_t 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(FIO_LOG_INFO, buffer, len);
- else if (log_syslog) {
- syslog(LOG_INFO, "%s", buffer);
- return len;
- } else
- return fwrite(buffer, len, 1, f_out);
+ return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
}
size_t __log_buf(struct buf_output *buf, const char *format, ...)
}
size_t __log_buf(struct buf_output *buf, const char *format, ...)
@@
-63,9
+59,8
@@
size_t __log_buf(struct buf_output *buf, 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);
- return buf_output_add(buf, buffer,
len
);
+ return buf_output_add(buf, buffer,
min(len, sizeof(buffer) - 1)
);
}
int log_info_flush(void)
}
int log_info_flush(void)