Changeset 7968 for branches/Orange-Branch/src/proto/pvfs2-attr.h

Timestamp:

09/03/09 17:24:49 (4 years ago)

Author:

bligon

Message:

Merge of Orange-Branch, Orange-FailOver?-Becky, and version 1.164 of sys-io.sm (do not unstuff on a read).
This version of Orange-FailOver?-Becky supports failover for large files only. The next iteration will
support small-io failover.

Files:

• branches/Orange-Branch/src/proto/pvfs2-attr.h (modified) (6 diffs)

branches/Orange-Branch/src/proto/pvfs2-attr.h

@@ -36 +36 @@
 
 /* internal attribute masks for metadata objects */
-#define PVFS_ATTR_META_DIST    (1 << 10)
-#define PVFS_ATTR_META_DFILES  (1 << 11)
+#define PVFS_ATTR_META_DIST          (1 << 10)
+#define PVFS_ATTR_META_DFILES        (1 << 11)
+#define PVFS_ATTR_META_MIRROR_DFILES (1 << 13)
 #define PVFS_ATTR_META_ALL \
-(PVFS_ATTR_META_DIST | PVFS_ATTR_META_DFILES)
+(PVFS_ATTR_META_DIST | PVFS_ATTR_META_DFILES | PVFS_ATTR_META_MIRROR_DFILES)
 
 #define PVFS_ATTR_META_UNSTUFFED (1 << 12)
+
 
 /* internal attribute masks for datafile objects */
@@ -59 +61 @@
 /* attributes that do not change once set */
 #define PVFS_STATIC_ATTR_MASK \
-(PVFS_ATTR_COMMON_TYPE|PVFS_ATTR_META_DIST|PVFS_ATTR_META_DFILES|PVFS_ATTR_META_UNSTUFFED)
+(PVFS_ATTR_COMMON_TYPE|PVFS_ATTR_META_DIST|PVFS_ATTR_META_DFILES|PVFS_ATTR_META_MIRROR_DFILES|PVFS_ATTR_META_UNSTUFFED)
 
 /* extended hint attributes for a metafile object */
@@ -83 +85 @@
     uint32_t dfile_count;
 
+    /* list of mirrored datafiles */
+    PVFS_handle *mirror_dfile_array;
+    uint32_t mirror_copies_count;
+
     int32_t stuffed_size;
 
@@ -96 +102 @@
     (x)->dist_size = PINT_DIST_PACK_SIZE((x)->dist); \
 } while (0)
-#define encode_PVFS_metafile_attr_dfiles(pptr,x) do { int dfiles_i; \
-    encode_uint32_t(pptr, &(x)->dfile_count); \
-    encode_skip4(pptr,); \
-    for (dfiles_i=0; dfiles_i<(x)->dfile_count; dfiles_i++) \
-        encode_PVFS_handle(pptr, &(x)->dfile_array[dfiles_i]); \
-    encode_PVFS_metafile_hint(pptr, &(x)->hint); \
-} while (0)
-#define decode_PVFS_metafile_attr_dfiles(pptr,x) do { int dfiles_i; \
-    decode_uint32_t(pptr, &(x)->dfile_count); \
-    decode_skip4(pptr,); \
-    (x)->dfile_array = decode_malloc((x)->dfile_count \
-      * sizeof(*(x)->dfile_array)); \
-    for (dfiles_i=0; dfiles_i<(x)->dfile_count; dfiles_i++) \
-        decode_PVFS_handle(pptr, &(x)->dfile_array[dfiles_i]); \
-    decode_PVFS_metafile_hint(pptr, &(x)->hint); \
+#define encode_PVFS_metafile_attr_mirror_dfiles(pptr,x) do {            \
+  int dfiles_i, copy_i, handle_i;                                       \
+  encode_uint32_t(pptr, &(x)->mirror_copies_count);                     \
+  encode_skip4(pptr,);                                                  \
+  for (copy_i=0; copy_i<(x)->mirror_copies_count; copy_i++)             \
+    for (dfiles_i=0; dfiles_i<(x)->dfile_count; dfiles_i++)             \
+    {                                                                   \
+       handle_i = (copy_i * (x)->dfile_count) + dfiles_i;               \
+       encode_PVFS_handle(pptr, &(x)->mirror_dfile_array[handle_i]);    \
+    }                                                                   \
+} while (0)
+#define decode_PVFS_metafile_attr_mirror_dfiles(pptr,x) do {            \
+  int dfiles_i, copy_i, handle_i;                                       \
+  decode_uint32_t(pptr, &(x)->mirror_copies_count);                     \
+  decode_skip4(pptr,);                                                  \
+  (x)->mirror_dfile_array = decode_malloc((x)->dfile_count         *    \
+                                          (x)->mirror_copies_count *    \
+                                          sizeof(PVFS_handle));         \
+  for (copy_i=0; copy_i<(x)->mirror_copies_count; copy_i++)             \
+    for (dfiles_i=0; dfiles_i<(x)->dfile_count; dfiles_i++)             \
+    {                                                                   \
+       handle_i = (copy_i * (x)->dfile_count) + dfiles_i;               \
+       decode_PVFS_handle(pptr, &(x)->mirror_dfile_array[handle_i]);    \
+    }                                                                   \
+} while (0)
+#define encode_PVFS_metafile_attr_dfiles(pptr,x) do {                   \
+    int dfiles_i;                                                       \
+    encode_uint32_t(pptr, &(x)->dfile_count);                           \
+    encode_skip4(pptr,);                                                \
+    for (dfiles_i=0; dfiles_i<(x)->dfile_count; dfiles_i++)             \
+        encode_PVFS_handle(pptr, &(x)->dfile_array[dfiles_i]);          \
+    encode_PVFS_metafile_hint(pptr, &(x)->hint);                        \
+} while (0)
+#define decode_PVFS_metafile_attr_dfiles(pptr,x) do {                     \
+    int dfiles_i;                                                         \
+    decode_uint32_t(pptr, &(x)->dfile_count);                             \
+    decode_skip4(pptr,);                                                  \
+    (x)->dfile_array = decode_malloc((x)->dfile_count                     \
+      * sizeof(*(x)->dfile_array));                                       \
+    for (dfiles_i=0; dfiles_i<(x)->dfile_count; dfiles_i++)               \
+        decode_PVFS_handle(pptr, &(x)->dfile_array[dfiles_i]);            \
+    decode_PVFS_metafile_hint(pptr, &(x)->hint);                          \
 } while (0)
 #endif
