windows: use hweight64(), it's a 64-bit type

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

diff --git a/os/windows/posix.c b/os/windows/posix.c
index ce41ef8edfb75cb4df615ca5006fb39218434428..f5d530011c4f938134bc8a6f77219704a053ebce 100755 (executable)
--- a/os/windows/posix.c
+++ b/os/windows/posix.c
@@ -20,6 +20,7 @@
 #include <sys/poll.h>
 
 #include "../os-windows.h"
+#include "../../lib/hweight.h"
 
 extern unsigned long mtime_since_now(struct timeval *);
 extern void fio_gettime(struct timeval *, void *);
@@ -42,20 +43,52 @@ int vsprintf_s(
   const char *format,
   va_list argptr);
 
+int GetNumLogicalProcessors(void)
+{
+       SYSTEM_LOGICAL_PROCESSOR_INFORMATION *processor_info = NULL;
+       DWORD len = 0;
+       DWORD num_processors = 0;
+       DWORD error = 0;
+       DWORD i;
+
+       while (!GetLogicalProcessorInformation(processor_info, &len)) {
+               error = GetLastError();
+               if (error == ERROR_INSUFFICIENT_BUFFER)
+                       processor_info = malloc(len);
+               else {
+                       log_err("Error: GetLogicalProcessorInformation failed: %d\n", error);
+                       return -1;
+               }
+
+               if (processor_info == NULL) {
+                       log_err("Error: failed to allocate memory for GetLogicalProcessorInformation");
+                       return -1;
+               }
+       }
+
+       for (i = 0; i < len / sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION); i++)
+       {
+               if (processor_info[i].Relationship == RelationProcessorCore)
+                       num_processors += hweight64(processor_info[i].ProcessorMask);
+       }
+
+       free(processor_info);
+       return num_processors;
+}
+
 long sysconf(int name)
 {
-       long long val = -1;
-       DWORD len;
-       SYSTEM_LOGICAL_PROCESSOR_INFORMATION processorInfo;
+       long val = -1;
        SYSTEM_INFO sysInfo;
        MEMORYSTATUSEX status;
 
        switch (name)
        {
        case _SC_NPROCESSORS_ONLN:
-               len = sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION);
-               GetLogicalProcessorInformation(&processorInfo, &len);
-               val = len / sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION);
+               val = GetNumLogicalProcessors();
+               if (val == -1)
+                       log_err("_SC_NPROCESSORS_ONLN failed\n");
+
                break;
 
        case _SC_PAGESIZE:
@@ -234,10 +267,10 @@ void syslog(int priority, const char *message, ... /* argument */)
        va_start(v, message);
        len = _vscprintf(message, v);
        output = malloc(len + sizeof(char));
-       vsprintf_s(output, len + sizeof(char), message, v);
+       vsprintf(output, message, v);
        WriteFile(log_file, output, len, &bytes_written, NULL);
        va_end(v);
-    free(output);
+       free(output);
 }
 
 int kill(pid_t pid, int sig)
@@ -411,6 +444,9 @@ int posix_fallocate(int fd, off_t offset, off_t len)
                        break;
                }
 
+               /* Don't allow Windows to cache the write: flush it to disk */
+               _commit(fd);
+
                bytes_remaining -= bytes_written;
        }
 
@@ -532,6 +568,11 @@ int getrusage(int who, struct rusage *r_usage)
        return 0;
 }
 
+int posix_fadvise(int fd, off_t offset, off_t len, int advice)
+{
+       return 0;
+}
+
 int posix_madvise(void *addr, size_t len, int advice)
 {
        log_err("%s is not implemented\n", __func__);
@@ -628,11 +669,11 @@ int poll(struct pollfd fds[], nfds_t nfds, int timeout)
        int i;
        int rc;
 
-       if (timeout != -1)
+       if (timeout != -1) {
                to = &tv;
-
-       to->tv_sec = timeout / 1000;
-       to->tv_usec = (timeout % 1000) * 1000;
+               to->tv_sec = timeout / 1000;
+               to->tv_usec = (timeout % 1000) * 1000;
+       }
 
        FD_ZERO(&readfds);
        FD_ZERO(&writefds);
@@ -811,6 +852,7 @@ const char* inet_ntop(int af, const void *restrict src,
                errno = ENOSPC;
 
        WSACleanup();
+
        return ret;
 }