projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gettime: Fix compilation on non-Linux with pthread_getaffinity_np()
[fio.git]
/
os
/
os-freebsd.h
diff --git
a/os/os-freebsd.h
b/os/os-freebsd.h
index 9d1af3b4c49f5a15ab0cb2250130b5ea3ffd091a..1b24fa022a3b61ccb17b35e158c227d370fb3c7e 100644
(file)
--- a/
os/os-freebsd.h
+++ b/
os/os-freebsd.h
@@
-6,6
+6,7
@@
#include <errno.h>
#include <sys/sysctl.h>
#include <sys/disk.h>
#include <errno.h>
#include <sys/sysctl.h>
#include <sys/disk.h>
+#include <sys/endian.h>
#include <sys/thr.h>
#include <sys/socket.h>
#include <sys/param.h>
#include <sys/thr.h>
#include <sys/socket.h>
#include <sys/param.h>
@@
-15,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
@@
-30,15
+30,19
@@
#define fio_swap32(x) bswap32(x)
#define fio_swap64(x) bswap64(x)
#define fio_swap32(x) bswap32(x)
#define fio_swap64(x) bswap64(x)
-typedef off_t off64_t;
-
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))
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_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))
#define fio_cpu_count(mask) CPU_COUNT((mask))
+#ifdef CONFIG_PTHREAD_GETAFFINITY
+#define FIO_HAVE_GET_THREAD_AFFINITY
+#define fio_get_thread_affinity(mask) \
+ pthread_getaffinity_np(pthread_self(), sizeof(mask), &(mask))
+#endif
+
static inline int fio_cpuset_init(os_cpu_mask_t *mask)
{
CPU_ZERO(mask);
static inline int fio_cpuset_init(os_cpu_mask_t *mask)
{
CPU_ZERO(mask);
@@
-82,7
+86,7
@@
static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
static inline int blockdev_invalidate_cache(struct fio_file *f)
{
static inline int blockdev_invalidate_cache(struct fio_file *f)
{
- return E
INVAL
;
+ return E
NOTSUP
;
}
static inline unsigned long long os_phys_mem(void)
}
static inline unsigned long long os_phys_mem(void)
@@
-116,7
+120,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];
@@
-124,7
+128,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;