projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fio: fix aio trim completion latencies
[fio.git]
/
os
/
os-freebsd.h
diff --git
a/os/os-freebsd.h
b/os/os-freebsd.h
index e6da286ea264f92fa2ed4e08d283c3bf0e4350c5..789da178afa1671bd788be57964c4368ef46ee23 100644
(file)
--- a/
os/os-freebsd.h
+++ b/
os/os-freebsd.h
@@
-16,7
+16,6
@@
#include "../file.h"
#define FIO_HAVE_ODIRECT
#include "../file.h"
#define FIO_HAVE_ODIRECT
-#define FIO_USE_GENERIC_RAND
#define FIO_USE_GENERIC_INIT_RANDOM_STATE
#define FIO_HAVE_CHARDEV_SIZE
#define FIO_HAVE_FS_STAT
#define FIO_USE_GENERIC_INIT_RANDOM_STATE
#define FIO_HAVE_CHARDEV_SIZE
#define FIO_HAVE_FS_STAT
@@
-37,7
+36,7
@@
typedef cpuset_t os_cpu_mask_t;
#define fio_cpu_clear(mask, cpu) (void) CPU_CLR((cpu), (mask))
#define fio_cpu_set(mask, cpu) (void) CPU_SET((cpu), (mask))
#define fio_cpu_clear(mask, cpu) (void) CPU_CLR((cpu), (mask))
#define fio_cpu_set(mask, cpu) (void) CPU_SET((cpu), (mask))
-#define fio_cpu_isset(mask, cpu)
CPU_ISSET((cpu), (mask)
)
+#define fio_cpu_isset(mask, cpu)
(CPU_ISSET((cpu), (mask)) != 0
)
#define fio_cpu_count(mask) CPU_COUNT((mask))
static inline int fio_cpuset_init(os_cpu_mask_t *mask)
#define fio_cpu_count(mask) CPU_COUNT((mask))
static inline int fio_cpuset_init(os_cpu_mask_t *mask)
@@
-117,7
+116,7
@@
static inline unsigned long long get_fs_free_size(const char *path)
return ret;
}
return ret;
}
-static inline int os_trim(
int fd
, unsigned long long start,
+static inline int os_trim(
struct fio_file *f
, unsigned long long start,
unsigned long long len)
{
off_t range[2];
unsigned long long len)
{
off_t range[2];
@@
-125,7
+124,7
@@
static inline int os_trim(int fd, unsigned long long start,
range[0] = start;
range[1] = len;
range[0] = start;
range[1] = len;
- if (!ioctl(fd, DIOCGDELETE, range))
+ if (!ioctl(f
->f
d, DIOCGDELETE, range))
return 0;
return errno;
return 0;
return errno;