X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=82a18fb89f4d05c8b8f2821e0cbaf82b677dc75b;hp=bedad68fa385bbcd66008780bac12d6386429dfd;hb=ef899b6393c43abd655ad2cbc22de18b88a101f8;hpb=751548451d969148529b642c05e7544726ec3b64

diff --git a/fio.c b/fio.c
index bedad68f..82a18fb8 100644
--- a/fio.c
+++ b/fio.c
@@ -197,7 +197,7 @@ static int get_next_free_block(struct thread_data *td, unsigned long long *b)
 
 static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 {
-	unsigned long block = io_u->offset / td->min_bs;
+	unsigned long long block = io_u->offset / (unsigned long long) td->min_bs;
 	unsigned int blocks = 0;
 
 	while (blocks < (io_u->buflen / td->min_bs)) {
@@ -288,12 +288,12 @@ static int get_next_offset(struct thread_data *td, unsigned long long *offset)
 	long r;
 
 	if (!td->sequential) {
-		unsigned long max_blocks = td->io_size / td->min_bs;
+		unsigned long long max_blocks = td->io_size / td->min_bs;
 		int loops = 50;
 
 		do {
 			lrand48_r(&td->random_state, &r);
-			b = ((max_blocks - 1) * r / (RAND_MAX+1.0));
+			b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
 			rb = b + (td->file_offset / td->min_bs);
 			loops--;
 		} while (!random_map_free(td, rb) && loops);
@@ -545,44 +545,32 @@ static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
 	memcpy(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash));
 }
 
-unsigned int hweight32(unsigned int w)
-{
-	unsigned int res = w - ((w >> 1) & 0x55555555);
-
-	res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
-	res = (res + (res >> 4)) & 0x0F0F0F0F;
-	res = res + (res >> 8);
-
-	return (res + (res >> 16)) & 0x000000FF;
-}
-
-unsigned long hweight64(unsigned long long w)
+static int get_rw_ddir(struct thread_data *td)
 {
-#if __WORDSIZE == 32
-        return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);
-#elif __WORDSIZE == 64
-	unsigned long long v = w - ((w >> 1) & 0x5555555555555555ul);
+	if (td_rw(td)) {
+		struct timeval now;
+		unsigned long elapsed;
 
-	v = (v & 0x3333333333333333ul) + ((v >> 2) & 0x3333333333333333ul);
-	v = (v + (v >> 4)) & 0x0F0F0F0F0F0F0F0Ful;
-	v = v + (v >> 8);
-	v = v + (v >> 16);
+		gettimeofday(&now, NULL);
+	 	elapsed = mtime_since_now(&td->rwmix_switch);
 
-	return (v + (v >> 32)) & 0x00000000000000FFul;
-#else
-#error __WORDSIZE not defined
-#endif
-}
+		/*
+		 * Check if it's time to seed a new data direction.
+		 */
+		if (elapsed >= td->rwmixcycle) {
+			unsigned long v;
+			long r;
 
-static int get_rw_ddir(struct thread_data *td)
-{
-	/*
-	 * perhaps cheasy, but use the hamming weight of the position
-	 * as a randomizer for data direction.
-	 */
-	if (td_rw(td))
-		return hweight64(td->last_pos) & 1;
-	else if (td_read(td))
+			lrand48_r(&td->random_state, &r);
+			v = 100UL * r / (unsigned long) (RAND_MAX + 1.0);
+			if (v < td->rwmixread)
+				td->rwmix_ddir = DDIR_READ;
+			else
+				td->rwmix_ddir = DDIR_WRITE;
+			memcpy(&td->rwmix_switch, &now, sizeof(now));
+		}
+		return td->rwmix_ddir;
+	} else if (td_read(td))
 		return DDIR_READ;
 	else
 		return DDIR_WRITE;
@@ -628,17 +616,16 @@ void put_io_u(struct thread_data *td, struct io_u *io_u)
 	td->cur_depth--;
 }
 
-static int fill_io_u(struct thread_data *td, struct io_u *io_u)
+static void write_iolog_put(struct thread_data *td, struct io_u *io_u)
 {
-	/*
-	 * If using an iolog, grab next piece if any available.
-	 */
-	if (td->iolog) {
-		struct io_piece *ipo;
+	fprintf(td->iolog_f, "%d,%llu,%u\n", io_u->ddir, io_u->offset, io_u->buflen);
+}
 
-		if (list_empty(&td->io_log_list))
-			return 1;
+static int read_iolog_get(struct thread_data *td, struct io_u *io_u)
+{
+	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;
@@ -648,6 +635,17 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 		return 0;
 	}
 
+	return 1;
+}
+
+static int fill_io_u(struct thread_data *td, struct io_u *io_u)
+{
+	/*
+	 * If using an iolog, grab next piece if any available.
+	 */
+	if (td->read_iolog)
+		return read_iolog_get(td, io_u);
+
 	/*
 	 * No log, let the seq/rand engine retrieve the next position.
 	 */
@@ -656,6 +654,13 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 
 		if (io_u->buflen) {
 			io_u->ddir = get_rw_ddir(td);
+
+			/*
+			 * If using a write iolog, store this entry.
+			 */
+			if (td->write_iolog)
+				write_iolog_put(td, io_u);
+
 			return 0;
 		}
 	}
@@ -707,7 +712,7 @@ static struct io_u *get_io_u(struct thread_data *td)
 		return NULL;
 	}
 
