Author: adrian.chadd
Date: Sun May  3 16:06:23 2009
New Revision: 14034

Added:
    branches/LUSCA_HEAD/src/fs/aufs/store_rebuild_aufs.h
Modified:
    branches/LUSCA_HEAD/src/fs/aufs/store_dir_aufs.c

Log:
Break out the rebuild state stuff.



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    Sun May  3 16:06:23  
2009
@@ -38,33 +38,11 @@
  #include "../../libasyncio/aiops.h"
  #include "../../libasyncio/async_io.h"
  #include "store_asyncufs.h"
+#include "store_rebuild_aufs.h"

  #define DefaultLevelOneDirs     16
  #define DefaultLevelTwoDirs     256
  #define STORE_META_BUFSZ 4096
-
-typedef struct _RebuildState RebuildState;
-struct _RebuildState {
-    SwapDir *sd;
-    int n_read;
-    int log_fd;
-    int speed;
-    int curlvl1;
-    int curlvl2;
-    struct {
-       unsigned int clean:1;
-       unsigned int init:1;
-       unsigned int old_swaplog_entry_size:1;
-    } flags;
-    int done;
-    int in_dir;
-    int fn;
-    struct dirent *entry;
-    DIR *td;
-    char fullpath[SQUID_MAXPATHLEN];
-    char fullfilename[SQUID_MAXPATHLEN];
-    struct _store_rebuild_data counts;
-};

  int n_asyncufs_dirs = 0;
  static int *asyncufs_dir_index = NULL;

Added: branches/LUSCA_HEAD/src/fs/aufs/store_rebuild_aufs.h
==============================================================================
--- (empty file)
+++ branches/LUSCA_HEAD/src/fs/aufs/store_rebuild_aufs.h        Sun May  3  
16:06:23 2009
@@ -0,0 +1,29 @@
+#ifndef        __STORE_REBUILD_AUFS_H__
+#define        __STORE_REBUILD_AUFS_H__
+
+typedef struct _RebuildState RebuildState;
+struct _RebuildState {
+    SwapDir *sd;
+    int n_read;
+    int log_fd;
+    int speed;
+    int curlvl1;
+    int curlvl2;
+    struct {
+        unsigned int clean:1;
+        unsigned int init:1;
+        unsigned int old_swaplog_entry_size:1;
+    } flags;
+    int done;
+    int in_dir;
+    int fn;
+    struct dirent *entry;
+    DIR *td;
+    char fullpath[SQUID_MAXPATHLEN];
+    char fullfilename[SQUID_MAXPATHLEN];
+    struct _store_rebuild_data counts;
+};
+
+
+
+#endif

--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to