[Pvfs2-cvs] commit by kunkel in pvfs2/include: pvfs2-encode-stubs.h
pvfs2-sysint.h pvfs2-types.h pvfs2-mgmt.h pvfs2-debug.h
CVS commit program
cvs at parl.clemson.edu
Wed May 23 16:48:27 EDT 2007
Update of /projects/cvsroot/pvfs2/include
In directory parlweb1:/tmp/cvs-serv20193/include
Modified Files:
Tag: pvfs2-kunkel-tas-branch
pvfs2-encode-stubs.h pvfs2-sysint.h pvfs2-types.h pvfs2-mgmt.h
pvfs2-debug.h
Log Message:
Merge HEAD changes to TAS-branch.
Index: pvfs2-encode-stubs.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-encode-stubs.h,v
diff -p -u -r1.12 -r1.12.20.1
--- pvfs2-encode-stubs.h 16 Jun 2006 21:01:10 -0000 1.12
+++ pvfs2-encode-stubs.h 23 May 2007 20:48:27 -0000 1.12.20.1
@@ -42,6 +42,7 @@
#define endecode_fields_4_struct(n,t1,x1,t2,x2,t3,x3,t4,x4)
#define endecode_fields_5(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5)
#define endecode_fields_5_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5)
+#define endecode_fields_6(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6)
#define endecode_fields_7_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7)
#define endecode_fields_8_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7,t8,x8)
#define endecode_fields_9_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7,t8,x8,t9,x9)
Index: pvfs2-sysint.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-sysint.h,v
diff -p -u -r1.71 -r1.71.4.1
--- pvfs2-sysint.h 26 Sep 2006 03:44:14 -0000 1.71
+++ pvfs2-sysint.h 23 May 2007 20:48:27 -0000 1.71.4.1
@@ -592,7 +592,7 @@ int PVFS_sys_wait(
const char *in_op_str,
int *out_error);
-void PVFS_sys_release(PVFS_sys_op_id op_id);
+int PVFS_sys_cancel(PVFS_sys_op_id op_id);
#endif
Index: pvfs2-types.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-types.h,v
diff -p -u -r1.137 -r1.137.2.1
--- pvfs2-types.h 11 Oct 2006 19:16:08 -0000 1.137
+++ pvfs2-types.h 23 May 2007 20:48:27 -0000 1.137.2.1
@@ -122,14 +122,14 @@ typedef uint64_t PVFS_handle;
* PVFS2 file systems reachable by a given client.
*/
typedef int32_t PVFS_fs_id;
-typedef int32_t PVFS_ds_position;
+typedef uint64_t PVFS_ds_position;
typedef int32_t PVFS_ds_flags;
#define encode_PVFS_handle encode_uint64_t
#define decode_PVFS_handle decode_uint64_t
#define encode_PVFS_fs_id encode_int32_t
#define decode_PVFS_fs_id decode_int32_t
-#define decode_PVFS_ds_position decode_int32_t
-#define encode_PVFS_ds_position encode_int32_t
+#define decode_PVFS_ds_position decode_uint64_t
+#define encode_PVFS_ds_position encode_uint64_t
/* Basic types used within metadata. */
typedef uint32_t PVFS_uid;
@@ -539,6 +539,7 @@ PVFS_error PVFS_get_errno_mapping(PVFS_e
#define PVFS_EHOSTUNREACH E(56) /* No route to host */
#define PVFS_EALREADY E(57) /* Operation already in progress */
#define PVFS_EACCES E(58) /* Access not allowed */
+#define PVFS_ECONNRESET E(59) /* Connection reset by peer */
/***************** non-errno/pvfs2 specific error codes *****************/
#define PVFS_ECANCEL (1|(PVFS_NON_ERRNO_ERROR_BIT|PVFS_ERROR_BIT))
@@ -556,7 +557,7 @@ PVFS_error PVFS_get_errno_mapping(PVFS_e
* UNIX ERRNO VALUE IN THE MACROS BELOW (USED IN
* src/common/misc/errno-mapping.c and the kernel module)
*/
-#define PVFS_ERRNO_MAX 59
+#define PVFS_ERRNO_MAX 60
#ifndef EUNATCH
#define EUNATCH -1
@@ -642,7 +643,8 @@ PVFS_error PINT_errno_mapping[PVFS_ERRNO
EHOSTDOWN, \
EHOSTUNREACH, \
EALREADY, \
- EACCES, /* 58 */ \
+ EACCES, \
+ ECONNRESET, /* 59 */ \
0 /* PVFS_ERRNO_MAX */ \
}; \
const char *PINT_non_errno_strerror_mapping[] = { \
@@ -653,7 +655,7 @@ const char *PINT_non_errno_strerror_mapp
"Unknown host", \
"No address associated with name", \
"Unknown server error", \
- "Host name lookup failure" \
+ "Host name lookup failure", \
}; \
PVFS_error PINT_non_errno_mapping[] = { \
0, /* leave this one empty */ \
@@ -663,7 +665,7 @@ PVFS_error PINT_non_errno_mapping[] = {
PVFS_EHOSTNTFD, /* 4 */ \
PVFS_EADDRNTFD, /* 5 */ \
PVFS_ENORECVR, /* 6 */ \
- PVFS_ETRYAGAIN /* 7 */ \
+ PVFS_ETRYAGAIN, /* 7 */ \
}
/*
Index: pvfs2-mgmt.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-mgmt.h,v
diff -p -u -r1.57 -r1.57.16.1
--- pvfs2-mgmt.h 30 Aug 2006 19:07:31 -0000 1.57
+++ pvfs2-mgmt.h 23 May 2007 20:48:27 -0000 1.57.16.1
@@ -359,7 +359,16 @@ int PVFS_mgmt_testsome(
int *error_code_array,
int timeout_ms);
-void PVFS_mgmt_release(PVFS_mgmt_op_id op_id);
+int PVFS_mgmt_cancel(PVFS_mgmt_op_id op_id);
+
+int PVFS_mgmt_get_config(
+ const PVFS_fs_id* fsid,
+ PVFS_BMI_addr_t* addr,
+ char* fs_buf,
+ int fs_buf_size,
+ char* server_buf,
+ int server_buf_size);
+
#endif /* __PVFS2_MGMT_H */
Index: pvfs2-debug.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-debug.h,v
diff -p -u -r1.53 -r1.53.2.1
--- pvfs2-debug.h 10 Oct 2006 18:44:24 -0000 1.53
+++ pvfs2-debug.h 23 May 2007 20:48:27 -0000 1.53.2.1
@@ -68,6 +68,9 @@
#define GOSSIP_LISTATTR_DEBUG ((uint64_t)1 << 46)
#define GOSSIP_DBPF_COALESCE_DEBUG ((uint64_t)1 << 47)
#define GOSSIP_ACCESS_HOSTNAMES ((uint64_t)1 << 48)
+#define GOSSIP_FSCK_DEBUG ((uint64_t)1 << 49)
+#define GOSSIP_BMI_DEBUG_MX ((uint64_t)1 << 50)
+#define GOSSIP_BSTREAM_DEBUG ((uint64_t)1 << 51)
/* NOTE: if you want your gossip flag to be controllable from
* pvfs2-set-debugmask you have to add it in
@@ -76,7 +79,8 @@
#define GOSSIP_BMI_DEBUG_ALL (uint64_t) \
(GOSSIP_BMI_DEBUG_TCP + GOSSIP_BMI_DEBUG_CONTROL + \
- GOSSIP_BMI_DEBUG_GM + GOSSIP_BMI_DEBUG_OFFSETS + GOSSIP_BMI_DEBUG_IB)
+ GOSSIP_BMI_DEBUG_GM + GOSSIP_BMI_DEBUG_OFFSETS + GOSSIP_BMI_DEBUG_IB \
+ + GOSSIP_BMI_DEBUG_MX)
uint64_t PVFS_debug_eventlog_to_mask(
const char *event_logging);
More information about the Pvfs2-cvs
mailing list