Author: adrian.chadd
Date: Fri Mar 27 17:06:44 2009
New Revision: 13873
Modified:
branches/LUSCA_HEAD/src/fs/aufs/store_dir_aufs.c
branches/LUSCA_HEAD/src/fs/aufs/store_io_aufs.c
Log:
Commit #2 - disable building the async io bits. This doesn't include extra
logic for COSS, nor does it yet register for the async io statistics.
I'll do that next.
Modified: branches/LUSCA_HEAD/src/fs/aufs/store_dir_aufs.c
==============================================================================
--- branches/LUSCA_HEAD/src/fs/aufs/store_dir_aufs.c (original)
+++ branches/LUSCA_HEAD/src/fs/aufs/store_dir_aufs.c Fri Mar 27 17:06:44
2009
@@ -35,7 +35,7 @@
#include "squid.h"
-#include "async_io.h"
+#include "../../libasyncio/async_io.h"
#include "store_asyncufs.h"
#define DefaultLevelOneDirs 16
@@ -117,6 +117,7 @@
static void storeAufsDirStats(SwapDir *, StoreEntry *);
static void storeAufsDirInitBitmap(SwapDir *);
static int storeAufsDirValidFileno(SwapDir *, sfileno, int);
+static void storeAufsSync(SwapDir *);
/* The MAIN externally visible function */
STSETUP storeFsSetup_aufs;
@@ -1845,6 +1846,12 @@
return 0;
}
+static void
+storeAufsSync(SwapDir * sd)
+{
+ aioSync();
+}
+
/*
* storeAufsDirParse *
* Called when a *new* fs is being setup.
@@ -1897,7 +1904,7 @@
sd->refobj = storeAufsDirRefObj;
sd->unrefobj = storeAufsDirUnrefObj;
sd->callback = NULL;
- sd->sync = aioSync;
+ sd->sync = storeAufsSync;
sd->obj.create = storeAufsCreate;
sd->obj.open = storeAufsOpen;
sd->obj.close = storeAufsClose;
Modified: branches/LUSCA_HEAD/src/fs/aufs/store_io_aufs.c
==============================================================================
--- branches/LUSCA_HEAD/src/fs/aufs/store_io_aufs.c (original)
+++ branches/LUSCA_HEAD/src/fs/aufs/store_io_aufs.c Fri Mar 27 17:06:44 2009
@@ -33,7 +33,7 @@
*/
#include "squid.h"
-#include "async_io.h"
+#include "../../libasyncio/async_io.h"
#include "store_asyncufs.h"
#if ASYNC_READ
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
