X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=04496ea6399c206795f5a733722aee250ec1cc7a;hp=695d754976e8c82fa7ae4edc323a505b057ff9ad;hb=a12fc0225482bd1580a332312f2a60f73a9ebc28;hpb=843a741389226f5f2d0ce8636cd57532be9b7e4d

diff --git a/fio.c b/fio.c
index 695d7549..04496ea6 100644
--- a/fio.c
+++ b/fio.c
@@ -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;
@@ -1841,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();
@@ -1874,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;
 
@@ -1944,10 +1936,6 @@ err:
 		munmap(td->mmap, td->file_size);
 	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;
 
@@ -2442,11 +2430,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... */
 				}
 			}
 		}
@@ -2463,7 +2454,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++) {