X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=log.c;h=9669b4a7c336eb510a510679c7933d9e96c45bd1;hb=10aa136b;hp=42aedf270ff0882c56de0f13b78614f1c88bfff6;hpb=6796209a7e3d39522b0f5599aba277809786335e;p=fio.git

diff --git a/log.c b/log.c
index 42aedf27..c4a3b520 100644
--- a/log.c
+++ b/log.c
@@ -1,162 +1,101 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "list.h"
-#include "fio.h"
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdarg.h>
+#include <syslog.h>
 
-void write_iolog_put(struct thread_data *td, struct io_u *io_u)
-{
-	fprintf(td->iolog_f, "%d,%llu,%u\n", io_u->ddir, io_u->offset, io_u->buflen);
-}
+#include "fio.h"
 
-int read_iolog_get(struct thread_data *td, struct io_u *io_u)
+int log_valist(const char *str, va_list args)
 {
-	struct io_piece *ipo;
-
-	if (!list_empty(&td->io_log_list)) {
-		ipo = list_entry(td->io_log_list.next, struct io_piece, list);
-		list_del(&ipo->list);
-		io_u->offset = ipo->offset;
-		io_u->buflen = ipo->len;
-		io_u->ddir = ipo->ddir;
-		free(ipo);
-		return 0;
-	}
+	char buffer[1024];
+	size_t len;
 
-	return 1;
-}
+	len = vsnprintf(buffer, sizeof(buffer), str, args);
+	len = min(len, sizeof(buffer) - 1);
 
-void prune_io_piece_log(struct thread_data *td)
-{
-	struct io_piece *ipo;
-
-	while (!list_empty(&td->io_hist_list)) {
-		ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
+	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);
 
-		list_del(&ipo->list);
-		free(ipo);
-	}
+	return len;
 }
 
-/*
- * log a succesful write, so we can unwind the log for verify
- */
-void log_io_piece(struct thread_data *td, struct io_u *io_u)
+int log_local_buf(const char *buf, size_t len)
 {
-	struct io_piece *ipo = malloc(sizeof(struct io_piece));
-	struct list_head *entry;
-
-	INIT_LIST_HEAD(&ipo->list);
-	ipo->offset = io_u->offset;
-	ipo->len = io_u->buflen;
-
-	/*
-	 * for random io where the writes extend the file, it will typically
-	 * be laid out with the block scattered as written. it's faster to
-	 * read them in in that order again, so don't sort
-	 */
-	if (td->sequential || !td->overwrite) {
-		list_add_tail(&ipo->list, &td->io_hist_list);
-		return;
-	}
-
-	/*
-	 * for random io, sort the list so verify will run faster
-	 */
-	entry = &td->io_hist_list;
-	while ((entry = entry->prev) != &td->io_hist_list) {
-		struct io_piece *__ipo = list_entry(entry, struct io_piece, list);
-
-		if (__ipo->offset < ipo->offset)
-			break;
-	}
+	if (log_syslog)
+		syslog(LOG_INFO, "%s", buf);
+	else
+		len = fwrite(buf, len, 1, f_out);
 
-	list_add(&ipo->list, entry);
+	return len;
 }
 
-void write_iolog_close(struct thread_data *td)
+int log_info(const char *format, ...)
 {
-	fflush(td->iolog_f);
-	fclose(td->iolog_f);
-	free(td->iolog_buf);
+	char buffer[1024];
+	va_list args;
+	size_t len;
+
+	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);
 }
 
-int init_iolog(struct thread_data *td)
+int log_info_flush(void)
 {
-	unsigned long long offset;
-	unsigned int bytes;
-	char *str, *p;
-	FILE *f;
-	int rw, i, reads, writes;
-
-	if (!td->read_iolog && !td->write_iolog)
+	if (is_backend || log_syslog)
 		return 0;
 
-	if (td->read_iolog)
-		f = fopen(td->iolog_file, "r");
-	else
-		f = fopen(td->iolog_file, "w");
-
-	if (!f) {
-		perror("fopen iolog");
-		printf("file %s, %d/%d\n", td->iolog_file, td->read_iolog, td->write_iolog);
-		return 1;
-	}
-
-	/*
-	 * That's it for writing, setup a log buffer and we're done.
-	  */
-	if (td->write_iolog) {
-		td->iolog_f = f;
-		td->iolog_buf = malloc(8192);
-		setvbuf(f, td->iolog_buf, _IOFBF, 8192);
-		return 0;
-	}
+	return fflush(f_out);
+}
 
-	/*
-	 * Read in the read iolog and store it, reuse the infrastructure
-	 * for doing verifications.
-	 */
-	str = malloc(4096);
-	reads = writes = i = 0;
-	while ((p = fgets(str, 4096, f)) != NULL) {
-		struct io_piece *ipo;
-
-		if (sscanf(p, "%d,%llu,%u", &rw, &offset, &bytes) != 3) {
-			fprintf(stderr, "bad iolog: %s\n", p);
-			continue;
-		}
-		if (rw == DDIR_READ)
-			reads++;
-		else if (rw == DDIR_WRITE)
-			writes++;
-		else {
-			fprintf(stderr, "bad ddir: %d\n", rw);
-			continue;
+int log_err(const char *format, ...)
+{
+	char buffer[1024];
+	va_list args;
+	size_t len;
+
+	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);
+	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);
 		}
 
-		ipo = malloc(sizeof(*ipo));
-		INIT_LIST_HEAD(&ipo->list);
-		ipo->offset = offset;
-		ipo->len = bytes;
-		if (bytes > td->max_bs)
-			td->max_bs = bytes;
-		ipo->ddir = rw;
-		list_add_tail(&ipo->list, &td->io_log_list);
-		i++;
+		return fwrite(buffer, len, 1, f_err);
 	}
+}
 
-	free(str);
-	fclose(f);
-
-	if (!i)
-		return 1;
+const char *log_get_level(int level)
+{
+	static const char *levels[] = { "Unknown", "Debug", "Info", "Error",
+						"Unknown" };
 
-	if (reads && !writes)
-		td->ddir = DDIR_READ;
-	else if (!reads && writes)
-		td->ddir = DDIR_READ;
-	else
-		td->iomix = 1;
+	if (level >= FIO_LOG_NR)
+		level = FIO_LOG_NR;
 
-	return 0;
+	return levels[level];
 }