projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
engines/libzbc: enable block backend
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index cda16c4d7a6b5627901a429bc9c0553533c92884..d6dbaf7cb437d894ab990fa4531bd44ef05872c7 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-973,13
+973,13
@@
static void init_rand_file_service(struct thread_data *td)
const unsigned int seed = td->rand_seeds[FIO_RAND_FILE_OFF];
if (td->o.file_service_type == FIO_FSERVICE_ZIPF) {
const unsigned int seed = td->rand_seeds[FIO_RAND_FILE_OFF];
if (td->o.file_service_type == FIO_FSERVICE_ZIPF) {
- zipf_init(&td->next_file_zipf, nranges, td->zipf_theta, seed);
+ zipf_init(&td->next_file_zipf, nranges, td->zipf_theta,
td->random_center,
seed);
zipf_disable_hash(&td->next_file_zipf);
} else if (td->o.file_service_type == FIO_FSERVICE_PARETO) {
zipf_disable_hash(&td->next_file_zipf);
} else if (td->o.file_service_type == FIO_FSERVICE_PARETO) {
- pareto_init(&td->next_file_zipf, nranges, td->pareto_h, seed);
+ pareto_init(&td->next_file_zipf, nranges, td->pareto_h,
td->random_center,
seed);
zipf_disable_hash(&td->next_file_zipf);
} else if (td->o.file_service_type == FIO_FSERVICE_GAUSS) {
zipf_disable_hash(&td->next_file_zipf);
} else if (td->o.file_service_type == FIO_FSERVICE_GAUSS) {
- gauss_init(&td->next_file_gauss, nranges, td->gauss_dev, seed);
+ gauss_init(&td->next_file_gauss, nranges, td->gauss_dev,
td->random_center,
seed);
gauss_disable_hash(&td->next_file_gauss);
}
}
gauss_disable_hash(&td->next_file_gauss);
}
}
@@
-1104,18
+1104,15
@@
int ioengine_load(struct thread_data *td)
* for this name and see if they match. If they do, then
* the engine is unchanged.
*/
* for this name and see if they match. If they do, then
* the engine is unchanged.
*/
- dlhandle = td->io_ops
_
dlhandle;
+ dlhandle = td->io_ops
->
dlhandle;
ops = load_ioengine(td);
if (!ops)
goto fail;
ops = load_ioengine(td);
if (!ops)
goto fail;
- if (ops == td->io_ops && dlhandle == td->io_ops_dlhandle) {
- if (dlhandle)
- dlclose(dlhandle);
+ if (ops == td->io_ops && dlhandle == td->io_ops->dlhandle)
return 0;
return 0;
- }
- if (dlhandle && dlhandle != td->io_ops
_
dlhandle)
+ if (dlhandle && dlhandle != td->io_ops
->
dlhandle)
dlclose(dlhandle);
/* Unload the old engine. */
dlclose(dlhandle);
/* Unload the old engine. */