projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
idle-prof: Fix segment fault issue when run with '--idle-prof' and multiple output...
[fio.git]
/
trim.c
diff --git
a/trim.c
b/trim.c
index cf42625b20f26c51f95af6e3d45ba29f838543c5..bf825db346df0596b63b88f6e755e7b7985965ca 100644
(file)
--- a/
trim.c
+++ b/
trim.c
@@
-1,17
+1,14
@@
/*
* TRIM/DISCARD support
*/
/*
* TRIM/DISCARD support
*/
-#include <unistd.h>
-#include <fcntl.h>
#include <string.h>
#include <assert.h>
#include <string.h>
#include <assert.h>
-#include <pthread.h>
#include "fio.h"
#include "trim.h"
#ifdef FIO_HAVE_TRIM
#include "fio.h"
#include "trim.h"
#ifdef FIO_HAVE_TRIM
-
int
get_next_trim(struct thread_data *td, struct io_u *io_u)
+
bool
get_next_trim(struct thread_data *td, struct io_u *io_u)
{
struct io_piece *ipo;
{
struct io_piece *ipo;
@@
-19,14
+16,17
@@
int get_next_trim(struct thread_data *td, struct io_u *io_u)
* this io_u is from a requeue, we already filled the offsets
*/
if (io_u->file)
* this io_u is from a requeue, we already filled the offsets
*/
if (io_u->file)
- return
0
;
+ return
true
;
if (flist_empty(&td->trim_list))
if (flist_empty(&td->trim_list))
- return
0
;
+ return
false
;
assert(td->trim_entries);
assert(td->trim_entries);
- ipo = flist_
entry(td->trim_list.nex
t, struct io_piece, trim_list);
+ ipo = flist_
first_entry(&td->trim_lis
t, struct io_piece, trim_list);
remove_trim_entry(td, ipo);
remove_trim_entry(td, ipo);
- ipo->flags |= IP_F_TRIMMED;
+
+ io_u->offset = ipo->offset;
+ io_u->buflen = ipo->len;
+ io_u->file = ipo->file;
/*
* If not verifying that trimmed ranges return zeroed data,
/*
* If not verifying that trimmed ranges return zeroed data,
@@
-40,11
+40,9
@@
int get_next_trim(struct thread_data *td, struct io_u *io_u)
rb_erase(&ipo->rb_node, &td->io_hist_tree);
}
td->io_hist_len--;
rb_erase(&ipo->rb_node, &td->io_hist_tree);
}
td->io_hist_len--;
- }
-
- io_u->offset = ipo->offset;
- io_u->buflen = ipo->len;
- io_u->file = ipo->file;
+ free(ipo);
+ } else
+ ipo->flags |= IP_F_TRIMMED;
if (!fio_file_open(io_u->file)) {
int r = td_io_open_file(td, io_u->file);
if (!fio_file_open(io_u->file)) {
int r = td_io_open_file(td, io_u->file);
@@
-52,33
+50,34
@@
int get_next_trim(struct thread_data *td, struct io_u *io_u)
if (r) {
dprint(FD_VERIFY, "failed file %s open\n",
io_u->file->file_name);
if (r) {
dprint(FD_VERIFY, "failed file %s open\n",
io_u->file->file_name);
- return
1
;
+ return
false
;
}
}
}
}
- get_file(i
po
->file);
+ get_file(i
o_u
->file);
assert(fio_file_open(io_u->file));
io_u->ddir = DDIR_TRIM;
io_u->xfer_buf = NULL;
io_u->xfer_buflen = io_u->buflen;
assert(fio_file_open(io_u->file));
io_u->ddir = DDIR_TRIM;
io_u->xfer_buf = NULL;
io_u->xfer_buflen = io_u->buflen;
- free(ipo);
dprint(FD_VERIFY, "get_next_trim: ret io_u %p\n", io_u);
dprint(FD_VERIFY, "get_next_trim: ret io_u %p\n", io_u);
- return
0
;
+ return
true
;
}
}
-
int
io_u_should_trim(struct thread_data *td, struct io_u *io_u)
+
bool
io_u_should_trim(struct thread_data *td, struct io_u *io_u)
{
unsigned long long val;
{
unsigned long long val;
- long r;
+ uint64_t frand_max;
+ unsigned long r;
if (!td->o.trim_percentage)
if (!td->o.trim_percentage)
- return
0
;
+ return
false
;
-
r = os_random_long
(&td->trim_state);
-
val = (OS_RAND_MAX / 100ULL
);
- val
*= (unsigned long long) td->o.trim_percentage
;
+
frand_max = rand_max
(&td->trim_state);
+
r = __rand(&td->trim_state
);
+ val
= (frand_max / 100ULL)
;
+ val *= (unsigned long long) td->o.trim_percentage;
return r <= val;
}
#endif
return r <= val;
}
#endif