Quick Search:

Context

Displaying 3 lines either side each change. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace: Expand:

Diff

1.159.8.8.2.2
  
1.159.8.8.2.3
  
Orange-Migrate-Tools:wligon:20100730175907
  
pvfs2-req-proto.h
_>8484     PVFS_SERV_TREE_REMOVE = 41,
 8585     PVFS_SERV_TREE_GET_FILE_SIZE = 42,
 8686     PVFS_SERV_MGMT_MIGRATE = 43,
<> 87+    PVFS_SERV_MIGRATE_CREATE = 44,
8788     /* leave this entry last */
 8889     PVFS_SERV_NUM_OPS
 8990 };
      
 !
 
…
19071908 /* copy a single object and move to another server*/     
 19081909 
 19091910 struct PVFS_servreq_mgmt_migrate{
<> 1911+    char *dest_server;
19101912     PVFS_handle handle;
 19111913     PVFS_fs_id fs_id;
<>1912 -    char *dist_server;
19131914 };
 19141915 
 19151916 endecode_fields_3_struct(
 19161917      PVFS_servreq_mgmt_migrate,
<> 1918+     string, dest_server,
19171919      PVFS_handle, handle,
<>1918 -     PVFS_fs_id, fs_id,
 1919 -     string , dist_server );
  1920+     PVFS_fs_id, fs_id);
19201921 
<> 1922+#define extra_size_PVFS_servreq_migrate \
  1923+    roundup8(PVFS_REQ_LIMIT_SEGMENT_BYTES+1)
  1924+
19211925 #define PINT_SERVREQ_MGMT_MIGRATE_FILL(__req,        \
 19221926                                      __creds,        \
 19231927                                      __fsid,         \
 19241928                                      __handle,       \
<>1925 -                                     __dist_ser,     \
  1929+                                     __dest_server,  \
19261930                                      __hints)        \
 19271931 do{                                                  \
 19281932     memset(&(__req), 0, sizeof(__req));              \
      
 !
 
…
19311935     (__req).hints = (__hints);                       \
 19321936     (__req).u.mgmt_migrate.handle = (__handle);      \
 19331937     (__req).u.mgmt_migrate.fs_id = (__fsid);         \
<>1934 -    (__req).u.mgmt_migrate.dist_server = (__dist_ser); \
 1935 -} while(0);
  1938+    (__req).u.mgmt_migrate.dest_server = __dest_server; \
  1939+} while(0)
19361940 
<>1937 - 
 1938 -                                        
  1941+/**************************************************************************/
  1942+/*migrate-create*/
19391943 
<> 1944+struct PVFS_servreq_migrate_create
  1945+{
  1946+    int32_t mask;
  1947+    PVFS_ds_keyval *val;
  1948+    PVFS_ds_keyval *key;
  1949+    int32_t nkey;
  1950+    PVFS_fs_id fs_id;
  1951+    PVFS_handle handle;
  1952+    PVFS_object_attr attr;
  1953+};
19401954 
<> 1955+endecode_fields_4aa_struct(
  1956+    PVFS_servreq_migrate_create,
  1957+    PVFS_handle, handle,
  1958+    PVFS_fs_id, fs_id,
  1959+    int32_t, mask,
  1960+    PVFS_object_attr, attr,
  1961+    int32_t, nkey,
  1962+    PVFS_ds_keyval, key,
  1963+    PVFS_ds_keyval, val);
  1964+
  1965+#define extra_size_PVFS_servreq_migrate_create \
  1966+        ((PVFS_REQ_LIMIT_KEY_LEN + PVFS_REQ_LIMIT_VAL_LEN) \
  1967+        * PVFS_REQ_LIMIT_KEYVAL_LIST)
  1968+
  1969+#define PINT_SERVREQ_MIGRATE_CREATE_FILL(__req,     \
  1970+                                         __creds,   \
  1971+                                         __fs_id,   \
  1972+                                         __handle,  \
  1973+                                         __mask,    \
  1974+                                         __attr,    \
  1975+                                         __key,     \
  1976+                                         __val,     \
  1977+                                         __nkey,    \
  1978+                                         __hints)   \
  1979+do{                                                 \
  1980+    memset(&(__req), 0, sizeof(__req));             \
  1981+    (__req).op = PVFS_SERV_MIGRATE_CREATE;          \
  1982+    (__req).credentials = (__creds);                \
  1983+    (__req).hints = (__hints);                      \
  1984+    (__req).u.migrate_create.fs_id = (__fs_id);     \
  1985+    (__req).u.migrate_create.handle = (__handle);   \
  1986+    (__req).u.migrate_create.attr = (__attr);       \
  1987+    (__req).u.migrate_create.nkey = (__nkey);       \
  1988+    (__req).u.migrate_create.mask = (__mask);       \
  1989+    (__req).u.migrate_create.key = (__key);         \
  1990+    (__req).u.migrate_create.val = (__val);         \
  1991+}while(0)
  1992+
  1993+
  1994+    
  1995+/* Types for mask used for migrate_create.sm */   
  1996+#define MIGRATE_CREATE (1 << 0)
  1997+#define MIGRATE_STORE  (1 << 1)
  1998+
  1999+                                     
  2000+struct PVFS_servresp_migrate_create
  2001+{
  2002+    PVFS_handle new_handle;
  2003+};
  2004+
  2005+endecode_fields_1_struct(
  2006+    PVFS_servresp_migrate_create,
  2007+    PVFS_handle, new_handle);
  2008+
  2009+
  2010+/****************************************************************/
  2011+
  2012+
19412013 /* server request *********************************************/
 19422014 /* - generic request with union of all op specific structs */
 19432015 
      
 !
 
…
19842056         struct PVFS_servreq_tree_remove tree_remove;
 19852057         struct PVFS_servreq_tree_get_file_size tree_get_file_size;
 19862058         struct PVFS_servreq_mgmt_migrate mgmt_migrate;
<> 2059+        struct PVFS_servreq_migrate_create migrate_create;
19872060     } u;
 19882061 };
 19892062 #ifdef __PINT_REQPROTO_ENCODE_FUNCS_C
      
 !
 
…
20392112         struct PVFS_servresp_small_io small_io;
 20402113         struct PVFS_servresp_listattr listattr;
 20412114         struct PVFS_servresp_tree_get_file_size tree_get_file_size;
<> 2115+        struct PVFS_servresp_migrate_create migrate_create;
<_20422116     } u;
 20432117 };
 20442118 endecode_fields_2_struct(