[PVFS2-CVS] commit by slang in pvfs2/include: pvfs2-debug.h pvfs2-encode-stubs.h pvfs2-event.h pvfs2-mgmt.h pvfs2-types.h

[CVS commit program]

Update of /anoncvs/pvfs2/include
In directory parlweb:/tmp/cvs-serv12358/include

Modified Files:
      Tag: slang-event-changes-branch
	pvfs2-debug.h pvfs2-encode-stubs.h pvfs2-event.h pvfs2-mgmt.h 
	pvfs2-types.h 
Log Message:
* added event logging for states
* moved state debug code to state-machine so all state start/end
points get debug messages automatically
* added textlog stuff.  This allows us to write the default event
queue out to a text file that can be converted to slog2 later.


Index: pvfs2-debug.h
===================================================================
RCS file: /anoncvs/pvfs2/include/pvfs2-debug.h,v
diff -p -u -r1.41 -r1.41.6.1
--- pvfs2-debug.h	27 Oct 2004 19:12:25 -0000	1.41
+++ pvfs2-debug.h	3 Jun 2005 15:18:59 -0000	1.41.6.1
@@ -54,6 +54,7 @@
 #define GOSSIP_CLIENTCORE_TIMING_DEBUG ((uint64_t)1 << 32)
 #define GOSSIP_SETATTR_DEBUG           ((uint64_t)1 << 33)
 #define GOSSIP_MKDIR_DEBUG             ((uint64_t)1 << 34)
+#define GOSSIP_EVENT_DEBUG             ((uint64_t)1 << 35)
 
 #define GOSSIP_BMI_DEBUG_ALL (uint64_t)                               \
 (GOSSIP_BMI_DEBUG_TCP + GOSSIP_BMI_DEBUG_CONTROL +                    \

Index: pvfs2-encode-stubs.h
===================================================================
RCS file: /anoncvs/pvfs2/include/pvfs2-encode-stubs.h,v
diff -p -u -r1.6 -r1.6.2.1
--- pvfs2-encode-stubs.h	31 Mar 2005 19:16:03 -0000	1.6
+++ pvfs2-encode-stubs.h	3 Jun 2005 15:18:59 -0000	1.6.2.1
@@ -42,6 +42,7 @@
 #define endecode_fields_5_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5)
 #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)
 #define endecode_fields_12(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7,t8,x8,t9,x9,t10,x10,t11,x11,t12,x12)
 
 #define endecode_fields_1a(n,t1,x1,tn1,n1,ta1,a1)

Index: pvfs2-event.h
===================================================================
RCS file: /anoncvs/pvfs2/include/pvfs2-event.h,v
diff -p -u -r1.10 -r1.10.6.1
--- pvfs2-event.h	13 Oct 2004 01:06:30 -0000	1.10
+++ pvfs2-event.h	3 Jun 2005 15:18:59 -0000	1.10.6.1
@@ -16,14 +16,15 @@
 /* different API levels where we can log events */
 enum PVFS_event_api
 {
-    PVFS_EVENT_API_JOB =   (1 << 0),
-    PVFS_EVENT_API_BMI =   (1 << 1),
-    PVFS_EVENT_API_TROVE = (1 << 2),
-    PVFS_EVENT_API_ENCODE_REQ = (1 << 3),  /* protocol request encode */
+    PVFS_EVENT_API_JOB =         (1 << 0),
+    PVFS_EVENT_API_BMI =         (1 << 1),
+    PVFS_EVENT_API_TROVE =       (1 << 2),
+    PVFS_EVENT_API_ENCODE_REQ =  (1 << 3), /* protocol request encode */
     PVFS_EVENT_API_ENCODE_RESP = (1 << 4), /* protocol response encode */
-    PVFS_EVENT_API_DECODE_REQ = (1 << 5),  /* protocol request decode */
+    PVFS_EVENT_API_DECODE_REQ =  (1 << 5), /* protocol request decode */
     PVFS_EVENT_API_DECODE_RESP = (1 << 6), /* protocol response decode */
-    PVFS_EVENT_API_SM =	   (1 << 7)        /* state machines */
+    PVFS_EVENT_API_SM =	         (1 << 7), /* state machines */
+    PVFS_EVENT_API_STATES =      (1 << 8)  /* transition states of a SM */
 };
 
 /* what kind of event */

Index: pvfs2-mgmt.h
===================================================================
RCS file: /anoncvs/pvfs2/include/pvfs2-mgmt.h,v
diff -p -u -r1.48 -r1.48.2.1
--- pvfs2-mgmt.h	31 Mar 2005 19:16:03 -0000	1.48
+++ pvfs2-mgmt.h	3 Jun 2005 15:18:59 -0000	1.48.2.1
@@ -96,8 +96,10 @@ struct PVFS_mgmt_event
     int32_t flags;
     int32_t tv_sec;
     int32_t tv_usec;
+    uint32_t state_id;
+    PVFS_id_gen_t req_id;
 };
-endecode_fields_8_struct(
+endecode_fields_9_struct(
     PVFS_mgmt_event,
     int32_t, api,
     int32_t, operation,
@@ -106,7 +108,8 @@ endecode_fields_8_struct(
     int32_t, flags,
     int32_t, tv_sec,
     int32_t, tv_usec,
-    skip4,)
+    uint32_t, state_id,
+    PVFS_id_gen_t, req_id)
 
 /* values which may be or'd together in the flags field above */
 enum

Index: pvfs2-types.h
===================================================================
RCS file: /anoncvs/pvfs2/include/pvfs2-types.h,v
diff -p -u -r1.103 -r1.103.2.1
--- pvfs2-types.h	31 Mar 2005 19:16:03 -0000	1.103
+++ pvfs2-types.h	3 Jun 2005 15:18:59 -0000	1.103.2.1
@@ -300,7 +300,8 @@ enum PVFS_server_param
     PVFS_SERV_PARAM_ROOT_CHECK = 3,  /* verify existance of root handle */
     PVFS_SERV_PARAM_MODE = 4,        /* change the current server mode */
     PVFS_SERV_PARAM_EVENT_ON = 5,    /* event logging on or off */
-    PVFS_SERV_PARAM_EVENT_MASKS = 6  /* API masks for event logging */
+    PVFS_SERV_PARAM_EVENT_MASKS = 6, /* API masks for event logging */
+    PVFS_SERV_PARAM_LOG_EVENTS = 7   /* log events currently in ring buffer */
 };
 
 enum PVFS_server_mode