X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=lib%2Frand.c;h=618a2f06349dbc90389971b8720c9ea067024e28;hp=66d04729a49eaa073f822d77a93b66ae426f659d;hb=a893c26129358a934767a92d487510c87c81dde8;hpb=9c42684e32325da26e862280388798343c5f1305

diff --git a/lib/rand.c b/lib/rand.c
index 66d04729..618a2f06 100644
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -91,17 +91,49 @@ unsigned long fill_random_buf(struct frand_state *fs, void *buf,
 	return r;
 }
 
-unsigned long fill_random_buf_percentage(struct frand_state *fs, void *buf,
-					 unsigned int percentage,
-					 unsigned int segment, unsigned int len)
+void fill_pattern(void *p, unsigned int len, char *pattern,
+		  unsigned int pattern_bytes)
 {
-	unsigned int this_len, rep_len;
-	unsigned long r = __rand(fs);
+	switch (pattern_bytes) {
+	case 0:
+		assert(0);
+		break;
+	case 1:
+		memset(p, pattern[0], len);
+		break;
+	default: {
+		unsigned int i = 0, size = 0;
+		unsigned char *b = p;
+
+		while (i < len) {
+			size = pattern_bytes;
+			if (size > (len - i))
+				size = len - i;
+			memcpy(b+i, pattern, size);
+			i += size;
+		}
+		break;
+		}
+	}
+}
 
-	assert(segment <= len);
+void __fill_random_buf_percentage(unsigned long seed, void *buf,
+				  unsigned int percentage,
+				  unsigned int segment, unsigned int len,
+				  char *pattern, unsigned int pbytes)
+{
+	unsigned int this_len;
+
+	if (percentage == 100) {
+		if (pbytes)
+			fill_pattern(buf, len, pattern, pbytes);
+		else
+			memset(buf, 0, len);
+		return;
+	}
 
-	if (sizeof(int) != sizeof(long *))
-		r *= (unsigned long) __rand(fs);
+	if (segment > len)
+		segment = len;
 
 	while (len) {
 		/*
@@ -111,22 +143,35 @@ unsigned long fill_random_buf_percentage(struct frand_state *fs, void *buf,
 		if (this_len > len)
 			this_len = len;
 
-		__fill_random_buf(buf, this_len, r);
+		__fill_random_buf(buf, this_len, seed);
 
 		len -= this_len;
 		buf += this_len;
 
-		/*
-		 * Now duplicate random chunk in rest of buf
-		 */
-		rep_len = segment - this_len;
-		if (rep_len > len)
-			rep_len = len;
+		if (this_len > len)
+			this_len = len;
 
-		memcpy(buf, buf + rep_len, rep_len);
-		buf += rep_len;
-		len -= rep_len;
+		if (pbytes)
+			fill_pattern(buf, this_len, pattern, pbytes);
+		else
+			memset(buf, 0, this_len);
+
+		len -= this_len;
+		buf += this_len;
 	}
+}
+
+unsigned long fill_random_buf_percentage(struct frand_state *fs, void *buf,
+					 unsigned int percentage,
+					 unsigned int segment, unsigned int len,
+					 char *pattern, unsigned int pbytes)
+{
+	unsigned long r = __rand(fs);
+
+	if (sizeof(int) != sizeof(long *))
+		r *= (unsigned long) __rand(fs);
 
+	__fill_random_buf_percentage(r, buf, percentage, segment, len,
+					pattern, pbytes);
 	return r;
 }