Changeset 8255 for branches/Orange-Elaine-Distr-Dir-Branch/src/proto/pvfs2-attr.h

Timestamp:

03/09/10 11:16:04 (3 years ago)

Author:

elaine

Message:

*** empty log message ***

Files:

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

branches/Orange-Elaine-Distr-Dir-Branch/src/proto/pvfs2-attr.h

@@ -56 +56 @@
 #define PVFS_ATTR_DIR_DIRENT_COUNT         (1 << 19)
 #define PVFS_ATTR_DIR_HINT                  (1 << 20)
+#define PVFS_ATTR_DIR_DIRENT_FILES         (1 << 21)
 #define PVFS_ATTR_DIR_ALL \
-(PVFS_ATTR_DIR_DIRENT_COUNT | PVFS_ATTR_DIR_HINT)
+(PVFS_ATTR_DIR_DIRENT_COUNT | PVFS_ATTR_DIR_HINT | PVFS_ATTR_DIR_DIRENT_FILES)
 
 /* attributes that do not change once set */
@@ -183 +184 @@
 struct PVFS_directory_attr_s
 {
+    /* list of files to hold directory entries */
+    PVFS_handle *dirent_file_array;
+    uint32_t dirent_file_count;
     PVFS_size dirent_count;
     PVFS_directory_hint hint;
@@ -190 +194 @@
 #ifdef __PINT_REQPROTO_ENCODE_FUNCS_C
 #define encode_PVFS_directory_attr(pptr, x) do { \
+    int dirent_files_i;\
+    encode_uint32_t(pptr, &(x)->dirent_file_count);\
+    encode_skip4(pptr,);\
+    for (dirent_files_i=0; dirent_files_i<(x)->dirent_file_count; dirent_files_i++)\
+        encode_PVFS_handle(pptr, &(x)->dirent_file_array[dirent_files_i]);\
     encode_PVFS_size(pptr, &(x)->dirent_count);\
     encode_PVFS_directory_hint(pptr, &(x)->hint);\
 } while(0)
 #define decode_PVFS_directory_attr(pptr, x) do { \
+    int dirent_files_i;\
+    decode_uint32_t(pptr, &(x)->dirent_file_count);\
+    decode_skip4(pptr,);\
+    (x)->dirent_file_array = decode_malloc((x)->dirent_file_count \
+      * sizeof(*(x)->dirent_file_array));\
+    for (dirent_files_i=0; dirent_files_i<(x)->dirent_file_count; dirent_files_i++)\
+    { \
+        decode_PVFS_handle(pptr, &(x)->dirent_file_array[dirent_files_i]);\
+    } \
     decode_PVFS_size(pptr, &(x)->dirent_count);\
     decode_PVFS_directory_hint(pptr, &(x)->hint);\
 } while(0)
 #endif
+
 
 /* attributes specific to symlinks */
@@ -261 +280 @@
         encode_PVFS_symlink_attr(pptr, &(x)->u.sym); \
     if (((x)->mask & PVFS_ATTR_DIR_DIRENT_COUNT) || \
+        ((x)->mask & PVFS_ATTR_DIR_DIRENT_FILES) || \
         ((x)->mask & PVFS_ATTR_DIR_HINT)) \
         encode_PVFS_directory_attr(pptr, &(x)->u.dir); \
@@ -291 +311 @@
         decode_PVFS_symlink_attr(pptr, &(x)->u.sym); \
     if (((x)->mask & PVFS_ATTR_DIR_DIRENT_COUNT) || \
+        ((x)->mask & PVFS_ATTR_DIR_DIRENT_FILES) || \
         ((x)->mask & PVFS_ATTR_DIR_HINT)) \
         decode_PVFS_directory_attr(pptr, &(x)->u.dir); \
@@ -300 +321 @@
 */
 #define extra_size_PVFS_object_attr_dir  (PVFS_REQ_LIMIT_DIST_BYTES + \
-  PVFS_REQ_LIMIT_DIST_NAME + roundup8(sizeof(PVFS_directory_attr)))
+  PVFS_REQ_LIMIT_DIST_NAME + roundup8(sizeof(PVFS_directory_attr)) + \
+  PVFS_REQ_LIMIT_HANDLES_COUNT * sizeof(PVFS_handle))
+/*TODO: PVFS_REQ_LIMIT_HANDLES_COUNT really needs to change to something
+        indicating the max number of servers */
 
 /* room for distribution, stuffed_size, dfile array, and mirror_dfile_array */