Revision: 14523
Author: adrian.chadd
Date: Wed Mar 31 02:11:25 2010
Log: Issue #94 - bring windows asyncio up to scratch with UNIX
This won't work for COSS. :(
http://code.google.com/p/lusca-cache/source/detail?r=14523
Modified:
/branches/LUSCA_HEAD/libasyncio/aiops_win32.c
=======================================
--- /branches/LUSCA_HEAD/libasyncio/aiops_win32.c Wed Mar 31 02:09:44 2010
+++ /branches/LUSCA_HEAD/libasyncio/aiops_win32.c Wed Mar 31 02:11:25 2010
@@ -613,7 +613,7 @@
int
-squidaio_read(int fd, char *bufp, int bufs, off_t offset, int whence,
squidaio_result_t * resultp)
+squidaio_read(int fd, char *bufp, int bufs, off_t offset,
squidaio_result_t * resultp)
{
squidaio_request_t *requestp;
@@ -622,7 +622,6 @@
requestp->bufferp = bufp;
requestp->buflen = bufs;
requestp->offset = offset;
- requestp->whence = whence;
requestp->resultp = resultp;
requestp->request_type = _AIO_OP_READ;
requestp->cancelled = 0;
@@ -635,7 +634,7 @@
static void
squidaio_do_read(squidaio_request_t * requestp)
{
- lseek(requestp->fd, requestp->offset, requestp->whence);
+ lseek(requestp->fd, requestp->offset, SEEK_SET);
if (!ReadFile((HANDLE) _get_osfhandle(requestp->fd), requestp->bufferp,
requestp->buflen, (LPDWORD) & requestp->ret, NULL)) {
WIN32_maperror(GetLastError());
@@ -646,7 +645,7 @@
int
-squidaio_write(int fd, char *bufp, int bufs, off_t offset, int whence,
squidaio_result_t * resultp)
+squidaio_write(int fd, char *bufp, int bufs, off_t offset,
squidaio_result_t * resultp)
{
squidaio_request_t *requestp;
@@ -655,7 +654,6 @@
requestp->bufferp = bufp;
requestp->buflen = bufs;
requestp->offset = offset;
- requestp->whence = whence;
requestp->resultp = resultp;
requestp->request_type = _AIO_OP_WRITE;
requestp->cancelled = 0;
@@ -669,6 +667,7 @@
squidaio_do_write(squidaio_request_t * requestp)
{
assert(requestp->offset >= 0);
+ lseek(requestp->fd, requestp->offset, SEEK_SET);
if (!WriteFile((HANDLE) _get_osfhandle(requestp->fd),
requestp->bufferp,
requestp->buflen, (LPDWORD) & requestp->ret, NULL)) {
WIN32_maperror(GetLastError());
--
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en.
