X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=iolog.c;h=9bcf0d8e2982e37ce5d48fbd64e9653872e54ea0;hp=e4c1fef9cb6ff802e3f5dffce4e24a0004565ad4;hb=d7213923067aa49922962a469a691c3ec951064d;hpb=98ffb8f3ecebed9984d1744f142eb8be10c14dbd

diff --git a/iolog.c b/iolog.c
index e4c1fef9..9bcf0d8e 100644
--- a/iolog.c
+++ b/iolog.c
@@ -110,7 +110,7 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 {
 	struct io_piece *ipo;
 	unsigned long elapsed;
-	
+
 	while (!flist_empty(&td->io_log_list)) {
 		int ret;
 
@@ -141,11 +141,10 @@ int read_iolog_get(struct thread_data *td, struct io_u *io_u)
 			elapsed = mtime_since_genesis();
 			if (ipo->delay > elapsed)
 				usec_sleep(td, (ipo->delay - elapsed) * 1000);
-				
 		}
 
 		free(ipo);
-		
+
 		if (io_u->ddir != DDIR_WAIT)
 			return 0;
 	}
@@ -316,6 +315,7 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 									act);
 				continue;
 			}
+			fileno = get_fileno(td, fname);
 		} else if (r == 2) {
 			rw = DDIR_INVAL;
 			if (!strcmp(act, "add")) {
@@ -372,7 +372,7 @@ static int read_iolog2(struct thread_data *td, FILE *f)
 			ipo->fileno = fileno;
 			ipo->file_action = file_action;
 		}
-			
+
 		queue_io_piece(td, ipo);
 	}
 
@@ -494,13 +494,14 @@ int init_iolog(struct thread_data *td)
 	return ret;
 }
 
-void setup_log(struct io_log **log, unsigned long avg_msec)
+void setup_log(struct io_log **log, unsigned long avg_msec, int log_type)
 {
 	struct io_log *l = malloc(sizeof(*l));
 
 	memset(l, 0, sizeof(*l));
 	l->nr_samples = 0;
 	l->max_samples = 1024;
+	l->log_type = log_type;
 	l->log = malloc(l->max_samples * sizeof(struct io_sample));
 	l->avg_msec = avg_msec;
 	*log = l;
@@ -518,10 +519,10 @@ void __finish_log(struct io_log *log, const char *name)
 	}
 
 	for (i = 0; i < log->nr_samples; i++) {
-		fprintf(f, "%lu, %lu, %u, %u\n", log->log[i].time,
-						log->log[i].val,
-						log->log[i].ddir,
-						log->log[i].bs);
+		fprintf(f, "%lu, %lu, %u, %u\n",
+				(unsigned long) log->log[i].time,
+				(unsigned long) log->log[i].val,
+				log->log[i].ddir, log->log[i].bs);
 	}
 
 	fclose(f);
@@ -536,7 +537,13 @@ void finish_log_named(struct thread_data *td, struct io_log *log,
 
 	snprintf(file_name, sizeof(file_name), "%s_%s.log", prefix, postfix);
 	p = basename(file_name);
-	__finish_log(log, p);
+
+	if (td->client_type == FIO_CLIENT_TYPE_GUI) {
+		fio_send_iolog(td, log, p);
+		free(log->log);
+		free(log);
+	} else
+		__finish_log(log, p);
 }
 
 void finish_log(struct thread_data *td, struct io_log *log, const char *name)