projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hotfix_counter_overflow' of https://github.com/ifke/fio
[fio.git]
/
os
/
os-freebsd.h
diff --git
a/os/os-freebsd.h
b/os/os-freebsd.h
index aa90954dc6497b54ef841cce82635847b5c354d9..97bc8ae5f4e2658d99d590d90f2919098df7ed96 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>
@@
-22,9
+23,7
@@
#define FIO_HAVE_TRIM
#define FIO_HAVE_GETTID
#define FIO_HAVE_CPU_AFFINITY
#define FIO_HAVE_TRIM
#define FIO_HAVE_GETTID
#define FIO_HAVE_CPU_AFFINITY
-/* Only have attach-to-open-removed when kern.ipc.shm_allow_removed is 1 */
-#undef FIO_HAVE_SHM_ATTACH_REMOVED
-
+#define FIO_HAVE_SHM_ATTACH_REMOVED
#define OS_MAP_ANON MAP_ANON
#define OS_MAP_ANON MAP_ANON
@@
-38,7
+37,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)
@@
-84,7
+83,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)
@@
-118,7
+117,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];
@@
-126,7
+125,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;
@@
-136,4
+135,15
@@
static inline int os_trim(int fd, unsigned long long start,
#define FIO_MADV_FREE MADV_FREE
#endif
#define FIO_MADV_FREE MADV_FREE
#endif
+static inline int shm_attach_to_open_removed(void)
+{
+ int x;
+ size_t len = sizeof(x);
+
+ if (sysctlbyname("kern.ipc.shm_allow_removed", &x, &len, NULL, 0) < 0)
+ return 0;
+
+ return x > 0 ? 1 : 0;
+}
+
#endif
#endif