[svn-r1181] Changes to allow automatic building of tables for event IDs and for compatiblity of HDF 4 and HDF 5 trace files.

1 files changed, 37 insertions, 62 deletions

diff --git a/pablo/ProcIDs.h b/pablo/ProcIDs.h
index 80d4bef..987f197 100644
--- a/pablo/ProcIDs.h
+++ b/pablo/ProcIDs.h
@@ -87,62 +87,7 @@ extern int *procTrace;
  */
 #include "ProcTrace.h"
 
-#define H5_mask			ID_H5_c
-#define H5A_mask		ID_H5A_c
-#define H5AC_mask		ID_H5AC_c
-#define H5B_mask		ID_H5B_c
-#define H5D_mask		ID_H5D_c
-#define H5E_mask		ID_H5E_c
-#define H5F_mask		ID_H5F_c
-#define H5F_arr_mask		ID_H5Farray_c
-#define H5F_core_mask		ID_H5Fcore_c
-#define H5F_family_mask		ID_H5Ffamily_c
-#define H5F_istore_mask		ID_H5Fistore_c
-#define H5F_low_mask		ID_H5Flow_c
-#define H5F_mpio_mask		ID_H5Fmpio_c
-#define H5F_sec2_mask		ID_H5Fsec2_c
-#define H5F_split_mask		ID_H5Fsplit_c
-#define H5F_stdio_mask		ID_H5Fstdio_c
-#define H5G_mask		ID_H5G_c
-#define H5G_ent_mask		ID_H5Gent_c
-#define H5G_node_mask		ID_H5Gnode_c
-#define H5G_stab_mask		ID_H5Gstab_c
-#define H5HG_mask		ID_H5HG_c
-#define H5HL_mask		ID_H5HL_c
-#define H5I_mask		ID_H5I_c
-#define H5MF_mask		ID_H5MF_c
-#define H5MM_mask		ID_H5MM_c
-#define H5O_mask		ID_H5O_c
-#define H5O_attr_mask		ID_H5Oattr_c
-#define H5O_pline_mask		ID_H5Ocomp_c
-#define H5O_cont_mask		ID_H5Ocont_c
-#define H5O_dtype_mask		ID_H5Odtype_c
-#define H5O_efl_mask		ID_H5Oefl_c
-#define H5O_fill_mask		ID_H5Ofill_c
-#define H5O_layout_mask		ID_H5Olayout_c
-#define H5O_mtime_mask		ID_H5Omtime_c
-#define H5O_name_mask		ID_H5Oname_c
-#define H5O_null_mask		ID_H5Onull_c
-#define H5O_sdspace_mask	ID_H5Osdspace_c
-#define H5O_shared_mask		ID_H5Oshared_c
-#define H5O_stab_mask		ID_H5Ostab_c
-#define H5P_mask		ID_H5P_c
-#define H5R_mask		ID_H5R_c
-#define H5RA_mask		ID_H5RA_c
-#define H5S_mask		ID_H5S_c
-#define H5S_all_mask		ID_H5Sall_c
-#define H5S_hyper_mask		ID_H5Shyper_c
-#define H5S_mpio_mask		ID_H5Smpio_c
-#define H5S_none_mask		ID_H5Snone_c
-#define H5S_point_mask		ID_H5Spoint_c
-#define H5S_select_mask		ID_H5Sselect_c
-#define H5T_mask		ID_H5T_c
-#define H5TB_mask		ID_H5TB_c
-#define H5Tbit_mask		ID_H5Tbit_c
-#define H5T_conv_mask		ID_H5Tconv_c
-#define H5T_init_mask		ID_H5Tinit_c
-#define H5V_mask		ID_H5V_c
-#define H5Z_mask		ID_H5Z_c
+#include "ProcMasks.h"
 
 #define	ID_HDFprocName		9996
 #define	ID_malloc		9997
@@ -154,18 +99,48 @@ extern int *procTrace;
 #define END_HDF (ID_HDF_Last_Entry + DUMMY_HDF)
 #define NumHDFProcs ( ID_HDF_Last_Entry )
 
-#define BEGIN_MPIO            900800
-#define END_MPIO              900899
+enum MPIeventIDs {
+	BEGIN_MPIO = END_HDF+1,
+	HDFmpiOpenID = BEGIN_MPIO,
+	HDFmpiCloseID,
+	HDFmpiDeleteID,
+	HDFmpiSetSizeID,
+	HDFmpiPreallocateID,
+	HDFmpiGetSizeID,
+	HDFmpiGetGroupID,
+	HDFmpiGetAmodeID,
+	HDFmpiGetViewID,
+	HDFmpiSetViewID,
+	HDFmpiReadAtID,
+	HDFmpiReadAtAllID,
+	HDFmpiWriteAtID,
+	HDFmpiWriteAtAllID,
+	HDFmpiReadID,
+	HDFmpiReadAllID,
+	HDFmpiWriteID,
+	HDFmpiWriteAllID,
+	HDFmpiSeekID,
+	HDFmpiGetPositionID,
+	HDFmpiGetByteOffsetID,
+	HDFmpiGetTypeExtentID,
+	HDFmpiSetAtomicityID,
+	HDFmpiGetAtomicityID,
+	HDFmpiIreadID,
+	HDFmpiIwriteID,
+	HDFmpiIreadAtID,
+	HDFmpiIwriteAtID,
+	HDFmpiSyncID,
+	END_MPIO 
+};
+
 /*======================================================================*/
 /* Macros to tell if the ID is that of an HDF Entry or Exit             */
 /*======================================================================*/
 #define isBeginHDFEvent( ID ) ( BEGIN_HDF <= (ID) && (ID) <= END_HDF )
 #define isEndHDFEvent( ID )   isBeginHDFEvent(-(ID))
 #define isBeginMPIOEvent( ID ) \
-            ( BEGIN_MPIO <= (ID) && (ID) <= END_MPIO && (ID)%2 == 0 )
-
-#define isEndMPIOEvent( ID ) \
-            ( BEGIN_MPIO <= (ID) && (ID) <= END_MPIO && (ID)%2 == 1 )
+            ( BEGIN_MPIO <= (ID) && (ID) <= END_MPIO  )
+#define isEndMPIOEvent( ID ) isBeginMPIOEvent(-(ID))
 #define isBeginIOEvent( ID )  \
         ( IOerrorID < (ID) && (ID) <= fsetposEndID && (ID)%2 == 1 )
 #define isEndIOEvent( ID ) \