projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backend: cleanup check for completion/issue byte checking
[fio.git]
/
log.c
diff --git
a/log.c
b/log.c
index 1dacac41f118fdd4678d3c7e0911518f0bab4c88..4eb4af5905c40a45c8df1bd12f4bf02a99ea70a0 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-6,40
+6,45
@@
#include "fio.h"
#include "fio.h"
-
int log_valist(const char *str, va_list args
)
+
size_t log_info_buf(const char *buf, size_t len
)
{
{
+ if (is_backend) {
+ size_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len);
+ if (ret != -1)
+ return ret;
+ }
+
if (log_syslog) {
if (log_syslog) {
-
vsyslog(LOG_INFO, str, args
);
- return
0
;
- } else
{
-
char buffer[1024]
;
- size_t len;
+
syslog(LOG_INFO, "%s", buf
);
+ return
len
;
+ } else
+
return fwrite(buf, len, 1, f_out)
;
+}
- len = vsnprintf(buffer, sizeof(buffer), str, args);
- return fwrite(buffer, 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);
+
+ return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
}
}
-
int log_local
(const char *format, ...)
+
size_t log_info
(const char *format, ...)
{
char buffer[1024];
va_list args;
size_t len;
va_start(args, format);
{
char buffer[1024];
va_list args;
size_t len;
va_start(args, format);
+ len = vsnprintf(buffer, sizeof(buffer), format, args);
+ va_end(args);
- if (log_syslog) {
- vsyslog(LOG_INFO, format, args);
- va_end(args);
- return 0;
- } else {
- len = vsnprintf(buffer, sizeof(buffer), format, args);
- va_end(args);
- return fwrite(buffer, len, 1, f_out);
- }
+ return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
}
}
-
int log_info(
const char *format, ...)
+
size_t __log_buf(struct buf_output *buf,
const char *format, ...)
{
char buffer[1024];
va_list args;
{
char buffer[1024];
va_list args;
@@
-49,13
+54,18
@@
int log_info(const char *format, ...)
len = vsnprintf(buffer, sizeof(buffer), format, args);
va_end(args);
len = vsnprintf(buffer, sizeof(buffer), format, args);
va_end(args);
- if (is_backend)
- return fio_server_text_output(buffer, len);
- else
- return fwrite(buffer, len, 1, f_out);
+ return buf_output_add(buf, buffer, min(len, sizeof(buffer) - 1));
+}
+
+int log_info_flush(void)
+{
+ if (is_backend || log_syslog)
+ return 0;
+
+ return fflush(f_out);
}
}
-
in
t log_err(const char *format, ...)
+
size_
t log_err(const char *format, ...)
{
char buffer[1024];
va_list args;
{
char buffer[1024];
va_list args;
@@
-64,13
+74,35
@@
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) {
+ size_t ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);
+ if (ret != -1)
+ return ret;
+ }
- if (is_backend)
- return fio_server_text_output(buffer, len);
- else {
- if (f_err != stderr)
- fwrite(buffer, len, 1, stderr);
+ 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);
}
}
+
+const char *log_get_level(int level)
+{
+ static const char *levels[] = { "Unknown", "Debug", "Info", "Error",
+ "Unknown" };
+
+ if (level >= FIO_LOG_NR)
+ level = FIO_LOG_NR;
+
+ return levels[level];
+}