summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorBruce Cran <bruce@cran.org.uk>2011-01-08 19:49:54 +0100
committerJens Axboe <jaxboe@fusionio.com>2011-01-08 19:49:54 +0100
commit9b8365618309572d8fd2579c8ea3132db89f843f (patch)
tree8b0b266489021c4fef9d52693032241ec1de0207 /os
parente4db9fec06d77523472e9fad6de5170a77d715c0 (diff)
downloadfio-9b8365618309572d8fd2579c8ea3132db89f843f.tar.gz
fio-9b8365618309572d8fd2579c8ea3132db89f843f.tar.bz2
Various fixes/updates
- Update HOWTO to note that directio and fallocate don't work with ZFS on Solaris. Refactor the Makefile's to add CPPFLAGS and LIBS. - Add -fno-omit-frame-pointer from Linux Makefile to every platform - Change undefined $(ALL_CFLAGS) to $(CFLAGS) - Pass -std=gnu99, without which OS X fails to build. - Add -D__EXTENSIONS__ on Solaris since some functions we need are behind it. - Pull in <limits.h> in fio.c to get PTHREAD_STACK_MIN. - NetBSD doesn't define PTHREAD_STACK_MIN so set it to 4k in os-netbsd.h - If we have posix_fallocate don't error out if it fails during mutex and malloc operations since it will fail on Solaris with a ZFS filesystem. As I understand it these aren't performance-critical operations so do they need to be considered critical? - Remove fio_unused from os-* files since it's defined in fio.h and we don't really need it. - FreeBSD has an idprio command but not the API so don't claim it does. - OS X doesn't have the timer_* API so emulate it using setitimer/sigaction. - NetBSD and Solaris don't support CLOCK_MONOTONIC in timer_create so remove FIO_HAVE_CLOCK_MONOTONIC from their os-* files. I've noticed that a change I made a while ago to use fmin/fmax could cause issues on older OSes - I had a CD with NetBSD 5.0.2 and found they had only been implemented in 5.1 so I'm not sure if I should revert it. Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'os')
-rw-r--r--os/os-aix.h2
-rw-r--r--os/os-freebsd.h3
-rw-r--r--os/os-mac.h87
-rw-r--r--os/os-netbsd.h7
-rw-r--r--os/os-solaris.h3
-rw-r--r--os/os-windows.h4
6 files changed, 95 insertions, 11 deletions
diff --git a/os/os-aix.h b/os/os-aix.h
index 8e4a71d5..91c8bcda 100644
--- a/os/os-aix.h
+++ b/os/os-aix.h
@@ -25,7 +25,7 @@
#define OS_MAP_ANON MAP_ANON
#define OS_MSG_DONTWAIT 0
-static inline int blockdev_invalidate_cache(struct fio_file fio_unused *f)
+static inline int blockdev_invalidate_cache(struct fio_file *f)
{
return EINVAL;
}
diff --git a/os/os-freebsd.h b/os/os-freebsd.h
index 1f114f8c..7a79dd0f 100644
--- a/os/os-freebsd.h
+++ b/os/os-freebsd.h
@@ -9,7 +9,6 @@
#define FIO_HAVE_POSIXAIO
#define FIO_HAVE_ODIRECT
-#define FIO_HAVE_IOPRIO
#define FIO_HAVE_STRSEP
#define FIO_USE_GENERIC_RAND
#define FIO_HAVE_CHARDEV_SIZE
@@ -34,7 +33,7 @@ static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
{
- return blockdev_size(f->fd, bytes);
+ return blockdev_size(f, bytes);
}
static inline int blockdev_invalidate_cache(struct fio_file *f)
diff --git a/os/os-mac.h b/os/os-mac.h
index 068bc5c8..1a0a8875 100644
--- a/os/os-mac.h
+++ b/os/os-mac.h
@@ -3,6 +3,9 @@
#include <errno.h>
#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <signal.h>
#include "../file.h"
@@ -21,10 +24,90 @@
#define OS_MAP_ANON MAP_ANON
-typedef unsigned int clockid_t;
typedef off_t off64_t;
-static inline int blockdev_invalidate_cache(struct fio_file fio_unused *f)
+/* OS X as of 10.6 doesn't have the timer_* functions.
+ * Emulate the functionality using setitimer and sigaction here
+ */
+
+#define MAX_TIMERS 64
+
+typedef unsigned int clockid_t;
+typedef unsigned int timer_t;
+
+struct itimerspec {
+ struct timespec it_value;
+ struct timespec it_interval;
+};
+
+static struct sigevent fio_timers[MAX_TIMERS];
+static unsigned int num_timers = 0;
+
+static inline int timer_create(clockid_t clockid, struct sigevent *restrict evp,
+ timer_t *restrict timerid)
+{
+ int current_timer = num_timers;
+ fio_timers[current_timer] = *evp;
+ num_timers++;
+
+ *timerid = current_timer;
+ return 0;
+}
+
+static void sig_alrm(int signum)
+{
+ union sigval sv;
+
+ for (int i = 0; i < num_timers; i++) {
+ if (fio_timers[i].sigev_notify_function == NULL)
+ continue;
+
+ if (fio_timers[i].sigev_notify == SIGEV_THREAD)
+ fio_timers[i].sigev_notify_function(sv);
+ else if (fio_timers[i].sigev_notify == SIGEV_SIGNAL)
+ kill(getpid(), fio_timers[i].sigev_signo);
+ }
+}
+
+static inline int timer_settime(timer_t timerid, int flags,
+ const struct itimerspec *value, struct itimerspec *ovalue)
+{
+ struct sigaction sa;
+ struct itimerval tv;
+ struct itimerval tv_out;
+ int rc;
+
+ tv.it_interval.tv_sec = value->it_interval.tv_sec;
+ tv.it_interval.tv_usec = value->it_interval.tv_nsec / 1000;
+
+ tv.it_value.tv_sec = value->it_value.tv_sec;
+ tv.it_value.tv_usec = value->it_value.tv_nsec / 1000;
+
+ sa.sa_handler = sig_alrm;
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+
+ rc = sigaction(SIGALRM, &sa, NULL);
+
+ if (!rc)
+ rc = setitimer(ITIMER_REAL, &tv, &tv_out);
+
+ if (!rc && ovalue != NULL) {
+ ovalue->it_interval.tv_sec = tv_out.it_interval.tv_sec;
+ ovalue->it_interval.tv_nsec = tv_out.it_interval.tv_usec * 1000;
+ ovalue->it_value.tv_sec = tv_out.it_value.tv_sec;
+ ovalue->it_value.tv_nsec = tv_out.it_value.tv_usec * 1000;
+ }
+
+ return rc;
+}
+
+static inline int timer_delete(timer_t timer)
+{
+ return 0;
+}
+
+static inline int blockdev_invalidate_cache(struct fio_file *f)
{
return EINVAL;
}
diff --git a/os/os-netbsd.h b/os/os-netbsd.h
index 6478f30d..8f61ec54 100644
--- a/os/os-netbsd.h
+++ b/os/os-netbsd.h
@@ -17,7 +17,6 @@
#define FIO_HAVE_ODIRECT
#define FIO_HAVE_STRSEP
#define FIO_HAVE_FDATASYNC
-#define FIO_HAVE_CLOCK_MONOTONIC
#define FIO_USE_GENERIC_BDEV_SIZE
#define FIO_USE_GENERIC_RAND
@@ -25,9 +24,13 @@
#define OS_MAP_ANON MAP_ANON
+#ifndef PTHREAD_STACK_MIN
+#define PTHREAD_STACK_MIN 4096
+#endif
+
typedef off_t off64_t;
-static inline int blockdev_invalidate_cache(struct fio_file fio_unused *f)
+static inline int blockdev_invalidate_cache(struct fio_file *f)
{
return EINVAL;
}
diff --git a/os/os-solaris.h b/os/os-solaris.h
index e292172d..3e825436 100644
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -17,7 +17,6 @@
#define FIO_HAVE_PSHARED_MUTEX
#define FIO_USE_GENERIC_BDEV_SIZE
#define FIO_HAVE_FDATASYNC
-#define FIO_HAVE_CLOCK_MONOTONIC
#define OS_MAP_ANON MAP_ANON
#define OS_RAND_MAX 2147483648UL
@@ -29,7 +28,7 @@ struct solaris_rand_seed {
typedef psetid_t os_cpu_mask_t;
typedef struct solaris_rand_seed os_random_state_t;
-static inline int blockdev_invalidate_cache(struct fio_file fio_unused *f)
+static inline int blockdev_invalidate_cache(struct fio_file *f)
{
return EINVAL;
}
diff --git a/os/os-windows.h b/os/os-windows.h
index f7712a17..9edacf33 100644
--- a/os/os-windows.h
+++ b/os/os-windows.h
@@ -36,8 +36,8 @@ static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
HANDLE hFile;
if (f->hFile == NULL) {
- hFile = CreateFile(f->file_name, (GENERIC_READ | GENERIC_WRITE),
- (FILE_SHARE_READ | FILE_SHARE_WRITE), NULL, OPEN_EXISTING, 0, NULL);
+ hFile = CreateFile(f->file_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
+ NULL, OPEN_EXISTING, 0, NULL);
} else {
hFile = f->hFile;
}