X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=8ac8ec3238c473c48bc34a68225d073b2ef2a9fb;hp=298716ba3265fc1969f3ef8c60fd2e3dea194ed9;hb=9274160ea2b40b94f27bc4479ac8b534fb09e85d;hpb=127f686514ef8b1d9ab6ed702971b205454974e6

diff --git a/log.c b/log.c
index 298716ba..7e8b13b3 100644
--- a/log.c
+++ b/log.c
@@ -1,221 +1,149 @@
-#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, "%u,%llu,%lu\n", io_u->ddir, io_u->offset, io_u->buflen);
-}
+#include "fio.h"
+#include "oslib/asprintf.h"
 
-int read_iolog_get(struct thread_data *td, struct io_u *io_u)
+size_t log_info_buf(const char *buf, size_t len)
 {
-	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;
-		io_u->file = ipo->file;
-		free(ipo);
+	/*
+	 * 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;
 	}
 
-	return 1;
+	if (log_syslog) {
+		syslog(LOG_INFO, "%s", buf);
+		return len;
+	} else
+		return fwrite(buf, len, 1, f_out);
 }
 
-void prune_io_piece_log(struct thread_data *td)
+size_t log_valist(const char *fmt, va_list args)
 {
-	struct io_piece *ipo;
+	char *buffer;
+	int len;
 
-	while (!list_empty(&td->io_hist_list)) {
-		ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
+	len = vasprintf(&buffer, fmt, args);
+	if (len < 0)
+		return 0;
+	len = log_info_buf(buffer, len);
+	free(buffer);
 
-		list_del(&ipo->list);
-		free(ipo);
-	}
+	return len;
 }
 
-/*
- * log a successful write, so we can unwind the log for verify
- */
-void log_io_piece(struct thread_data *td, struct io_u *io_u)
+/* add prefix for the specified type in front of the valist */
+void log_prevalist(int type, const char *fmt, va_list args)
 {
-	struct io_piece *ipo = malloc(sizeof(struct io_piece));
-	struct list_head *entry;
+	char *buf1, *buf2;
+	int len;
+	pid_t pid;
 
-	INIT_LIST_HEAD(&ipo->list);
-	ipo->file = io_u->file;
-	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_random(td) || !td->overwrite) {
-		list_add_tail(&ipo->list, &td->io_hist_list);
+	pid = gettid();
+	if (fio_debug_jobp && *fio_debug_jobp != -1U
+	    && pid != *fio_debug_jobp)
 		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;
-	}
 
-	list_add(&ipo->list, entry);
+	len = vasprintf(&buf1, fmt, args);
+	if (len < 0)
+		return;
+	len = asprintf(&buf2, "%-8s %-5u %s", debug_levels[type].name,
+		       (int) pid, buf1);
+	free(buf1);
+	if (len < 0)
+		return;
+	len = log_info_buf(buf2, len);
+	free(buf2);
 }
 
-void write_iolog_close(struct thread_data *td)
+size_t log_info(const char *format, ...)
 {
-	fflush(td->iolog_f);
-	fclose(td->iolog_f);
-	free(td->iolog_buf);
-}
+	va_list args;
+	size_t ret;
 
-/*
- * Open a stored log and read in the entries.
- */
-static int init_iolog_read(struct thread_data *td)
-{
-	unsigned long long offset;
-	unsigned int bytes;
-	char *str, *p;
-	FILE *f;
-	int rw, reads, writes;
-
-	f = fopen(td->read_iolog_file, "r");
-	if (!f) {
-		perror("fopen read iolog");
-		return 1;
-	}
+	va_start(args, format);
+	ret = log_valist(format, args);
+	va_end(args);
 
-	/*
-	 * Read in the read iolog and store it, reuse the infrastructure
-	 * for doing verifications.
-	 */
-	str = malloc(4096);
-	reads = writes = 0;
-	while ((p = fgets(str, 4096, f)) != NULL) {
-		struct io_piece *ipo;
-
-		if (sscanf(p, "%d,%llu,%u", &rw, &offset, &bytes) != 3) {
-			log_err("bad iolog: %s\n", p);
-			continue;
-		}
-		if (rw == DDIR_READ)
-			reads++;
-		else if (rw == DDIR_WRITE)
-			writes++;
-		else {
-			log_err("bad ddir: %d\n", rw);
-			continue;
-		}
-
-		ipo = malloc(sizeof(*ipo));
-		INIT_LIST_HEAD(&ipo->list);
-		ipo->offset = offset;
-		ipo->len = bytes;
-		ipo->ddir = (enum fio_ddir) rw;
-		if (bytes > td->max_bs[rw])
-			td->max_bs[rw] = bytes;
-		list_add_tail(&ipo->list, &td->io_log_list);
-	}
-
-	free(str);
-	fclose(f);
-
-	if (!reads && !writes)
-		return 1;
-	else if (reads && !writes)
-		td->td_ddir = TD_DDIR_READ;
-	else if (!reads && writes)
-		td->td_ddir = TD_DDIR_READ;
-	else
-		td->td_ddir = TD_DDIR_RW;
-
-	return 0;
+	return ret;
 }
 
