X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos-windows.h;h=36b421ee45ad52049dabafa625acda25d79c1c00;hp=8b801ed5bfabf959236fbf8711060d63e5db7037;hb=refs%2Ftags%2Ffio-3.1;hpb=61b29c20eb4b1d374636d5325fb56c0fa9a574ad diff --git a/os/os-windows.h b/os/os-windows.h index 8b801ed5..36b421ee 100644 --- a/os/os-windows.h +++ b/os/os-windows.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -14,15 +15,24 @@ #include "../smalloc.h" #include "../file.h" #include "../log.h" +#include "../lib/hweight.h" +#include "../oslib/strcasestr.h" + +#include "windows/posix.h" + +/* Cygwin doesn't define rand_r if C99 or newer is being used */ +#if defined(WIN32) && !defined(rand_r) +int rand_r(unsigned *); +#endif + +#ifndef PTHREAD_STACK_MIN +#define PTHREAD_STACK_MIN 65535 +#endif #define FIO_HAVE_ODIRECT #define FIO_HAVE_CPU_AFFINITY #define FIO_HAVE_CHARDEV_SIZE -#define FIO_HAVE_FDATASYNC -#define FIO_HAVE_WINDOWSAIO -#define FIO_HAVE_FALLOCATE #define FIO_HAVE_GETTID -#define FIO_HAVE_CLOCK_MONOTONIC #define FIO_USE_GENERIC_RAND #define FIO_PREFERRED_ENGINE "windowsaio" @@ -31,24 +41,14 @@ #define FIO_MAX_CPUS MAXIMUM_PROCESSORS -#define FIO_OS_HAVE_SOCKLEN_T -typedef int fio_socklen_t; - #define OS_MAP_ANON MAP_ANON -#define FIO_LITTLE_ENDIAN #define fio_swap16(x) _byteswap_ushort(x) #define fio_swap32(x) _byteswap_ulong(x) #define fio_swap64(x) _byteswap_uint64(x) -typedef off_t off64_t; -typedef int clockid_t; - typedef DWORD_PTR os_cpu_mask_t; -#define CLOCK_REALTIME 1 -#define CLOCK_MONOTONIC 2 - #define _SC_PAGESIZE 0x1 #define _SC_NPROCESSORS_ONLN 0x2 #define _SC_PHYS_PAGES 0x4 @@ -82,6 +82,8 @@ typedef DWORD_PTR os_cpu_mask_t; #define POLLHUP 1 #define SIGCONT 0 +#define SIGUSR1 1 +#define SIGUSR2 2 typedef int sigset_t; typedef int siginfo_t; @@ -94,7 +96,6 @@ struct sigaction void* (*sa_sigaction)(int, siginfo_t *, void*); }; -char *strsep(char **stringp, const char *delim); long sysconf(int name); int kill(pid_t pid, int sig); @@ -110,16 +111,18 @@ int fcntl(int fildes, int cmd, ...); int fdatasync(int fildes); int lstat(const char * path, struct stat * buf); uid_t geteuid(void); +char* ctime_r(const time_t *t, char *buf); int nanosleep(const struct timespec *rqtp, struct timespec *rmtp); ssize_t pread(int fildes, void *buf, size_t nbyte, off_t offset); ssize_t pwrite(int fildes, const void *buf, size_t nbyte, off_t offset); -extern void td_fill_rand_seeds(struct thread_data *); static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes) { int rc = 0; HANDLE hFile; + GET_LENGTH_INFORMATION info; + DWORD outBytes; if (f->hFile == NULL) { hFile = CreateFile(f->file_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -128,10 +131,6 @@ static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes) hFile = f->hFile; } - GET_LENGTH_INFORMATION info; - DWORD outBytes; - LARGE_INTEGER size; - size.QuadPart = 0; if (DeviceIoControl(hFile, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, &info, sizeof(info), &outBytes, NULL)) *bytes = info.Length.QuadPart; else @@ -152,24 +151,19 @@ static inline int chardev_size(struct fio_file *f, unsigned long long *bytes) static inline int blockdev_invalidate_cache(struct fio_file *f) { - /* There's no way to invalidate the cache in Windows - * so just pretend to succeed */ - return 0; + return ENOTSUP; } static inline unsigned long long os_phys_mem(void) { - SYSTEM_INFO sysInfo; - uintptr_t addr; + long pagesize, pages; - GetSystemInfo(&sysInfo); - addr = (uintptr_t)sysInfo.lpMaximumApplicationAddress; - return (unsigned long long)addr; -} + pagesize = sysconf(_SC_PAGESIZE); + pages = sysconf(_SC_PHYS_PAGES); + if (pages == -1 || pagesize == -1) + return 0; -static inline void os_get_tmpdir(char *path, int len) -{ - GetTempPath(len, path); + return (unsigned long long) pages * (unsigned long long) pagesize; } static inline int gettid(void) @@ -185,13 +179,18 @@ static inline int fio_setaffinity(int pid, os_cpu_mask_t cpumask) h = OpenThread(THREAD_QUERY_INFORMATION | THREAD_SET_INFORMATION, TRUE, pid); if (h != NULL) { bSuccess = SetThreadAffinityMask(h, cpumask); + if (!bSuccess) + log_err("fio_setaffinity failed: failed to set thread affinity (pid %d, mask %.16llx)\n", pid, cpumask); + CloseHandle(h); + } else { + log_err("fio_setaffinity failed: failed to get handle for pid %d\n", pid); } return (bSuccess)? 0 : -1; } -static inline void fio_getaffinity(int pid, os_cpu_mask_t *mask) +static inline int fio_getaffinity(int pid, os_cpu_mask_t *mask) { os_cpu_mask_t systemMask; @@ -202,7 +201,10 @@ static inline void fio_getaffinity(int pid, os_cpu_mask_t *mask) CloseHandle(h); } else { log_err("fio_getaffinity failed: failed to get handle for pid %d\n", pid); + return -1; } + + return 0; } static inline void fio_cpu_clear(os_cpu_mask_t *mask, int cpu) @@ -212,7 +214,17 @@ static inline void fio_cpu_clear(os_cpu_mask_t *mask, int cpu) static inline void fio_cpu_set(os_cpu_mask_t *mask, int cpu) { - *mask |= 1 << (cpu-1); + *mask |= 1 << cpu; +} + +static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu) +{ + return (*mask & (1U << cpu)); +} + +static inline int fio_cpu_count(os_cpu_mask_t *mask) +{ + return hweight64(*mask); } static inline int fio_cpuset_init(os_cpu_mask_t *mask) @@ -226,7 +238,7 @@ static inline int fio_cpuset_exit(os_cpu_mask_t *mask) return 0; } -static inline int init_random_state(struct thread_data *td, unsigned long *rand_seeds, int size) +static inline int init_random_seeds(unsigned long *rand_seeds, int size) { HCRYPTPROV hCryptProv; @@ -245,9 +257,15 @@ static inline int init_random_state(struct thread_data *td, unsigned long *rand_ } CryptReleaseContext(hCryptProv, 0); - td_fill_rand_seeds(td); return 0; } +static inline int fio_set_sched_idle(void) +{ + /* SetThreadPriority returns nonzero for success */ + return (SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_IDLE))? 0 : -1; +} + + #endif /* FIO_OS_WINDOWS_H */