X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos-mac.h;h=a073300c40c5ed6fea8c2ec2ff4933776ef7066d;hp=7446a43d47e8c842a72b5b4e2e4469184ce4a974;hb=4e8c82b4e9804c52bf2c78327cc5bfca9d8aedfc;hpb=4b0c257cd785cf7af4a4722f41bd45174283f69d diff --git a/os/os-mac.h b/os/os-mac.h index 7446a43d..a073300c 100644 --- a/os/os-mac.h +++ b/os/os-mac.h @@ -1,6 +1,8 @@ #ifndef FIO_OS_APPLE_H #define FIO_OS_APPLE_H +#define FIO_OS os_mac + #include #include #include @@ -8,23 +10,23 @@ #include #include #include +#include +#include +#include #include "../file.h" -#ifndef CLOCK_MONOTONIC -#define CLOCK_MONOTONIC 1 -#endif - -#ifndef CLOCK_REALTIME -#define CLOCK_REALTIME 1 -#endif - -#define FIO_HAVE_POSIXAIO -#define FIO_HAVE_CLOCK_MONOTONIC -#define FIO_USE_GENERIC_RAND +#define FIO_USE_GENERIC_INIT_RANDOM_STATE +#define FIO_HAVE_GETTID +#define FIO_HAVE_CHARDEV_SIZE +#define FIO_HAVE_NATIVE_FALLOCATE #define OS_MAP_ANON MAP_ANON +#define fio_swap16(x) OSSwapInt16(x) +#define fio_swap32(x) OSSwapInt32(x) +#define fio_swap64(x) OSSwapInt64(x) + /* * OSX has a pitifully small shared memory segment by default, * so default to a lower number of max jobs supported @@ -33,109 +35,49 @@ typedef off_t off64_t; -/* OS X as of 10.6 doesn't have the timer_* functions. - * Emulate the functionality using setitimer and sigaction here - */ - -#define MAX_TIMERS 64 - +#ifndef CONFIG_CLOCKID_T 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; +#endif -static inline int timer_create(clockid_t clockid, struct sigevent *restrict evp, - timer_t *restrict timerid) +#define FIO_OS_DIRECTIO +static inline int fio_set_odirect(struct fio_file *f) { - int current_timer = num_timers; - fio_timers[current_timer] = *evp; - num_timers++; - - *timerid = current_timer; + if (fcntl(f->fd, F_NOCACHE, 1) == -1) + return errno; 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) +static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes) { - 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; - } + uint32_t block_size; + uint64_t block_count; - return rc; -} + if (ioctl(f->fd, DKIOCGETBLOCKCOUNT, &block_count) == -1) + return errno; + if (ioctl(f->fd, DKIOCGETBLOCKSIZE, &block_size) == -1) + return errno; -static inline int timer_delete(timer_t timer) -{ + *bytes = block_size; + *bytes *= block_count; return 0; } -#define FIO_OS_DIRECTIO -static inline int fio_set_odirect(int fd) +static inline int chardev_size(struct fio_file *f, unsigned long long *bytes) { - if (fcntl(fd, F_NOCACHE, 1) == -1) - return errno; + /* + * Could be a raw block device, this is better than just assuming + * we can't get the size at all. + */ + if (!blockdev_size(f, bytes)) + return 0; + + *bytes = -1ULL; return 0; } -static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes) -{ - uint64_t temp = 1; - if (ioctl(f->fd, DKIOCGETBLOCKCOUNT, bytes) == -1) - return errno; - if (ioctl(f->fd, DKIOCGETBLOCKSIZE, &temp) == -1) - return errno; - (*bytes) *= temp; - return 0; -} - static inline int blockdev_invalidate_cache(struct fio_file *f) { - return EINVAL; + return ENOTSUP; } static inline unsigned long long os_phys_mem(void) @@ -147,4 +89,29 @@ static inline unsigned long long os_phys_mem(void) sysctl(mib, 2, &mem, &len, NULL, 0); return mem; } + +#ifndef CONFIG_HAVE_GETTID +static inline int gettid(void) +{ + return mach_thread_self(); +} +#endif + +/* + * For some reason, there's no header definition for fdatasync(), even + * if it exists. + */ +extern int fdatasync(int fd); + +static inline bool fio_fallocate(struct fio_file *f, uint64_t offset, uint64_t len) +{ + fstore_t store = {F_ALLOCATEALL, F_PEOFPOSMODE, offset, len}; + if (fcntl(f->fd, F_PREALLOCATE, &store) != -1) { + if (ftruncate(f->fd, len) == 0) + return true; + } + + return false; +} + #endif