projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add __load_ioengine() to separate ioengine loading from td context
[fio.git]
/
log.c
diff --git
a/log.c
b/log.c
index d508267676b7f9d71f609d6ee5bf058c69897ef5..95351d57d96ca4fd0ea97e43d38352f9b7b3dde1 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-6,61
+6,89
@@
#include "fio.h"
#include "fio.h"
+#define LOG_START_SZ 512
+
size_t log_info_buf(const char *buf, size_t len)
{
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) {
+ /*
+ * buf could be NULL (not just "").
+ */
+ if (!buf)
+ return 0;
+
+ if (is_backend) {
+ size_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len);
+ if (ret != -1)
+ return ret;
+ }
+
+ if (log_syslog) {
syslog(LOG_INFO, "%s", buf);
return len;
} else
return fwrite(buf, len, 1, f_out);
}
syslog(LOG_INFO, "%s", buf);
return len;
} else
return fwrite(buf, len, 1, f_out);
}
-s
ize_t log_valist(const char *str, va_list
args)
+s
tatic size_t valist_to_buf(char **buffer, const char *fmt, va_list src_
args)
{
{
- char buffer[1024];
- size_t len;
+ size_t len, cur = LOG_START_SZ;
+ va_list args;
+
+ do {
+ *buffer = calloc(1, cur);
+
+ va_copy(args, src_args);
+ len = vsnprintf(*buffer, cur, fmt, args);
+ va_end(args);
- len = vsnprintf(buffer, sizeof(buffer), str, args);
+ if (len < cur)
+ break;
- return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
+ cur = len + 1;
+ free(*buffer);
+ } while (1);
+
+ return len;
}
}
-size_t log_
local_buf(const char *buf, size_t len
)
+size_t log_
valist(const char *fmt, va_list args
)
{
{
- if (log_syslog)
- syslog(LOG_INFO, "%s", buf);
- else
- len = fwrite(buf, len, 1, f_out);
+ char *buffer;
+ size_t len;
+
+ len = valist_to_buf(&buffer, fmt, args);
+ len = log_info_buf(buffer, len);
+ free(buffer);
return len;
}
size_t log_info(const char *format, ...)
{
return len;
}
size_t log_info(const char *format, ...)
{
- char buffer[1024];
va_list args;
va_list args;
- size_t
len
;
+ size_t
ret
;
va_start(args, format);
va_start(args, format);
-
len = vsnprintf(buffer, sizeof(buffer),
format, args);
+
ret = log_valist(
format, args);
va_end(args);
va_end(args);
- return
log_info_buf(buffer, min(len, sizeof(buffer) - 1))
;
+ return
ret
;
}
size_t __log_buf(struct buf_output *buf, const char *format, ...)
{
}
size_t __log_buf(struct buf_output *buf, const char *format, ...)
{
- char
buffer[1024]
;
+ char
*buffer
;
va_list args;
size_t len;
va_start(args, format);
va_list args;
size_t len;
va_start(args, format);
- len = v
snprintf(buffer, sizeof(buffer)
, format, args);
+ len = v
alist_to_buf(&buffer
, format, args);
va_end(args);
va_end(args);
- return buf_output_add(buf, buffer, min(len, sizeof(buffer) - 1));
+ len = buf_output_add(buf, buffer, len);
+ free(buffer);
+
+ return len;
}
int log_info_flush(void)
}
int log_info_flush(void)
@@
-73,29
+101,33
@@
int log_info_flush(void)
size_t log_err(const char *format, ...)
{
size_t log_err(const char *format, ...)
{
- char buffer[1024];
+ size_t ret, len;
+ char *buffer;
va_list args;
va_list args;
- size_t len;
va_start(args, format);
va_start(args, format);
- len = v
snprintf(buffer, sizeof(buffer)
, format, args);
+ len = v
alist_to_buf(&buffer
, format, args);
va_end(args);
va_end(args);
- len = min(len, sizeof(buffer) - 1);
- if (is_backend)
- return fio_server_text_output(FIO_LOG_ERR, buffer, len);
- else if (log_syslog) {
+ if (is_backend) {
+ ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);
+ if (ret != -1)
+ goto done;
+ }
+
+ if (log_syslog) {
syslog(LOG_INFO, "%s", buffer);
syslog(LOG_INFO, "%s", buffer);
- ret
urn
len;
+ ret
=
len;
} else {
} else {
- if (f_err != stderr) {
- int fio_unused ret;
-
+ if (f_err != stderr)
ret = fwrite(buffer, len, 1, stderr);
ret = fwrite(buffer, len, 1, stderr);
- }
- ret
urn
fwrite(buffer, len, 1, f_err);
+ ret
=
fwrite(buffer, len, 1, f_err);
}
}
+
+done:
+ free(buffer);
+ return ret;
}
const char *log_get_level(int level)
}
const char *log_get_level(int level)