This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 6a688097dfbf3d1af2a50b605ed7aee97a6fa363 (commit) via bdf6294fff07280d9d9480fd9fb5181902783a56 (commit) from 1bbe0ba39a5c2486b9b73a17e8314d8039b5f92b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/6a688097dfbf3d1af2a50b605ed7aee97a... commit 6a688097dfbf3d1af2a50b605ed7aee97a6fa363 Author: William Gropp <[email protected]> Date: Wed Jun 5 08:18:59 2013 -0500 Turned off the error reporting since that causes autogen.sh to abort. This must be re-enabled once the errors in the error calls are fixed. diff --git a/maint/extracterrmsgs b/maint/extracterrmsgs index c1391ac..1015c43 100755 --- a/maint/extracterrmsgs +++ b/maint/extracterrmsgs @@ -22,6 +22,9 @@ $carefulFilename = ""; $showfiles = 0; $quiet = 0; $build_test_pgm = 1; +# FIXME: checkErrClass should be set to 1; currently set to zero +# to permit autogen.sh to complete +$checkErrClass = 0; # Strict is used to control checking of error message strings. $gStrict = 0; @@ -720,7 +723,7 @@ sub ProcessFile } next; } - if ($errClassLoc >= 0) { + if ($errClassLoc >= 0 && $checkErrClass) { if (!($args[$errClassLoc] =~ /^MPI_ERR_/) && !($args[$errClassLoc] =~ /^MPIDU_SOCK_ERR_/) && !($args[$errClassLoc] =~ /^MPIX_ERR_/) && http://git.mpich.org/mpich.git/commitdiff/bdf6294fff07280d9d9480fd9fb5181902... commit bdf6294fff07280d9d9480fd9fb5181902783a56 Author: William Gropp <[email protected]> Date: Fri May 31 22:16:04 2013 +0800 Check that an MPI Error Class is provided where one is required Discovered this error while fixing an unrelated problem. Note that autogen will detect that errors were encountered while building the error message tables and will fail, so the problems discovered by this fix need to be addressed. diff --git a/maint/extracterrmsgs b/maint/extracterrmsgs index a26b741..c1391ac 100755 --- a/maint/extracterrmsgs +++ b/maint/extracterrmsgs @@ -629,57 +629,58 @@ sub ProcessFile # 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', - 'MPIU_ERR_SETSIMPLE' => '2:-1:0:1', - 'MPIU_ERR_SET1' => '2:-1:1:1', - 'MPIU_ERR_SET2' => '2:-1:2:1', - 'MPIU_ERR_SETANDSTMT' => '3:-1:0:1', - 'MPIU_ERR_SETANDSTMT1' => '3:-1:1:1', - 'MPIU_ERR_SETANDSTMT2' => '3:-1:1:1', - 'MPIU_ERR_SETANDSTMT3' => '3:-1:1:1', - 'MPIU_ERR_SETANDSTMT4' => '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', - 'MPIU_ERR_SETANDJUMP3' => '2:-1:1:1', - 'MPIU_ERR_SETANDJUMP4' => '2:-1:1:1', - 'MPIU_ERR_CHKANDSTMT' => '4:-1:0:1', - 'MPIU_ERR_CHKANDSTMT1' => '4:-1:1:1', - 'MPIU_ERR_CHKANDSTMT2' => '4:-1:1:1', - 'MPIU_ERR_CHKANDSTMT3' => '4:-1:1:1', - 'MPIU_ERR_CHKANDSTMT4' => '4:-1:1:1', - 'MPIU_ERR_CHKANDJUMP' => '3:-1:0:1', - 'MPIU_ERR_CHKANDJUMP1' => '3:-1:1:1', - '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', + # location of the error class + %KnownErrRoutines = ( 'MPIR_Err_create_code' => '5:3:1:1:4', + 'MPIO_Err_create_code' => '5:3:1:0:-1', + 'MPIU_ERR_SET' => '2:-1:0:1:1', + 'MPIU_ERR_SETSIMPLE' => '2:-1:0:1:1', + 'MPIU_ERR_SET1' => '2:-1:1:1:1', + 'MPIU_ERR_SET2' => '2:-1:2:1:1', + 'MPIU_ERR_SETANDSTMT' => '3:-1:0:1:1', + 'MPIU_ERR_SETANDSTMT1' => '3:-1:1:1:1', + 'MPIU_ERR_SETANDSTMT2' => '3:-1:1:1:1', + 'MPIU_ERR_SETANDSTMT3' => '3:-1:1:1:1', + 'MPIU_ERR_SETANDSTMT4' => '3:-1:1:1:1', + 'MPIU_ERR_SETANDJUMP' => '2:-1:0:1:1', + 'MPIU_ERR_SETANDJUMP1' => '2:-1:1:1:1', + 'MPIU_ERR_SETANDJUMP2' => '2:-1:1:1:1', + 'MPIU_ERR_SETANDJUMP3' => '2:-1:1:1:1', + 'MPIU_ERR_SETANDJUMP4' => '2:-1:1:1:1', + 'MPIU_ERR_CHKANDSTMT' => '4:-1:0:1:2', + 'MPIU_ERR_CHKANDSTMT1' => '4:-1:1:1:2', + 'MPIU_ERR_CHKANDSTMT2' => '4:-1:1:1:2', + 'MPIU_ERR_CHKANDSTMT3' => '4:-1:1:1:2', + 'MPIU_ERR_CHKANDSTMT4' => '4:-1:1:1:2', + 'MPIU_ERR_CHKANDJUMP' => '3:-1:0:1:2', + 'MPIU_ERR_CHKANDJUMP1' => '3:-1:1:1:2', + 'MPIU_ERR_CHKANDJUMP2' => '3:-1:1:1:2', + 'MPIU_ERR_CHKANDJUMP3' => '3:-1:1:1:2', + 'MPIU_ERR_CHKANDJUMP4' => '3:-1:1:1:2', + 'MPIU_ERR_SETFATAL' => '2:-1:0:1:1', + 'MPIU_ERR_SETFATALSIMPLE' => '2:-1:0:1:1', + 'MPIU_ERR_SETFATAL1' => '2:-1:1:1:1', + 'MPIU_ERR_SETFATAL2' => '2:-1:2:1:1', + 'MPIU_ERR_SETFATALANDSTMT' => '3:-1:0:1:1', + 'MPIU_ERR_SETFATALANDSTMT1' => '3:-1:1:1:1', + 'MPIU_ERR_SETFATALANDSTMT2' => '3:-1:1:1:1', + 'MPIU_ERR_SETFATALANDSTMT3' => '3:-1:1:1:1', + 'MPIU_ERR_SETFATALANDSTMT4' => '3:-1:1:1:1', + 'MPIU_ERR_SETFATALANDJUMP' => '2:-1:0:1:1', + 'MPIU_ERR_SETFATALANDJUMP1' => '2:-1:1:1:1', + 'MPIU_ERR_SETFATALANDJUMP2' => '2:-1:1:1:1', + 'MPIU_ERR_SETFATALANDJUMP3' => '2:-1:1:1:1', + 'MPIU_ERR_SETFATALANDJUMP4' => '2:-1:1:1:1', + 'MPIU_ERR_CHKFATALANDSTMT' => '4:-1:0:1:2', + 'MPIU_ERR_CHKFATALANDSTMT1' => '4:-1:1:1:2', + 'MPIU_ERR_CHKFATALANDSTMT2' => '4:-1:1:1:2', + 'MPIU_ERR_CHKFATALANDSTMT3' => '4:-1:1:1:2', + 'MPIU_ERR_CHKFATALANDSTMT4' => '4:-1:1:1:2', + 'MPIU_ERR_CHKFATALANDJUMP' => '3:-1:0:1:2', + 'MPIU_ERR_CHKFATALANDJUMP1' => '3:-1:1:1:2', + 'MPIU_ERR_CHKFATALANDJUMP2' => '3:-1:1:1:2', + 'MPIU_ERR_CHKFATALANDJUMP3' => '3:-1:1:1:2', + 'MPIU_ERR_CHKFATALANDJUMP4' => '3:-1:1:1:2', + 'MPIR_ERRTEST_VALID_HANDLE' => '4:-1:0:1:3', ); while (/(MPI[OUR]_E[A-Za-z0-9_]+)\s*(\(.*)$/) { my $routineName = $1; @@ -689,7 +690,7 @@ sub ProcessFile last; } print "Found $routineName\n" if $debug; - my ($genericArgLoc,$hasLine,$hasSpecific,$onlyIndirect) = + my ($genericArgLoc,$hasLine,$hasSpecific,$onlyIndirect,$errClassLoc) = split(/:/,$KnownErrRoutines{$routineName}); ($leader, $remainder, @args ) = &GetSubArgs( FD, $arglist ); @@ -719,6 +720,16 @@ sub ProcessFile } next; } + if ($errClassLoc >= 0) { + if (!($args[$errClassLoc] =~ /^MPI_ERR_/) && + !($args[$errClassLoc] =~ /^MPIDU_SOCK_ERR_/) && + !($args[$errClassLoc] =~ /^MPIX_ERR_/) && + !($args[$errClassLoc] =~ /^errclass/) ) { + $bad_syntax_in_file{$filename} = 1; + print STDERR "Invalid argument $args[$errClassLoc] for the MPI Error class in $routineName in $filename\n"; + next; + } + } #my $last_errcode = $args[0]; #my $fatal_flag = $args[1]; diff --git a/src/include/mpierrs.h b/src/include/mpierrs.h index 330c296..ee592e2 100644 --- a/src/include/mpierrs.h +++ b/src/include/mpierrs.h @@ -143,12 +143,12 @@ goto fn_fail; \ } -#define MPIR_ERRTEST_ARGNONPOS(arg,arg_name,err,err_class) \ +#define MPIR_ERRTEST_ARGNONPOS(arg,arg_name,err,errclass) \ if ((arg) <= 0) { \ err = MPIR_Err_create_code(MPI_SUCCESS, \ MPIR_ERR_RECOVERABLE, \ FCNAME, __LINE__, \ - err_class, \ + errclass, \ "**argnonpos", \ "**argnonpos %s %d", \ arg_name, arg ); \ diff --git a/src/mpi/errhan/errnames.txt b/src/mpi/errhan/errnames.txt index 0633d3a..127f150 100644 --- a/src/mpi/errhan/errnames.txt +++ b/src/mpi/errhan/errnames.txt @@ -2,6 +2,8 @@ **argnonpos %s %d:Invalid value for %s; must be positive but is %d **argneg:Invalid argument; must be non-negative **argneg %s %d:Invalid value for %s, must be non-negative but is %d +**argtoosmall:Invalid argument; value is too small +**argtoosmall %s %d %d:Invalid argument for %s: value is %d but must be at least %d **countneg:Negative count **countneg %d:Negative count, value is %d **initialized:MPI not initialized. Call MPI_Init or MPI_Init_thread first diff --git a/src/mpi/topo/dist_gr_create.c b/src/mpi/topo/dist_gr_create.c index f00596e..67ae7b4 100644 --- a/src/mpi/topo/dist_gr_create.c +++ b/src/mpi/topo/dist_gr_create.c @@ -313,18 +313,23 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], if (mpi_errno) MPIU_ERR_POP(mpi_errno); MPIR_Get_count_impl(&status, MPI_INT, &count); /* can't use CHKLMEM macros b/c we are in a loop */ + /* FIXME: Why not - there is only one allocated at a time. Is it only + that there is no defined macro to pop and free an item? */ buf = MPIU_Malloc(count*sizeof(int)); MPIU_ERR_CHKANDJUMP(!buf, mpi_errno, MPIR_ERR_RECOVERABLE, "**nomem"); mpi_errno = MPIC_Recv(buf, count, MPI_INT, MPI_ANY_SOURCE, MPIR_TOPO_A_TAG, comm_old, MPI_STATUS_IGNORE); + /* FIXME: buf is never freed on error! */ if (mpi_errno) MPIU_ERR_POP(mpi_errno); for (j = 0; j < count/2; ++j) { int deg = dist_graph_ptr->indegree++; if (deg >= in_capacity) { in_capacity *= 2; + /* FIXME: buf is never freed on error! */ MPIU_REALLOC_ORJUMP(dist_graph_ptr->in, in_capacity*sizeof(int), mpi_errno); if (dist_graph_ptr->is_weighted) + /* FIXME: buf is never freed on error! */ MPIU_REALLOC_ORJUMP(dist_graph_ptr->in_weights, in_capacity*sizeof(int), mpi_errno); } dist_graph_ptr->in[deg] = buf[2*j]; @@ -343,18 +348,22 @@ int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], if (mpi_errno) MPIU_ERR_POP(mpi_errno); MPIR_Get_count_impl(&status, MPI_INT, &count); /* can't use CHKLMEM macros b/c we are in a loop */ + /* Why not? */ buf = MPIU_Malloc(count*sizeof(int)); MPIU_ERR_CHKANDJUMP(!buf, mpi_errno, MPIR_ERR_RECOVERABLE, "**nomem"); mpi_errno = MPIC_Recv(buf, count, MPI_INT, MPI_ANY_SOURCE, MPIR_TOPO_B_TAG, comm_old, MPI_STATUS_IGNORE); + /* FIXME: buf is never freed on error! */ if (mpi_errno) MPIU_ERR_POP(mpi_errno); for (j = 0; j < count/2; ++j) { int deg = dist_graph_ptr->outdegree++; if (deg >= out_capacity) { out_capacity *= 2; + /* FIXME: buf is never freed on error! */ MPIU_REALLOC_ORJUMP(dist_graph_ptr->out, out_capacity*sizeof(int), mpi_errno); if (dist_graph_ptr->is_weighted) + /* FIXME: buf is never freed on error! */ MPIU_REALLOC_ORJUMP(dist_graph_ptr->out_weights, out_capacity*sizeof(int), mpi_errno); } dist_graph_ptr->out[deg] = buf[2*j]; diff --git a/src/mpi/topo/dist_gr_neighb.c b/src/mpi/topo/dist_gr_neighb.c index 873117a..56d2c72 100644 --- a/src/mpi/topo/dist_gr_neighb.c +++ b/src/mpi/topo/dist_gr_neighb.c @@ -38,7 +38,7 @@ int MPIR_Dist_graph_neighbors_impl(MPID_Comm *comm_ptr, MPIR_Topology *topo_ptr = NULL; topo_ptr = MPIR_Topology_get(comm_ptr); - MPIU_ERR_CHKANDJUMP(!topo_ptr || topo_ptr->kind != MPI_DIST_GRAPH, mpi_errno, MPIR_ERR_RECOVERABLE, "**notdistgraphtopo"); + MPIU_ERR_CHKANDJUMP(!topo_ptr || topo_ptr->kind != MPI_DIST_GRAPH, mpi_errno, MPI_ERR_TOPOLOGY, "**notdistgraphtopo"); MPIU_Memcpy(sources, topo_ptr->topo.dist_graph.in, maxindegree*sizeof(int)); MPIU_Memcpy(destinations, topo_ptr->topo.dist_graph.out, maxoutdegree*sizeof(int)); @@ -118,12 +118,12 @@ int MPI_Dist_graph_neighbors(MPI_Comm comm, { MPIR_Topology *topo_ptr = NULL; topo_ptr = MPIR_Topology_get(comm_ptr); - MPIU_ERR_CHKANDJUMP(!topo_ptr || topo_ptr->kind != MPI_DIST_GRAPH, mpi_errno, MPIR_ERR_RECOVERABLE, "**notdistgraphtopo"); + MPIU_ERR_CHKANDJUMP(!topo_ptr || topo_ptr->kind != MPI_DIST_GRAPH, mpi_errno, MPI_ERR_TOPOLOGY, "**notdistgraphtopo"); MPIR_ERRTEST_ARGNEG(maxindegree, "maxindegree", mpi_errno); MPIR_ERRTEST_ARGNEG(maxoutdegree, "maxoutdegree", mpi_errno); - MPIU_ERR_CHKANDJUMP3((maxindegree > topo_ptr->topo.dist_graph.indegree), mpi_errno, MPIR_ERR_RECOVERABLE, "**argrange", "**argrange %s %d %d", "maxindegree", maxindegree, topo_ptr->topo.dist_graph.indegree); - MPIU_ERR_CHKANDJUMP3((maxoutdegree > topo_ptr->topo.dist_graph.outdegree), mpi_errno, MPIR_ERR_RECOVERABLE, "**argrange", "**argrange %s %d %d", "maxoutdegree", maxoutdegree, topo_ptr->topo.dist_graph.outdegree); + MPIU_ERR_CHKANDJUMP3((maxindegree < topo_ptr->topo.dist_graph.indegree), mpi_errno, MPI_ERR_ARG, "**argtoosmall", "**argtoosmall %s %d %d", "maxindegree", maxindegree, topo_ptr->topo.dist_graph.indegree); + MPIU_ERR_CHKANDJUMP3((maxoutdegree < topo_ptr->topo.dist_graph.outdegree), mpi_errno, MPI_ERR_ARG, "**argtoosmall", "**argtoosmall %s %d %d", "maxoutdegree", maxoutdegree, topo_ptr->topo.dist_graph.outdegree); } MPID_END_ERROR_CHECKS; } diff --git a/src/mpi/topo/dist_gr_neighb_count.c b/src/mpi/topo/dist_gr_neighb_count.c index 36b3feb..78b4488 100644 --- a/src/mpi/topo/dist_gr_neighb_count.c +++ b/src/mpi/topo/dist_gr_neighb_count.c @@ -36,7 +36,7 @@ int MPIR_Dist_graph_neighbors_count_impl(MPID_Comm *comm_ptr, int *indegree, int MPIR_Topology *topo_ptr = NULL; topo_ptr = MPIR_Topology_get(comm_ptr); - MPIU_ERR_CHKANDJUMP(!topo_ptr || topo_ptr->kind != MPI_DIST_GRAPH, mpi_errno, MPIR_ERR_RECOVERABLE, "**notdistgraphtopo"); + MPIU_ERR_CHKANDJUMP(!topo_ptr || topo_ptr->kind != MPI_DIST_GRAPH, mpi_errno, MPI_ERR_TOPOLOGY, "**notdistgraphtopo"); *indegree = topo_ptr->topo.dist_graph.indegree; *outdegree = topo_ptr->topo.dist_graph.outdegree; *weighted = topo_ptr->topo.dist_graph.is_weighted; diff --git a/src/mpi/topo/graph_get.c b/src/mpi/topo/graph_get.c index fabde67..79a48f4 100644 --- a/src/mpi/topo/graph_get.c +++ b/src/mpi/topo/graph_get.c @@ -103,10 +103,10 @@ int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges, topo_ptr = MPIR_Topology_get( comm_ptr ); MPIU_ERR_CHKANDJUMP((!topo_ptr || topo_ptr->kind != MPI_GRAPH), mpi_errno, MPI_ERR_TOPOLOGY, "**notgraphtopo"); - MPIU_ERR_CHKANDJUMP3((topo_ptr->topo.graph.nnodes > maxindex), mpi_errno, MPI_ERR_ARG, "**argrange", - "**argrange %s %d %d", "maxindex", maxindex, topo_ptr->topo.graph.nnodes); - MPIU_ERR_CHKANDJUMP3((topo_ptr->topo.graph.nedges > maxedges), mpi_errno, MPI_ERR_ARG, "**argrange", - "**argrange %s %d %d", "maxedges", maxedges, topo_ptr->topo.graph.nedges); + MPIU_ERR_CHKANDJUMP3((topo_ptr->topo.graph.nnodes > maxindex), mpi_errno, MPI_ERR_ARG, "**argtoosmall", + "**argtoosmall %s %d %d", "maxindex", maxindex, topo_ptr->topo.graph.nnodes); + MPIU_ERR_CHKANDJUMP3((topo_ptr->topo.graph.nedges > maxedges), mpi_errno, MPI_ERR_ARG, "**argtoosmall", + "**argtoosmall %s %d %d", "maxedges", maxedges, topo_ptr->topo.graph.nedges); /* Get index */ n = topo_ptr->topo.graph.nnodes; ----------------------------------------------------------------------- Summary of changes: maint/extracterrmsgs | 118 +++++++++++++++++++--------------- src/include/mpierrs.h | 4 +- src/mpi/errhan/errnames.txt | 2 + src/mpi/topo/dist_gr_create.c | 9 +++ src/mpi/topo/dist_gr_neighb.c | 8 +- src/mpi/topo/dist_gr_neighb_count.c | 2 +- src/mpi/topo/graph_get.c | 8 +- 7 files changed, 88 insertions(+), 63 deletions(-) hooks/post-receive -- MPICH primary repository