Windows: Record callback issued time

[openafs.git] / src / WINNT / afsd / cm_memmap.h

diff --git a/src/WINNT/afsd/cm_memmap.h b/src/WINNT/afsd/cm_memmap.h
index 8c373da..b21a15f 100644 (file)
--- a/src/WINNT/afsd/cm_memmap.h
+++ b/src/WINNT/afsd/cm_memmap.h
@@ -1,7 +1,7 @@
 /*
- * Copyright 2004, Secure Endpoints Inc.
+ * Copyright 2004-2011, Secure Endpoints Inc.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
@@ -10,7 +10,7 @@
 #ifndef CM_MEMMAP_H
 #define CM_MEMMAP_H 1
 
-#define CM_CONFIG_DATA_VERSION  7
+#define CM_CONFIG_DATA_VERSION  20
 #define CM_CONFIG_DATA_MAGIC            ('A' | 'F'<<8 | 'S'<<16 | CM_CONFIG_DATA_VERSION<<24)
 
 typedef struct cm_config_data {
@@ -26,7 +26,7 @@ typedef struct cm_config_data {
     afs_uint32          dirty;
 
     cm_volume_t *       volumeBaseAddress;
-    cm_cell_t   *       cellBaseAddress; 
+    cm_cell_t   *       cellBaseAddress;
     cm_aclent_t *       aclBaseAddress;
     cm_scache_t *       scacheBaseAddress;
     cm_nc_t     *       dnlcBaseAddress;
@@ -49,6 +49,7 @@ typedef struct cm_config_data {
     cm_scache_t *       rootSCachep;
     cm_scache_t         fakeSCache;
     afs_uint64          fakeDirVersion;
+    afs_uint32          fakeUnique;
 
     cm_aclent_t *       aclLRUp;
     cm_aclent_t        *       aclLRUEndp;
@@ -76,23 +77,36 @@ typedef struct cm_config_data {
 
     cm_nc_t    *       ncfreelist;
     cm_nc_t    *       nameCache;
-    cm_nc_t    **      nameHash; 
+    cm_nc_t    **      nameHash;
 
     cm_buf_t   *       buf_freeListp;
     cm_buf_t    *       buf_freeListEndp;
     cm_buf_t   *       buf_dirtyListp;
     cm_buf_t    *       buf_dirtyListEndp;
+    cm_buf_t    *       buf_redirListp;
+    cm_buf_t    *       buf_redirListEndp;
     cm_buf_t   **      buf_scacheHashTablepp;
     cm_buf_t   **      buf_fileHashTablepp;
     cm_buf_t   *       buf_allp;
-    afs_uint64         buf_nbuffers;
     afs_uint32         buf_blockSize;
     afs_uint32         buf_hashSize;
+#ifdef _M_IX86
+    afs_uint32         buf_nbuffers;
+    afs_uint32         buf_nOrigBuffers;
+    afs_uint32          buf_reservedBufs;
+    afs_uint32          buf_maxReservedBufs;
+    afs_uint32          buf_reserveWaiting;
+    afs_uint32          buf_freeCount;
+    afs_uint32          buf_redirCount;
+#else
+    afs_uint64         buf_nbuffers;
     afs_uint64         buf_nOrigBuffers;
     afs_uint64          buf_reservedBufs;
     afs_uint64          buf_maxReservedBufs;
     afs_uint64          buf_reserveWaiting;
-
+    afs_uint64          buf_freeCount;
+    afs_uint64          buf_redirCount;
+#endif
     time_t              mountRootGen;
     afsUUID             Uuid;
     DWORD              volSerialNumber;