Recent changes

[Jens Axboe <jaxboe@xxxxxxxxxxxx>]

The following changes since commit 3342a4c721f398faf43c5e358b414d2d454ba0d8:

  Fio 1.50 (2011-01-25 16:18:08 +0100)

are available in the git repository at:
  git://git.kernel.dk/fio.git master

Jens Axboe (3):
      solaris: char dev size fixes
      Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
      Fio 1.50.1

 init.c          |    2 +-
 os/os-solaris.h |   26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

---

Diff of recent changes:

diff --git a/init.c b/init.c
index 26f5ea7..df9e2a3 100644
--- a/init.c
+++ b/init.c
@@ -22,7 +22,7 @@
 
 #include "lib/getopt.h"
 
-static char fio_version_string[] = "fio 1.50";
+static char fio_version_string[] = "fio 1.50.1";
 
 #define FIO_RANDSEED		(0xb1899bedUL)
 
diff --git a/os/os-solaris.h b/os/os-solaris.h
index 3e82543..f93a04c 100644
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -6,17 +6,19 @@
 #include <sys/types.h>
 #include <sys/fcntl.h>
 #include <sys/pset.h>
+#include <sys/mman.h>
+#include <sys/dkio.h>
 
 #include "../file.h"
 
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_SOLARISAIO
-#define FIO_HAVE_FALLOCATE
 #define FIO_HAVE_POSIXAIO_FSYNC
 #define FIO_HAVE_CPU_AFFINITY
 #define FIO_HAVE_PSHARED_MUTEX
-#define FIO_USE_GENERIC_BDEV_SIZE
 #define FIO_HAVE_FDATASYNC
+#define FIO_HAVE_CHARDEV_SIZE
+#define FIO_USE_GENERIC_BDEV_SIZE
 
 #define OS_MAP_ANON		MAP_ANON
 #define OS_RAND_MAX		2147483648UL
@@ -25,12 +27,30 @@ struct solaris_rand_seed {
 	unsigned short r[3];
 };
 
+#define posix_madvise	madvise
+#define POSIX_MADV_DONTNEED	MADV_DONTNEED
+#define POSIX_MADV_SEQUENTIAL	MADV_SEQUENTIAL
+#define POSIX_MADV_RANDOM	MADV_RANDOM
+
 typedef psetid_t os_cpu_mask_t;
 typedef struct solaris_rand_seed os_random_state_t;
 
+static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
+{
+	struct dk_minfo info;
+
+	*bytes = 0;
+
+	if (ioctl(f->fd, DKIOCGMEDIAINFO, &info) < 0)
+		return errno;
+
+	*bytes = info.dki_lbsize * info.dki_capacity;
+	return 0;
+}
+
 static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
-	return EINVAL;
+	return 0;
 }
 
 static inline unsigned long long os_phys_mem(void)
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html