[mpich2-commits] r6705 - in mpich2/trunk/src/mpi: errhan pt2pt

[gropp at mcs.anl.gov]

Author: gropp
Date: 2010-05-24 08:56:14 -0500 (Mon, 24 May 2010)
New Revision: 6705

Modified:
   mpich2/trunk/src/mpi/errhan/errnames.txt
   mpich2/trunk/src/mpi/pt2pt/bsendutil.c
   mpich2/trunk/src/mpi/pt2pt/ibsend.c
Log:
Added better fixme text and a more specific error message for one bsend case

Modified: mpich2/trunk/src/mpi/errhan/errnames.txt
===================================================================
--- mpich2/trunk/src/mpi/errhan/errnames.txt	2010-05-22 16:38:57 UTC (rev 6704)
+++ mpich2/trunk/src/mpi/errhan/errnames.txt	2010-05-24 13:56:14 UTC (rev 6705)
@@ -82,6 +82,8 @@
 **bufexists:Buffer already attached with MPI_BUFFER_ATTACH.
 **bsendbufsmall:Buffer size is smaller than MPI_BSEND_OVERHEAD
 **bsendbufsmall %d %d:Buffer size of %d is smaller than MPI_BSEND_OVERHEAD (%d)
+**bsendpending:Internal error - completion of Bsend requests that were \
+ deferred because of resource limits is not implemented
 **notgenreq:Attempt to complete a request with MPI_GREQUEST_COMPLETE that \
 was not started with MPI_GREQUEST_START
 **cancelunknown:Attempt to cancel an unknown type of request

Modified: mpich2/trunk/src/mpi/pt2pt/bsendutil.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/bsendutil.c	2010-05-22 16:38:57 UTC (rev 6704)
+++ mpich2/trunk/src/mpi/pt2pt/bsendutil.c	2010-05-24 13:56:14 UTC (rev 6705)
@@ -162,9 +162,9 @@
 int MPIR_Bsend_detach( void *bufferp, int *size )
 {
     if (BsendBuffer.pending) {
-	/* FIXME: This is the wrong error text (notimpl) */
+	/* FIXME: Process pending bsend requests in detach */
 	return MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, 
-             "MPIR_Bsend_detach", __LINE__, MPI_ERR_OTHER, "**notimpl", 0 );
+            "MPIR_Bsend_detach", __LINE__, MPI_ERR_OTHER, "**bsendpending", 0 );
     }
     if (BsendBuffer.active) {
 	/* Loop through each active element and wait on it */
@@ -477,8 +477,8 @@
 }
 
 /* 
- * FIXME : For each pending item (that is, items that we couldn't even start sending),
- * try to get them going.  
+ * FIXME : For each pending item (that is, items that we couldn't even start 
+ * sending), try to get them going.  
  */
 static void MPIR_Bsend_retry_pending( void )
 {
@@ -487,7 +487,7 @@
     while (pending) {
 	next_pending = pending->next;
 	/* Retry sending this item */
-	/* FIXME */
+	/* FIXME: Unimplemented retry of pending bsend operations */
 	pending = next_pending;
     }
 }

Modified: mpich2/trunk/src/mpi/pt2pt/ibsend.c
===================================================================
--- mpich2/trunk/src/mpi/pt2pt/ibsend.c	2010-05-22 16:38:57 UTC (rev 6704)
+++ mpich2/trunk/src/mpi/pt2pt/ibsend.c	2010-05-24 13:56:14 UTC (rev 6705)
@@ -121,7 +121,7 @@
     int mpi_errno = MPI_SUCCESS;
     MPID_Comm *comm_ptr = NULL;
     MPID_Request *request_ptr;
-    ibsend_req_info *ibinfo;
+    ibsend_req_info *ibinfo=0;
     MPIU_THREADPRIV_DECL;
     MPID_MPI_STATE_DECL(MPID_STATE_MPI_IBSEND);
 
@@ -215,7 +215,8 @@
     
   fn_fail:
     /* --BEGIN ERROR HANDLING-- */
-    *request = MPI_REQUEST_NULL; /* FIXME: should we be setting the request at all in the case of an error? */
+    /* FIXME: should we be setting the request at all in the case of an error? */
+    *request = MPI_REQUEST_NULL; 
 #   ifdef HAVE_ERROR_REPORTING
     {
 	mpi_errno = MPIR_Err_create_code(