@@ -221 +254 @@
     if ((x)->mask & PVFS_ATTR_META_DFILES) \
         encode_PVFS_metafile_attr_dfiles(pptr, &(x)->u.meta); \
+    if ((x)->mask & PVFS_ATTR_META_MIRROR_DFILES) \
+        encode_PVFS_metafile_attr_mirror_dfiles(pptr, &(x)->u.meta); \
     if ((x)->mask & PVFS_ATTR_DATA_SIZE) \
         encode_PVFS_datafile_attr(pptr, &(x)->u.data); \
     if ((x)->mask & PVFS_ATTR_SYMLNK_TARGET) \
         encode_PVFS_symlink_attr(pptr, &(x)->u.sym); \
-    if (((x)->mask & PVFS_ATTR_DIR_DIRENT_COUNT) || ((x)->mask & PVFS_ATTR_DIR_HINT)) \
+    if (((x)->mask & PVFS_ATTR_DIR_DIRENT_COUNT) || \
+        ((x)->mask & PVFS_ATTR_DIR_HINT)) \
         encode_PVFS_directory_attr(pptr, &(x)->u.dir); \
 } while (0)
@@ -248 +284 @@
     if ((x)->mask & PVFS_ATTR_META_DFILES) \
         decode_PVFS_metafile_attr_dfiles(pptr, &(x)->u.meta); \
+    if ((x)->mask & PVFS_ATTR_META_MIRROR_DFILES) \
+        decode_PVFS_metafile_attr_mirror_dfiles(pptr, &(x)->u.meta); \
     if ((x)->mask & PVFS_ATTR_DATA_SIZE) \
         decode_PVFS_datafile_attr(pptr, &(x)->u.data); \
     if ((x)->mask & PVFS_ATTR_SYMLNK_TARGET) \
         decode_PVFS_symlink_attr(pptr, &(x)->u.sym); \
-    if (((x)->mask & PVFS_ATTR_DIR_DIRENT_COUNT) || ((x)->mask & PVFS_ATTR_DIR_HINT)) \
+    if (((x)->mask & PVFS_ATTR_DIR_DIRENT_COUNT) || \
+        ((x)->mask & PVFS_ATTR_DIR_HINT)) \
         decode_PVFS_directory_attr(pptr, &(x)->u.dir); \
 } while (0)
 #endif
-/* attr buffer needs room for larger of symlink path, meta fields or dir hints: an attrib
- * structure can never hold information for not more than a symlink or a metafile or a dir object */
+/* attr buffer needs room for larger of symlink path, meta fields or 
+ * dir hints: an attrib structure can never hold information for not more 
+ * than a symlink or a metafile or a dir object 
+*/
 #define extra_size_PVFS_object_attr_dir  (PVFS_REQ_LIMIT_DIST_BYTES + \
   PVFS_REQ_LIMIT_DIST_NAME + roundup8(sizeof(PVFS_directory_attr)))
 
-/* room for distribution, stuffed_size, and dfile array */
+/* room for distribution, stuffed_size, dfile array, and mirror_dfile_array */
 #define extra_size_PVFS_object_attr_meta (PVFS_REQ_LIMIT_DIST_BYTES + \
-  sizeof(int32_t) + \
-  PVFS_REQ_LIMIT_DFILE_COUNT * sizeof(PVFS_handle)) 
+  sizeof(int32_t) +                                                   \
+  (PVFS_REQ_LIMIT_DFILE_COUNT * sizeof(PVFS_handle)) +                \
+  (PVFS_REQ_LIMIT_MIRROR_DFILE_COUNT * sizeof(PVFS_handle))) 
 
 #define extra_size_PVFS_object_attr_symlink (PVFS_REQ_LIMIT_PATH_NAME_BYTES)