Merge branch 'minor_fixes' of https://github.com/sitsofe/fio

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

diff --git a/os/os-netbsd.h b/os/os-netbsd.h
index 4b0269e6cab673311576689d514db5b09d49d822..eac76cf26bb2ea9247ecaf394468b4987e831585 100644 (file)
--- a/os/os-netbsd.h
+++ b/os/os-netbsd.h
@@ -6,6 +6,11 @@
 #include <errno.h>
 #include <lwp.h>
 #include <sys/param.h>
+#include <sys/statvfs.h>
+#include <sys/ioctl.h>
+#include <sys/dkio.h>
+#include <sys/disklabel.h>
+#include <sys/endian.h>
 /* XXX hack to avoid confilcts between rbtree.h and <sys/rb.h> */
 #define        rb_node _rb_node
 #include <sys/sysctl.h>
@@ -16,12 +21,12 @@
 #include "../file.h"
 
 #define FIO_HAVE_ODIRECT
-#define FIO_USE_GENERIC_BDEV_SIZE
 #define FIO_USE_GENERIC_RAND
 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
+#define FIO_HAVE_FS_STAT
 #define FIO_HAVE_GETTID
 
-#undef FIO_HAVE_CPU_AFFINITY   /* XXX notyet */
+#undef FIO_HAVE_CPU_AFFINITY   /* doesn't exist */
 
 #define OS_MAP_ANON            MAP_ANON
 
@@ -35,9 +40,22 @@
 
 typedef off_t off64_t;
 
+static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
+{
+       struct disklabel dl;
+
+       if (!ioctl(f->fd, DIOCGDINFO, &dl)) {
+               *bytes = ((unsigned long long)dl.d_secperunit) * dl.d_secsize;
+               return 0;
+       }
+
+       *bytes = 0;
+       return errno;
+}
+
 static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
-       return EINVAL;
+       return ENOTSUP;
 }
 
 static inline unsigned long long os_phys_mem(void)
@@ -55,11 +73,21 @@ static inline int gettid(void)
        return (int) _lwp_self();
 }
 
+static inline unsigned long long get_fs_free_size(const char *path)
+{
+       unsigned long long ret;
+       struct statvfs s;
+
+       if (statvfs(path, &s) < 0)
+               return -1ULL;
+
+       ret = s.f_frsize;
+       ret *= (unsigned long long) s.f_bfree;
+       return ret;
+}
+
 #ifdef MADV_FREE
 #define FIO_MADV_FREE  MADV_FREE
 #endif
 
-/* XXX NetBSD doesn't have getopt_long_only */
-#define        getopt_long_only        getopt_long
-
 #endif