-/*
- * Setup a log for storing io patterns.
- */
-static int init_iolog_write(struct thread_data *td)
+size_t __log_buf(struct buf_output *buf, const char *format, ...)
 {
-	FILE *f;
-
-	f = fopen(td->write_iolog_file, "w+");
-	if (!f) {
-		perror("fopen write iolog");
-		return 1;
-	}
+	char *buffer;
+	va_list args;
+	int len;
+
+	va_start(args, format);
+	len = vasprintf(&buffer, format, args);
+	va_end(args);
+	if (len < 0)
+		return 0;
+	len = buf_output_add(buf, buffer, len);
+	free(buffer);
 
-	/*
-	 * That's it for writing, setup a log buffer and we're done.
-	  */
-	td->iolog_f = f;
-	td->iolog_buf = malloc(8192);
-	setvbuf(f, td->iolog_buf, _IOFBF, 8192);
-	return 0;
+	return len;
 }
 
-int init_iolog(struct thread_data *td)
+int log_info_flush(void)
 {
-	int ret = 0;
-
-	if (td->io_ops->flags & FIO_DISKLESSIO)
+	if (is_backend || log_syslog)
 		return 0;
 
-	if (td->read_iolog_file)
-		ret = init_iolog_read(td);
-	else if (td->write_iolog_file)
-		ret = init_iolog_write(td);
-
-	return ret;
+	return fflush(f_out);
 }
 
-void setup_log(struct io_log **log)
+size_t log_err(const char *format, ...)
 {
-	struct io_log *l = malloc(sizeof(*l));
+	size_t ret;
+	int len;
+	char *buffer;
+	va_list args;
+
+	va_start(args, format);
+	len = vasprintf(&buffer, format, args);
+	va_end(args);
+	if (len < 0)
+		return len;
+
+	if (is_backend) {
+		ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);
+		if (ret != -1)
+			goto done;
+	}
 
-	l->nr_samples = 0;
-	l->max_samples = 1024;
-	l->log = malloc(l->max_samples * sizeof(struct io_sample));
-	*log = l;
-}
+	if (log_syslog) {
+		syslog(LOG_INFO, "%s", buffer);
+		ret = len;
+	} else {
+		if (f_err != stderr)
+			ret = fwrite(buffer, len, 1, stderr);
 
-void __finish_log(struct io_log *log, const char *name)
-{
-	unsigned int i;
-	FILE *f;
-
-	f = fopen(name, "w");
-	if (!f) {
-		perror("fopen log");
-		return;
+		ret = fwrite(buffer, len, 1, f_err);
 	}
 
-	for (i = 0; i < log->nr_samples; i++)
-		fprintf(f, "%lu, %lu, %u\n", log->log[i].time, log->log[i].val, log->log[i].ddir);
-
-	fclose(f);
-	free(log->log);
-	free(log);
+done:
+	free(buffer);
+	return ret;
 }
 
-void finish_log(struct thread_data *td, struct io_log *log, const char *name)
+const char *log_get_level(int level)
 {
-	char file_name[256];
+	static const char *levels[] = { "Unknown", "Debug", "Info", "Error",
+						"Unknown" };
+
+	if (level >= FIO_LOG_NR)
+		level = FIO_LOG_NR;
 
-	snprintf(file_name, 200, "client%d_%s.log", td->thread_number, name);
-	__finish_log(log, file_name);
+	return levels[level];
 }