windows: prepare for Windows build split

[fio.git] / os / windows / posix.c

diff --git a/os/windows/posix.c b/os/windows/posix.c
index bbd93e979522e098d9a438e0ccfdc10da0b89ec0..ecc8c40885fc622c43537869f85ea9ec007d2a78 100755 (executable)
--- a/os/windows/posix.c
+++ b/os/windows/posix.c
@@ -18,15 +18,15 @@
 #include <sys/mman.h>
 #include <sys/uio.h>
 #include <sys/resource.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/wait.h>
 #include <setjmp.h>
 
 #include "../os-windows.h"
 #include "../../lib/hweight.h"
 
-extern unsigned long mtime_since_now(struct timeval *);
-extern void fio_gettime(struct timeval *, void *);
+extern unsigned long mtime_since_now(struct timespec *);
+extern void fio_gettime(struct timespec *, void *);
 
 /* These aren't defined in the MinGW headers */
 HRESULT WINAPI StringCchCopyA(
@@ -40,12 +40,6 @@ HRESULT WINAPI StringCchPrintfA(
   const char *pszFormat,
   ...);
 
-int vsprintf_s(
-  char *buffer,
-  size_t numberOfElements,
-  const char *format,
-  va_list argptr);
-
 int win_to_posix_error(DWORD winerr)
 {
        switch (winerr)
@@ -234,12 +228,14 @@ void Time_tToSystemTime(time_t dosTime, SYSTEMTIME *systemTime)
 {
     FILETIME utcFT;
     LONGLONG jan1970;
+       SYSTEMTIME tempSystemTime;
 
     jan1970 = Int32x32To64(dosTime, 10000000) + 116444736000000000;
     utcFT.dwLowDateTime = (DWORD)jan1970;
     utcFT.dwHighDateTime = jan1970 >> 32;
 
-    FileTimeToSystemTime((FILETIME*)&utcFT, systemTime);
+    FileTimeToSystemTime((FILETIME*)&utcFT, &tempSystemTime);
+       SystemTimeToTzSpecificLocalTime(NULL, &tempSystemTime, systemTime);
 }
 
 char* ctime_r(const time_t *t, char *buf)
@@ -304,35 +300,76 @@ void *mmap(void *addr, size_t len, int prot, int flags,
                int fildes, off_t off)
 {
        DWORD vaProt = 0;
+       DWORD mapAccess = 0;
+       DWORD lenlow;
+       DWORD lenhigh;
+       HANDLE hMap;
        void* allocAddr = NULL;
 
        if (prot & PROT_NONE)
                vaProt |= PAGE_NOACCESS;
 
-       if ((prot & PROT_READ) && !(prot & PROT_WRITE))
+       if ((prot & PROT_READ) && !(prot & PROT_WRITE)) {
                vaProt |= PAGE_READONLY;
+               mapAccess = FILE_MAP_READ;
+       }
 
-       if (prot & PROT_WRITE)
+       if (prot & PROT_WRITE) {
                vaProt |= PAGE_READWRITE;
+               mapAccess |= FILE_MAP_WRITE;
+       }
+
+       lenlow = len & 0xFFFF;
+       lenhigh = len >> 16;
+       /* If the low DWORD is zero and the high DWORD is non-zero, `CreateFileMapping`
+          will return ERROR_INVALID_PARAMETER. To avoid this, set both to zero. */
+       if (lenlow == 0) {
+               lenhigh = 0;
+       }
 
-       if ((flags & MAP_ANON) | (flags & MAP_ANONYMOUS))
+       if (flags & MAP_ANON || flags & MAP_ANONYMOUS)
        {
                allocAddr = VirtualAlloc(addr, len, MEM_COMMIT, vaProt);
                if (allocAddr == NULL)
                        errno = win_to_posix_error(GetLastError());
        }
+       else
+       {
+               hMap = CreateFileMapping((HANDLE)_get_osfhandle(fildes), NULL, vaProt, lenhigh, lenlow, NULL);
+
+               if (hMap != NULL)
+               {
+                       allocAddr = MapViewOfFile(hMap, mapAccess, off >> 16, off & 0xFFFF, len);
+               }
+
+               if (hMap == NULL || allocAddr == NULL)
+                       errno = win_to_posix_error(GetLastError());
+
+       }
 
        return allocAddr;
 }
 
 int munmap(void *addr, size_t len)
 {
-       if (!VirtualFree(addr, 0, MEM_RELEASE)) {
-               errno = win_to_posix_error(GetLastError());
-               return -1;
+       BOOL success;
+
+       /* We may have allocated the memory with either MapViewOfFile or
+                VirtualAlloc. Therefore, try calling UnmapViewOfFile first, and if that
+                fails, call VirtualFree. */
+       success = UnmapViewOfFile(addr);
+
+       if (!success)
+       {
+               success = VirtualFree(addr, 0, MEM_RELEASE);
        }
 
-       return 0;
+       return !success;
+}
+
+int msync(void *addr, size_t len, int flags)
+{
+       return !FlushViewOfFile(addr, len);
 }
 
 int fork(void)
@@ -549,7 +586,8 @@ char *basename(char *path)
        while (path[i] != '\\' && path[i] != '/' && i >= 0)
                i--;
 
-       strncpy(name, path + i + 1, MAX_PATH);
+       name[MAX_PATH - 1] = '\0';
+       strncpy(name, path + i + 1, MAX_PATH - 1);
 
        return name;
 }
@@ -702,17 +740,9 @@ int getrusage(int who, struct rusage *r_usage)
 
 int posix_madvise(void *addr, size_t len, int advice)
 {
-       log_err("%s is not implemented\n", __func__);
        return ENOSYS;
 }
 
-/* Windows doesn't support advice for memory pages. Just ignore it. */
-int msync(void *addr, size_t len, int flags)
-{
-       errno = ENOSYS;
-       return -1;
-}
-
 int fdatasync(int fildes)
 {
        return fsync(fildes);
@@ -825,7 +855,7 @@ int poll(struct pollfd fds[], nfds_t nfds, int timeout)
 
 int nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
 {
-       struct timeval tv;
+       struct timespec tv;
        DWORD ms_remaining;
        DWORD ms_total = (rqtp->tv_sec * 1000) + (rqtp->tv_nsec / 1000000.0);