X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fdp.c;h=49c80d2c613466cf9e5d98171dd4c4bf727ad7a9;hb=da7ec916243221b28ce361329aa5a8e40a90962d;hp=c50af1e241cc071573fd8fcf6e07649dc7859736;hpb=9943adfb8adf50e6f54ab6aff613c99a3a75d224;p=fio.git

diff --git a/fdp.c b/fdp.c
index c50af1e2..49c80d2c 100644
--- a/fdp.c
+++ b/fdp.c
@@ -9,8 +9,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "file.h"
 #include "fio.h"
+#include "file.h"
 
 #include "pshared.h"
 #include "fdp.h"
@@ -45,7 +45,7 @@ static int init_ruh_info(struct thread_data *td, struct fio_file *f)
 	struct fio_ruhs_info *ruhs, *tmp;
 	int i, ret;
 
-	ruhs = scalloc(1, sizeof(*ruhs) + 128 * sizeof(*ruhs->plis));
+	ruhs = scalloc(1, sizeof(*ruhs) + FDP_MAX_RUHS * sizeof(*ruhs->plis));
 	if (!ruhs)
 		return -ENOMEM;
 
@@ -56,8 +56,8 @@ static int init_ruh_info(struct thread_data *td, struct fio_file *f)
 		goto out;
 	}
 
-	if (ruhs->nr_ruhs > 128)
-		ruhs->nr_ruhs = 128;
+	if (ruhs->nr_ruhs > FDP_MAX_RUHS)
+		ruhs->nr_ruhs = FDP_MAX_RUHS;
 
 	if (td->o.fdp_nrpli == 0) {
 		f->ruhs_info = ruhs;
@@ -65,7 +65,7 @@ static int init_ruh_info(struct thread_data *td, struct fio_file *f)
 	}
 
 	for (i = 0; i < td->o.fdp_nrpli; i++) {
-		if (td->o.fdp_plis[i] > ruhs->nr_ruhs) {
+		if (td->o.fdp_plis[i] >= ruhs->nr_ruhs) {
 			ret = -EINVAL;
 			goto out;
 		}
@@ -119,7 +119,16 @@ void fdp_fill_dspec_data(struct thread_data *td, struct io_u *io_u)
 		return;
 	}
 
-	dspec = ruhs->plis[ruhs->pli_loc++ % ruhs->nr_ruhs];
-	io_u->dtype = 2;
+	if (td->o.fdp_pli_select == FIO_FDP_RR) {
+		if (ruhs->pli_loc >= ruhs->nr_ruhs)
+			ruhs->pli_loc = 0;
+
+		dspec = ruhs->plis[ruhs->pli_loc++];
+	} else {
+		ruhs->pli_loc = rand_between(&td->fdp_state, 0, ruhs->nr_ruhs - 1);
+		dspec = ruhs->plis[ruhs->pli_loc];
+	}
+
+	io_u->dtype = FDP_DIR_DTYPE;
 	io_u->dspec = dspec;
 }