Various fixes/updates

[fio.git] / os / os-freebsd.h

diff --git a/os/os-freebsd.h b/os/os-freebsd.h
index ba2541a5f5f25159f6fa0c4ed4a25c4336daa09d..7a79dd0f70ca42c5063d7a58741f61fba75a62ed 100644 (file)
--- a/os/os-freebsd.h
+++ b/os/os-freebsd.h
@@ -1,30 +1,42 @@
 #ifndef FIO_OS_FREEBSD_H
 #define FIO_OS_FREEBSD_H
 
+#include <errno.h>
 #include <sys/sysctl.h>
+#include <sys/disk.h>
+
+#include "../file.h"
 
-#undef FIO_HAVE_LIBAIO
 #define FIO_HAVE_POSIXAIO
-#undef FIO_HAVE_FADVISE
-#undef FIO_HAVE_CPU_AFFINITY
-#undef FIO_HAVE_DISK_UTIL
-#undef FIO_HAVE_SGIO
 #define FIO_HAVE_ODIRECT
+#define FIO_HAVE_STRSEP
+#define FIO_USE_GENERIC_RAND
+#define FIO_HAVE_CHARDEV_SIZE
+#define FIO_HAVE_CLOCK_MONOTONIC
 
-#define OS_MAP_ANON            (MAP_ANON)
+#define OS_MAP_ANON            MAP_ANON
 
-typedef unsigned long os_cpu_mask_t;
-typedef unsigned int os_random_state_t;
+typedef off_t off64_t;
 
-/*
- * FIXME
- */
-static inline int blockdev_size(int fd, unsigned long long *bytes)
+static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
 {
-       return EINVAL;
+       off_t size;
+
+       if (!ioctl(f->fd, DIOCGMEDIASIZE, &size)) {
+               *bytes = size;
+               return 0;
+       }
+
+       *bytes = 0;
+       return errno;
+}
+
+static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
+{
+       return blockdev_size(f, bytes);
 }
 
-static inline int blockdev_invalidate_cache(int fd)
+static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
        return EINVAL;
 }
@@ -39,17 +51,8 @@ static inline unsigned long long os_phys_mem(void)
        return mem;
 }
 
-static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
-{
-       srand(seed);
-}
-
-static inline long os_random_long(os_random_state_t *rs)
-{
-       long val;
-
-       val = rand_r(rs);
-       return val;
-}
+#ifdef MADV_FREE
+#define FIO_MADV_FREE  MADV_FREE
+#endif
 
 #endif