Get rid of fallocate on Windows

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

diff --git a/os/windows/posix.c b/os/windows/posix.c
index 8b451478dec79e142397572c2cd6943142255a33..de679111aaa300e36918fe58aa35a263ccca0546 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:
@@ -375,53 +408,6 @@ char *basename(char *path)
        return name;
 }
 
-int posix_fallocate(int fd, off_t offset, off_t len)
-{
-       const int BUFFER_SIZE = 256 * 1024;
-       int rc = 0;
-       char *buf;
-       unsigned int write_len;
-       unsigned int bytes_written;
-       off_t bytes_remaining = len;
-
-       if (len == 0 || offset < 0)
-               return EINVAL;
-
-       buf = malloc(BUFFER_SIZE);
-
-       if (buf == NULL)
-               return ENOMEM;
-
-       memset(buf, 0, BUFFER_SIZE);
-
-       int64_t prev_pos = _telli64(fd);
-
-       if (_lseeki64(fd, offset, SEEK_SET) == -1)
-               return errno;
-
-       while (bytes_remaining > 0) {
-               if (bytes_remaining < BUFFER_SIZE)
-                       write_len = (unsigned int)bytes_remaining;
-               else
-                       write_len = BUFFER_SIZE;
-
-               bytes_written = _write(fd, buf, write_len);
-               if (bytes_written == -1) {
-                       rc = errno;
-                       break;
-               }
-
-               /* Don't allow Windows to cache the write: flush it to disk */
-               _commit(fd);
-
-               bytes_remaining -= bytes_written;
-       }
-
-       free(buf);
-       _lseeki64(fd, prev_pos, SEEK_SET);
-       return rc;
-}
-
 int ftruncate(int fildes, off_t length)
 {
        BOOL bSuccess;
@@ -514,11 +500,21 @@ int getrusage(int who, struct rusage *r_usage)
        const uint64_t SECONDS_BETWEEN_1601_AND_1970 = 11644473600;
        FILETIME cTime, eTime, kTime, uTime;
        time_t time;
+       HANDLE h;
 
        memset(r_usage, 0, sizeof(*r_usage));
 
-       HANDLE hProcess = GetCurrentProcess();
-       GetProcessTimes(hProcess, &cTime, &eTime, &kTime, &uTime);
+       if (who == RUSAGE_SELF) {
+               h = GetCurrentProcess();
+               GetProcessTimes(h, &cTime, &eTime, &kTime, &uTime);
+       } else if (who == RUSAGE_THREAD) {
+               h = GetCurrentThread();
+               GetThreadTimes(h, &cTime, &eTime, &kTime, &uTime);
+       } else {
+               log_err("fio: getrusage %d is not implemented\n", who);
+               return -1;
+       }
+
        time = ((uint64_t)uTime.dwHighDateTime << 32) + uTime.dwLowDateTime;
        /* Divide by 10,000,000 to get the number of seconds and move the epoch from
         * 1601 to 1970 */
@@ -595,39 +591,6 @@ long long strtoll(const char *restrict str, char **restrict endptr,
        return _strtoi64(str, endptr, base);
 }
 
-char *strsep(char **stringp, const char *delim)
-{
-       char *orig = *stringp;
-       BOOL gotMatch = FALSE;
-       int i = 0;
-       int j = 0;
-
-       if (*stringp == NULL)
-               return NULL;
-
-       while ((*stringp)[i] != '\0') {
-               j = 0;
-               while (delim[j] != '\0') {
-                       if ((*stringp)[i] == delim[j]) {
-                               gotMatch = TRUE;
-                               (*stringp)[i] = '\0';
-                               *stringp = *stringp + i + 1;
-                               break;
-                       }
-                       j++;
-               }
-               if (gotMatch)
-                       break;
-
-               i++;
-       }
-
-       if (!gotMatch)
-               *stringp = NULL;
-
-       return orig;
-}
-
 int poll(struct pollfd fds[], nfds_t nfds, int timeout)
 {
        struct timeval tv;