Import of fix-ranges branch

[thirdparty/squid.git] / src / fs / aufs / async_io.cc

diff --git a/src/fs/aufs/async_io.cc b/src/fs/aufs/async_io.cc
index fe8d3854b86883aa654c928654f0139c46aedad5..02fe2020f2a75cb47592fb236e3971c62d862909 100644 (file)
--- a/src/fs/aufs/async_io.cc
+++ b/src/fs/aufs/async_io.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: async_io.cc,v 1.19 2002/11/15 13:16:31 hno Exp $
+ * $Id: async_io.cc,v 1.22 2003/01/23 00:38:09 robertc Exp $
  *
  * DEBUG: section 32    Asynchronous Disk I/O
  * AUTHOR: Pete Bentley <pete@demon.net>
@@ -37,6 +37,7 @@
 #include "squid.h"
 #include "store_asyncufs.h"
 #include "Store.h"
+#include "fde.h"
 
 #define _AIO_OPEN      0
 #define _AIO_READ      1
@@ -95,6 +96,7 @@ aioFDWasClosed(int fd)
        fd_close(fd);
 }
 
+
 void
 aioInit(void)
 {
@@ -104,7 +106,6 @@ aioInit(void)
     cachemgrRegister("squidaio_counts", "Async IO Function Counters",
        aioStats, 0, 1);
     initialised = 1;
-    comm_quick_poll_required();
 }
 
 void
@@ -293,7 +294,7 @@ aioTruncate(const char *path, off_t length, AIOCB * callback, void *callback_dat
 
 
 int
-aioCheckCallbacks(SwapDir * SD)
+AUFSSwapDir::callback()
 {
     squidaio_result_t *resultp;
     squidaio_ctrl_t *ctrlp;
@@ -380,14 +381,14 @@ aioStats(StoreEntry * sentry)
 
 /* Flush all pending I/O */
 void
-aioSync(SwapDir * SD)
+AUFSSwapDir::sync()
 {
     if (!initialised)
        return;                 /* nothing to do then */
     /* Flush all pending operations */
     debug(32, 1) ("aioSync: flushing pending I/O operations\n");
     do {
-       aioCheckCallbacks(SD);
+       callback();
     } while (squidaio_sync());
     debug(32, 1) ("aioSync: done\n");
 }