[mpich2-commits] r5603 - in mpich2/trunk: maint src/include
buntinas at mcs.anl.gov
buntinas at mcs.anl.gov
Wed Oct 28 16:56:56 CDT 2009
Author: buntinas
Date: 2009-10-28 16:56:56 -0500 (Wed, 28 Oct 2009)
New Revision: 5603
Modified:
mpich2/trunk/maint/extracterrmsgs
mpich2/trunk/src/include/mpierrs.h
Log:
Added more fatal error macros.
Modified: mpich2/trunk/maint/extracterrmsgs
===================================================================
--- mpich2/trunk/maint/extracterrmsgs 2009-10-28 20:31:10 UTC (rev 5602)
+++ mpich2/trunk/maint/extracterrmsgs 2009-10-28 21:56:56 UTC (rev 5603)
@@ -593,14 +593,15 @@
# Match the known routines and macros.
# Then check that the arguments match if there is a
# specific string (number of args matches the number present)
- # (MPIU_ERR_CHKANDJUMP[0-4]?(cond,code,class,gmsg[,smsg,args])
- # (MPIU_ERR_SETANDJUMP[0-4]?(code,class,gmsg[,smsg,args])
- # (MPIU_ERR_CHKANDSTMT[0-4]?(cond,code,class,stmt,gmsg[,smsg,args])
- # (MPIU_ERR_SETANDSTMT[0-4]?(code,class,stmt,gmsg[,smsg,args])
+ # MPIU_ERR_CHK(FATAL)?ANDJUMP[1-4]?(cond,code,class,gmsg[,smsg,args])
+ # MPIU_ERR_SET(FATAL)?ANDJUMP[1-4]?(code,class,gmsg[,smsg,args])
+ # MPIU_ERR_CHK(FATAL)?ANDSTMT[1-4]?(cond,code,class,stmt,gmsg[,smsg,args])
+ # MPIU_ERR_SET(FATAL)?ANDSTMT[1-4]?(code,class,stmt,gmsg[,smsg,args])
# Value is a tuple of:
# the count of args where the generic msg begins (starting from 0)
# location of __LINE__ (-1 for none)
# specific msg arg required (0 for no, > 0 for yes)
+ # is the generic message an indirect from errnames.txt (1=yes 0=no)
%KnownErrRoutines = ( 'MPIR_Err_create_code' => '5:3:1:1',
'MPIO_Err_create_code' => '5:3:1:0',
'MPIU_ERR_SET' => '2:-1:0:1',
@@ -608,18 +609,10 @@
'MPIU_ERR_SET1' => '2:-1:1:1',
'MPIU_ERR_SET2' => '2:-1:2:1',
'MPIU_ERR_SETANDSTMT' => '3:-1:0:1',
- 'MPIU_ERR_SETFATALANDSTMT' => '3:-1:0:1',
- 'MPIU_ERR_SETFATALANDJUMP' => '2:-1:0:1',
'MPIU_ERR_SETANDSTMT1' => '3:-1:1:1',
- 'MPIU_ERR_SETFATALANDSTMT1' => '3:-1:1:1',
- 'MPIU_ERR_SETFATALANDJUMP1' => '2:-1:1:1',
'MPIU_ERR_SETANDSTMT2' => '3:-1:1:1',
- 'MPIU_ERR_SETFATALANDSTMT2' => '3:-1:1:1',
- 'MPIU_ERR_SETFATALANDJUMP2' => '2:-1:1:1',
'MPIU_ERR_SETANDSTMT3' => '3:-1:1:1',
- 'MPIU_ERR_SETFATALANDSTMT3' => '3:-1:1:1',
'MPIU_ERR_SETANDSTMT4' => '3:-1:1:1',
- 'MPIU_ERR_SETFATALANDSTMT4' => '3:-1:1:1',
'MPIU_ERR_SETANDJUMP' => '2:-1:0:1',
'MPIU_ERR_SETANDJUMP1' => '2:-1:1:1',
'MPIU_ERR_SETANDJUMP2' => '2:-1:1:1',
@@ -635,6 +628,30 @@
'MPIU_ERR_CHKANDJUMP2' => '3:-1:1:1',
'MPIU_ERR_CHKANDJUMP3' => '3:-1:1:1',
'MPIU_ERR_CHKANDJUMP4' => '3:-1:1:1',
+ 'MPIU_ERR_SETFATAL' => '2:-1:0:1',
+ 'MPIU_ERR_SETFATALSIMPLE' => '2:-1:0:1',
+ 'MPIU_ERR_SETFATAL1' => '2:-1:1:1',
+ 'MPIU_ERR_SETFATAL2' => '2:-1:2:1',
+ 'MPIU_ERR_SETFATALANDSTMT' => '3:-1:0:1',
+ 'MPIU_ERR_SETFATALANDSTMT1' => '3:-1:1:1',
+ 'MPIU_ERR_SETFATALANDSTMT2' => '3:-1:1:1',
+ 'MPIU_ERR_SETFATALANDSTMT3' => '3:-1:1:1',
+ 'MPIU_ERR_SETFATALANDSTMT4' => '3:-1:1:1',
+ 'MPIU_ERR_SETFATALANDJUMP' => '2:-1:0:1',
+ 'MPIU_ERR_SETFATALANDJUMP1' => '2:-1:1:1',
+ 'MPIU_ERR_SETFATALANDJUMP2' => '2:-1:1:1',
+ 'MPIU_ERR_SETFATALANDJUMP3' => '2:-1:1:1',
+ 'MPIU_ERR_SETFATALANDJUMP4' => '2:-1:1:1',
+ 'MPIU_ERR_CHKFATALANDSTMT' => '4:-1:0:1',
+ 'MPIU_ERR_CHKFATALANDSTMT1' => '4:-1:1:1',
+ 'MPIU_ERR_CHKFATALANDSTMT2' => '4:-1:1:1',
+ 'MPIU_ERR_CHKFATALANDSTMT3' => '4:-1:1:1',
+ 'MPIU_ERR_CHKFATALANDSTMT4' => '4:-1:1:1',
+ 'MPIU_ERR_CHKFATALANDJUMP' => '3:-1:0:1',
+ 'MPIU_ERR_CHKFATALANDJUMP1' => '3:-1:1:1',
+ 'MPIU_ERR_CHKFATALANDJUMP2' => '3:-1:1:1',
+ 'MPIU_ERR_CHKFATALANDJUMP3' => '3:-1:1:1',
+ 'MPIU_ERR_CHKFATALANDJUMP4' => '3:-1:1:1',
'MPIR_ERRTEST_VALID_HANDLE' => '4:-1:0:1',
);
while (/(MPI[OUR]_E[A-Za-z0-9_]+)\s*(\(.*)$/) {
Modified: mpich2/trunk/src/include/mpierrs.h
===================================================================
--- mpich2/trunk/src/include/mpierrs.h 2009-10-28 20:31:10 UTC (rev 5602)
+++ mpich2/trunk/src/include/mpierrs.h 2009-10-28 21:56:56 UTC (rev 5603)
@@ -425,6 +425,19 @@
#define MPIU_ERR_SETANDSTMT4(err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_, arg3_, arg4_) \
{err_ = MPIR_Err_create_code( err_,MPIR_ERR_RECOVERABLE,FCNAME,\
__LINE__, class_, gmsg_, smsg_, arg1_, arg2_, arg3_, arg4_ ); stmt_ ;}
+
+#define MPIU_ERR_SETFATALSIMPLE(err_,class_,msg_) \
+ err_ = MPIR_Err_create_code( MPI_SUCCESS,MPIR_ERR_FATAL,FCNAME, \
+ __LINE__, class_, msg_, 0 )
+#define MPIU_ERR_SETFATAL(err_,class_,msg_) \
+ err_ = MPIR_Err_create_code( err_,MPIR_ERR_FATAL,FCNAME,\
+ __LINE__, class_, msg_, 0 )
+#define MPIU_ERR_SETFATAL1(err_,class_,gmsg_,smsg_,arg1_) \
+ err_ = MPIR_Err_create_code( err_,MPIR_ERR_FATAL,FCNAME,\
+ __LINE__, class_, gmsg_, smsg_, arg1_ )
+#define MPIU_ERR_SETFATAL2(err_,class_,gmsg_,smsg_,arg1_,arg2_) \
+ err_ = MPIR_Err_create_code( err_,MPIR_ERR_FATAL,FCNAME,\
+ __LINE__, class_, gmsg_, smsg_, arg1_, arg2_ )
#define MPIU_ERR_SETFATALANDSTMT(err_,class_,stmt_,msg_) \
{err_ = MPIR_Err_create_code( err_,MPIR_ERR_FATAL,FCNAME,\
__LINE__, class_, msg_, 0 ); stmt_ ;}
@@ -463,6 +476,15 @@
MPIU_ERR_SETANDSTMT(err_,class_,stmt_,gmsg_)
#define MPIU_ERR_SETANDSTMT4(err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_) \
MPIU_ERR_SETANDSTMT(err_,class_,stmt_,gmsg_)
+
+#define MPIU_ERR_SETFATALSIMPLE(err_,class_,msg_) \
+ {err_ = class_;}
+#define MPIU_ERR_SETFATAL(err_,class_,msg_) \
+ {if (!err_){err_=class_;}}
+#define MPIU_ERR_SETFATAL1(err_,class_,gmsg_,smsg_,arg1_) \
+ MPIU_ERR_SET(err_,class_,msg_)
+#define MPIU_ERR_SETFATAL2(err_,class_,gmsg_,smsg_,arg1_,arg2_) \
+ MPIU_ERR_SET(err_,class_,msg_)
#define MPIU_ERR_SETFATALANDSTMT(err_,class_,stmt_,msg_) \
MPIU_ERR_SETANDSTMT(err_,class_,stmt_,msg_)
#define MPIU_ERR_SETFATALANDSTMT1(err_,class_,stmt_,gmsg_,smsg_,arg1_) \
@@ -485,8 +507,12 @@
MPIU_ERR_SETFATALANDSTMT(err_,class_,goto fn_fail,msg_)
#define MPIU_ERR_CHKANDSTMT(cond_,err_,class_,stmt_,msg_) \
{if (cond_) { MPIU_ERR_SETANDSTMT(err_,class_,stmt_,msg_); }}
+#define MPIU_ERR_CHKFATALANDSTMT(cond_,err_,class_,stmt_,msg_) \
+ {if (cond_) { MPIU_ERR_SETFATALANDSTMT(err_,class_,stmt_,msg_); }}
#define MPIU_ERR_CHKANDJUMP(cond_,err_,class_,msg_) \
MPIU_ERR_CHKANDSTMT(cond_,err_,class_,goto fn_fail,msg_)
+#define MPIU_ERR_CHKFATALANDJUMP(cond_,err_,class_,msg_) \
+ MPIU_ERR_CHKFATALANDSTMT(cond_,err_,class_,goto fn_fail,msg_)
#define MPIU_ERR_SETANDJUMP1(err_,class_,gmsg_,smsg_,arg1_) \
MPIU_ERR_SETANDSTMT1(err_,class_,goto fn_fail,gmsg_,smsg_,arg1_)
@@ -494,8 +520,12 @@
MPIU_ERR_SETFATALANDSTMT1(err_,class_,goto fn_fail,gmsg_,smsg_,arg1_)
#define MPIU_ERR_CHKANDSTMT1(cond_,err_,class_,stmt_,gmsg_,smsg_,arg1_) \
{if (cond_) { MPIU_ERR_SETANDSTMT1(err_,class_,stmt_,gmsg_,smsg_,arg1_); }}
+#define MPIU_ERR_CHKFATALANDSTMT1(cond_,err_,class_,stmt_,gmsg_,smsg_,arg1_) \
+ {if (cond_) { MPIU_ERR_SETFATALANDSTMT1(err_,class_,stmt_,gmsg_,smsg_,arg1_); }}
#define MPIU_ERR_CHKANDJUMP1(cond_,err_,class_,gmsg_,smsg_,arg1_) \
MPIU_ERR_CHKANDSTMT1(cond_,err_,class_,goto fn_fail,gmsg_,smsg_,arg1_)
+#define MPIU_ERR_CHKFATALANDJUMP1(cond_,err_,class_,gmsg_,smsg_,arg1_) \
+ MPIU_ERR_CHKFATALANDSTMT1(cond_,err_,class_,goto fn_fail,gmsg_,smsg_,arg1_)
#define MPIU_ERR_SETANDJUMP2(err_,class_,gmsg_,smsg_,arg1_,arg2_) \
MPIU_ERR_SETANDSTMT2(err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_)
@@ -503,22 +533,38 @@
MPIU_ERR_SETFATALANDSTMT2(err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_)
#define MPIU_ERR_CHKANDSTMT2(cond_,err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_) \
{if (cond_) { MPIU_ERR_SETANDSTMT2(err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_); }}
+#define MPIU_ERR_CHKFATALANDSTMT2(cond_,err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_) \
+ {if (cond_) { MPIU_ERR_SETFATALANDSTMT2(err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_); }}
#define MPIU_ERR_CHKANDJUMP2(cond_,err_,class_,gmsg_,smsg_,arg1_,arg2_) \
MPIU_ERR_CHKANDSTMT2(cond_,err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_)
+#define MPIU_ERR_CHKFATALANDJUMP2(cond_,err_,class_,gmsg_,smsg_,arg1_,arg2_) \
+ MPIU_ERR_CHKFATALANDSTMT2(cond_,err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_)
#define MPIU_ERR_SETANDJUMP3(err_,class_,gmsg_,smsg_,arg1_,arg2_,arg3_) \
MPIU_ERR_SETANDSTMT3(err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_,arg3_)
+#define MPIU_ERR_SETFATALANDJUMP3(err_,class_,gmsg_,smsg_,arg1_,arg2_,arg3_) \
+ MPIU_ERR_SETFATALANDSTMT3(err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_,arg3_)
#define MPIU_ERR_CHKANDSTMT3(cond_,err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_,arg3_) \
{if (cond_) { MPIU_ERR_SETANDSTMT3(err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_,arg3_); }}
+#define MPIU_ERR_CHKFATALANDSTMT3(cond_,err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_,arg3_) \
+ {if (cond_) { MPIU_ERR_SETFATALANDSTMT3(err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_,arg3_); }}
#define MPIU_ERR_CHKANDJUMP3(cond_,err_,class_,gmsg_,smsg_,arg1_,arg2_,arg3_) \
MPIU_ERR_CHKANDSTMT3(cond_,err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_,arg3_)
+#define MPIU_ERR_CHKFATALANDJUMP3(cond_,err_,class_,gmsg_,smsg_,arg1_,arg2_,arg3_) \
+ MPIU_ERR_CHKFATALANDSTMT3(cond_,err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_,arg3_)
#define MPIU_ERR_SETANDJUMP4(err_,class_,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_) \
MPIU_ERR_SETANDSTMT4(err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_)
+#define MPIU_ERR_SETFATALANDJUMP4(err_,class_,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_) \
+ MPIU_ERR_SETFATALANDSTMT4(err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_)
#define MPIU_ERR_CHKANDSTMT4(cond_,err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_,arg3_, arg4_) \
{if (cond_) { MPIU_ERR_SETANDSTMT4(err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_); }}
+#define MPIU_ERR_CHKFATALANDSTMT4(cond_,err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_,arg3_, arg4_) \
+ {if (cond_) { MPIU_ERR_SETFATALANDSTMT4(err_,class_,stmt_,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_); }}
#define MPIU_ERR_CHKANDJUMP4(cond_,err_,class_,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_) \
MPIU_ERR_CHKANDSTMT4(cond_,err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_)
+#define MPIU_ERR_CHKFATALANDJUMP4(cond_,err_,class_,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_) \
+ MPIU_ERR_CHKFATALANDSTMT4(cond_,err_,class_,goto fn_fail,gmsg_,smsg_,arg1_,arg2_,arg3_,arg4_)
/* --END ERROR MACROS-- */
/*
More information about the mpich2-commits
mailing list