-	if (!td->iolog && !td->sequential)
+	if (!td->read_iolog && !td->sequential)
 		mark_random_map(td, io_u);
 
 	td->last_pos += io_u->buflen;
@@ -795,6 +800,13 @@ static void log_io_piece(struct thread_data *td, struct io_u *io_u)
 	list_add(&ipo->list, entry);
 }
 
+static void write_iolog_close(struct thread_data *td)
+{
+	fflush(td->iolog_f);
+	fclose(td->iolog_f);
+	free(td->iolog_buf);
+}
+
 static int init_iolog(struct thread_data *td)
 {
 	unsigned long long offset;
@@ -803,15 +815,34 @@ static int init_iolog(struct thread_data *td)
 	FILE *f;
 	int rw, i, reads, writes;
 
-	if (!td->iolog)
+	if (!td->read_iolog && !td->write_iolog)
 		return 0;
 
-	f = fopen(td->iolog_file, "r");
+	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;
+	}
+
+	/*
+	 * 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) {
@@ -1798,7 +1829,6 @@ static void update_rusage_stat(struct thread_data *td)
 static void *thread_main(void *data)
 {
 	struct thread_data *td = data;
-	int ret = 1;
 
 	if (!td->use_thread)
 		setsid();
@@ -1831,6 +1861,11 @@ static void *thread_main(void *data)
 		}
 	}
 
+	if (nice(td->nice) < 0) {
+		td_verror(td, errno);
+		goto err;
+	}
+
 	if (init_random_state(td))
 		goto err;
 
@@ -1879,14 +1914,14 @@ static void *thread_main(void *data)
 			break;
 	}
 
-	ret = 0;
-
 	if (td->bw_log)
 		finish_log(td, td->bw_log, "bw");
 	if (td->slat_log)
 		finish_log(td, td->slat_log, "slat");
 	if (td->clat_log)
 		finish_log(td, td->clat_log, "clat");
+	if (td->write_iolog)
+		write_iolog_close(td);
 
 	if (exitall_on_terminate)
 		terminate_threads(td->groupid);
@@ -1898,12 +1933,12 @@ err:
 	}
 	if (td->mmap)
 		munmap(td->mmap, td->file_size);
+	if (td->directory)
+		free(td->directory);
+	if (td->iolog_file)
+		free(td->iolog_file);
 	cleanup_io(td);
 	cleanup_io_u(td);
-	if (ret) {
-		sem_post(&startup_sem);
-		sem_wait(&td->mutex);
-	}
 	td_set_runstate(td, TD_EXITED);
 	return NULL;
 
@@ -1950,14 +1985,15 @@ static void show_ddir_status(struct thread_data *td, struct group_run_stats *rs,
 			     int ddir)
 {
 	char *ddir_str[] = { "read ", "write" };
-	unsigned long min, max, bw;
+	unsigned long min, max;
+	unsigned long long bw;
 	double mean, dev;
 
 	if (!td->runtime[ddir])
 		return;
 
 	bw = td->io_bytes[ddir] / td->runtime[ddir];
-	printf("  %s: io=%6lluMiB, bw=%6luKiB/s, runt=%6lumsec\n", ddir_str[ddir], td->io_bytes[ddir] >> 20, bw, td->runtime[ddir]);
+	printf("  %s: io=%6lluMiB, bw=%6lluKiB/s, runt=%6lumsec\n", ddir_str[ddir], td->io_bytes[ddir] >> 20, bw, td->runtime[ddir]);
 
 	if (calc_lat(&td->slat_stat[ddir], &min, &max, &mean, &dev))
 		printf("    slat (msec): min=%5lu, max=%5lu, avg=%5.02f, dev=%5.02f\n", min, max, mean, dev);
@@ -2397,11 +2433,14 @@ static void run_threads(void)
 				td = map[i];
 				if (!td)
 					continue;
-				if (td->runstate == TD_INITIALIZED ||
-				    td->runstate >= TD_EXITED) {
+				if (td->runstate == TD_INITIALIZED) {
 					map[i] = NULL;
 					left--;
-					continue;
+				} else if (td->runstate >= TD_EXITED) {
+					map[i] = NULL;
+					left--;
+					todo--;
+					nr_running++; /* work-around... */
 				}
 			}
 		}
@@ -2418,7 +2457,7 @@ static void run_threads(void)
 		}
 
 		/*
-		 * start created threads (TD_INITIALIZED -> TD_RUNNING)
+		 * start created threads (TD_INITIALIZED -> TD_RUNNING).
 		 */
 		printf("fio: Go for launch\n");
 		for (i = 0; i < thread_number; i++) {
@@ -2499,7 +2538,7 @@ static void show_run_stats(void)
 	}
 
 	for (i = 0; i < thread_number; i++) {
-		unsigned long rbw, wbw;
+		unsigned long long rbw, wbw;
 
 		td = &threads[i];
 
@@ -2521,9 +2560,9 @@ static void show_run_stats(void)
 
 		rbw = wbw = 0;
 		if (td->runtime[0])
-			rbw = td->io_bytes[0] / td->runtime[0];
+			rbw = td->io_bytes[0] / (unsigned long long) td->runtime[0];
 		if (td->runtime[1])
-			wbw = td->io_bytes[1] / td->runtime[1];
+			wbw = td->io_bytes[1] / (unsigned long long) td->runtime[1];
 
 		if (rbw < rs->min_bw[0])
 			rs->min_bw[0] = rbw;