Windows fixes

Only return from fio_windowsaio_getevents if the minimum number of IOs has
completed.

Add posix_fallocate implementation to avoid extending the file during the test.

Move call to ResetEvent into windowsaio_getevents where other reset code is
located.

Fix tabs vs. spaces in windowsaio.c and the installer sources.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/engines/windowsaio.c b/engines/windowsaio.c
index 766cc5d4fe6f0b684cfb6f0921a3d4b190aa0c85..ea899698b25e1474406e3c9a1fd7e3ddcc63c5a5 100644 (file)
--- a/engines/windowsaio.c
+++ b/engines/windowsaio.c
@@ -82,16 +82,16 @@ static int fio_windowsaio_init(struct thread_data *td)
        }
 
        if (!rc) {
-           for (i = 0; i < td->o.iodepth; i++) {
-               wd->ovls[i].io_free = TRUE;
-               wd->ovls[i].io_complete = FALSE;
+               for (i = 0; i < td->o.iodepth; i++) {
+                       wd->ovls[i].io_free = TRUE;
+                       wd->ovls[i].io_complete = FALSE;
 
                        wd->ovls[i].o.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
                        if (wd->ovls[i].o.hEvent == NULL) {
                                rc = 1;
                                break;
                        }
-           }
+               }
        }
 
        if (!rc) {
@@ -287,6 +287,7 @@ static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min,
                        if (fov->io_complete) {
                                fov->io_complete = FALSE;
                                fov->io_free  = TRUE;
+                               ResetEvent(fov->o.hEvent);
                                wd->aio_events[dequeued] = io_u;
                                dequeued++;
                        }
@@ -297,7 +298,7 @@ static int fio_windowsaio_getevents(struct thread_data *td, unsigned int min,
 
                if (dequeued < min) {
                        status = WaitForSingleObject(wd->iocomplete_event, mswait);
-                       if (status != WAIT_OBJECT_0 && dequeued > 0)
+                       if (status != WAIT_OBJECT_0 && dequeued >= min)
                            break;
                }
 
@@ -322,17 +323,15 @@ static int fio_windowsaio_queue(struct thread_data *td, struct io_u *io_u)
        wd = td->io_ops->data;
 
        for (index = 0; index < td->o.iodepth; index++) {
-               if (wd->ovls[index].io_free) {
-                       wd->ovls[index].io_free = FALSE;
-                       ResetEvent(wd->ovls[index].o.hEvent);
+               if (wd->ovls[index].io_free)
                        break;
-               }
        }
 
        assert(index < td->o.iodepth);
 
-       lpOvl = &wd->ovls[index].o;
+       wd->ovls[index].io_free = FALSE;
        wd->ovls[index].io_u = io_u;
+       lpOvl = &wd->ovls[index].o;
        lpOvl->Internal = STATUS_PENDING;
        lpOvl->InternalHigh = 0;
        lpOvl->Offset = io_u->offset & 0xFFFFFFFF;

diff --git a/os/os-windows.h b/os/os-windows.h
index 06fe4335beb7bda4095dd3304c8deab454ecfb38..8b801ed5bfabf959236fbf8711060d63e5db7037 100644 (file)
--- a/os/os-windows.h
+++ b/os/os-windows.h
@@ -20,6 +20,7 @@
 #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

diff --git a/os/windows/posix.c b/os/windows/posix.c
index ba7abb54a97b6fd2473ed975bcbc58cb1f3ae05a..9ef369e1d313af14440e7f38618afddafb8322a2 100755 (executable)
--- a/os/windows/posix.c
+++ b/os/windows/posix.c
@@ -331,9 +331,43 @@ char *basename(char *path)
 
 int posix_fallocate(int fd, off_t offset, off_t len)
 {
-       log_err("%s is not implemented\n", __func__);
-       errno = ENOSYS;
-       return (-1);
+       const int BUFFER_SIZE = 64*1024*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);
+
+       if (lseek(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;
+               }
+
+               bytes_remaining -= bytes_written;
+       }
+
+       free(buf);
+       return rc;
 }
 
 int ftruncate(int fildes, off_t length)
@@ -545,7 +579,7 @@ int poll(struct pollfd fds[], nfds_t nfds, int timeout)
        int rc;
 
        if (timeout != -1)
-               to = &tv;               
+               to = &tv;
 
        to->tv_sec = timeout / 1000;
        to->tv_usec = (timeout % 1000) * 1000;
@@ -567,7 +601,7 @@ int poll(struct pollfd fds[], nfds_t nfds, int timeout)
                if (fds[i].events & POLLOUT)
                        FD_SET(fds[i].fd, &writefds);
 
-               FD_SET(fds[i].fd, &exceptfds);          
+               FD_SET(fds[i].fd, &exceptfds);
        }
 
        rc = select(nfds, &readfds, &writefds, &exceptfds, to);