[svn-r7312] Correct use of MPI_ERR_NO_MEM (should be MPI_ERR_OTHER) for...

[svn-r7312] Correct use of MPI_ERR_NO_MEM (should be MPI_ERR_OTHER) for out-of-memory that does not pertain to MPI_Alloc_mem and add detail to error messages about out-of-memory

src/mpid/ch3/include/mpidimpl.h

@@ -260,7 +260,12 @@ extern MPIDI_Process_t MPIDI_Process;
         MPIU_THREADPRIV_FIELD(request_handle_count) -= 1;              \
     } while (0)
 #elif MPIU_HANDLE_ALLOCATION_METHOD == MPIU_HANDLE_ALLOCATION_MUTEX
-#  define MPIDI_Request_tls_alloc(req) (req) = MPIU_Handle_obj_alloc(&MPID_Request_mem)
+#  define MPIDI_Request_tls_alloc(req_) \
+    do { \
+	(req_) = MPIU_Handle_obj_alloc(&MPID_Request_mem); \
+        MPIU_DBG_MSG_P(CH3_CHANNEL,VERBOSE,		\
+	       "allocated request, handle=0x%08x", req_);\
+    } while (0)
 #else
 #  error MPIU_HANDLE_ALLOCATION_METHOD not defined
 #endif

src/mpid/ch3/src/ch3u_handle_recv_pkt.c

@@ -247,7 +247,8 @@ int MPIDI_CH3U_Receive_data_unexpected(MPID_Request * rreq, char *buf, MPIDI_msg
     
     rreq->dev.tmpbuf = MPIU_Malloc(rreq->dev.recv_data_sz);
     if (!rreq->dev.tmpbuf) {
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+	MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %d",
+			     rreq->dev.recv_data_sz);
     }
     rreq->dev.tmpbuf_sz = rreq->dev.recv_data_sz;
     
@@ -378,7 +379,8 @@ int MPIDI_CH3U_Post_data_receive_unexpected(MPID_Request * rreq)
     
     rreq->dev.tmpbuf = MPIU_Malloc(rreq->dev.recv_data_sz);
     if (!rreq->dev.tmpbuf) {
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+	MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %d",
+			     rreq->dev.recv_data_sz);
     }
     rreq->dev.tmpbuf_sz = rreq->dev.recv_data_sz;
     

src/mpid/ch3/src/ch3u_handle_recv_req.c

@@ -216,7 +216,8 @@ int MPIDI_CH3_ReqHandler_AccumRespDerivedDTComplete( MPIDI_VC_t *vc ATTRIBUTE((u
     tmp_buf = MPIU_Malloc(rreq->dev.user_count * 
 			  (MPIR_MAX(extent,true_extent)));  
     if (!tmp_buf) {
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+	MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %d",
+		    rreq->dev.user_count * MPIR_MAX(extent,true_extent));
     }
     
     /* adjust for potential negative lower bound in datatype */
@@ -278,7 +279,7 @@ int MPIDI_CH3_ReqHandler_GetRespDerivedDTComplete( MPIDI_VC_t *vc,
     
     /* create request for sending data */
     sreq = MPID_Request_create();
-    MPIU_ERR_CHKANDJUMP(sreq == NULL, mpi_errno,MPI_ERR_OTHER,"**nomem");
+    MPIU_ERR_CHKANDJUMP(sreq == NULL, mpi_errno,MPI_ERR_OTHER,"**nomemreq");
     
     sreq->kind = MPID_REQUEST_SEND;
     MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_GET_RESP);
@@ -552,7 +553,8 @@ static int create_derived_datatype(MPID_Request *req, MPID_Datatype **dtp)
     /* allocate new datatype object and handle */
     new_dtp = (MPID_Datatype *) MPIU_Handle_obj_alloc(&MPID_Datatype_mem);
     if (!new_dtp) {
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+	MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %s",
+			     "MPID_Datatype_mem" );
     }
 
     *dtp = new_dtp;
@@ -993,7 +995,7 @@ static int do_simple_get(MPID_Win *win_ptr, MPIDI_Win_lock_queue *lock_queue)
 
     req = MPID_Request_create();
     if (req == NULL) {
-        MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+        MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomemreq");
     }
     req->dev.target_win_handle = win_ptr->handle;
     req->dev.source_win_handle = lock_queue->source_win_handle;

src/mpid/ch3/src/ch3u_port.c

@@ -1234,7 +1234,7 @@ int MPIDI_CH3I_Acceptq_enqueue(MPIDI_VC_t * vc, int port_name_tag )
     /* --BEGIN ERROR HANDLING-- */
     if (q_item == NULL)
     {
-        mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, FCNAME, __LINE__, MPI_ERR_OTHER, "**nomem", 0);
+        mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, FCNAME, __LINE__, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDI_CH3I_Acceptq_t" );
 	goto fn_exit;
     }
     /* --END ERROR HANDLING-- */

src/mpid/ch3/src/ch3u_request.c

@@ -233,7 +233,8 @@ int MPIDI_CH3U_Request_load_send_iov(MPID_Request * const sreq,
 	    {
 		MPIU_DBG_MSG(CH3_CHANNEL,TYPICAL,"SRBuf allocation failure");
 		mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, 
-                                FCNAME, __LINE__, MPI_ERR_OTHER, "**nomem", 0);
+                                FCNAME, __LINE__, MPI_ERR_OTHER, "**nomem", 
+						 "**nomem %d", data_sz);
 		sreq->status.MPI_ERROR = mpi_errno;
 		goto fn_exit;
 	    }
@@ -418,7 +419,9 @@ int MPIDI_CH3U_Request_load_recv_iov(MPID_Request * const rreq)
 		   a fatal error? */
 		MPIU_DBG_MSG(CH3_CHANNEL,VERBOSE,"SRBuf allocation failure");
 		mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, 
-			      FCNAME, __LINE__, MPI_ERR_OTHER, "**nomem", 0);
+			      FCNAME, __LINE__, MPI_ERR_OTHER, "**nomem", 
+			 "**nomem %d", 
+			 rreq->dev.segment_size - rreq->dev.segment_first);
 		rreq->status.MPI_ERROR = mpi_errno;
 		goto fn_exit;
 	    }

src/mpid/ch3/src/ch3u_rma_ops.c

@@ -34,7 +34,8 @@ int MPIDI_Win_create(void *base, MPI_Aint size, int disp_unit, MPID_Info *info,
     rank = comm_ptr->rank;
     
     *win_ptr = (MPID_Win *)MPIU_Handle_obj_alloc( &MPID_Win_mem );
-    MPIU_ERR_CHKANDJUMP(!(*win_ptr),mpi_errno,MPI_ERR_OTHER,"**nomem");
+    MPIU_ERR_CHKANDJUMP1(!(*win_ptr),mpi_errno,MPI_ERR_OTHER,"**nomem",
+			 "**nomem %s","MPID_Win_mem");
 
     MPIU_Object_set_ref(*win_ptr, 1);
 
@@ -488,7 +489,8 @@ int MPIDI_Accumulate(void *origin_addr, int origin_count, MPI_Datatype
 	    else {
 	    
 		segp = MPID_Segment_alloc();
-		MPIU_ERR_CHKANDJUMP((!segp), mpi_errno, MPI_ERR_OTHER, "**nomem"); 
+		MPIU_ERR_CHKANDJUMP1((!segp), mpi_errno, MPI_ERR_OTHER, 
+				    "**nomem","**nomem %s","MPID_Segment_alloc"); 
 		MPID_Segment_init(NULL, target_count, target_datatype, segp, 0);
 		first = 0;
 		last  = SEGMENT_IGNORE_LAST;

src/mpid/ch3/src/ch3u_rma_sync.c

@@ -553,7 +553,7 @@ static int MPIDI_CH3I_Send_rma_msg(MPIDI_RMA_ops *rma_op, MPID_Win *win_ptr,
         {
             /* derived datatype on origin */
             *request = MPID_Request_create();
-            MPIU_ERR_CHKANDJUMP(*request == NULL,mpi_errno,MPI_ERR_OTHER,"**nomem");
+            MPIU_ERR_CHKANDJUMP(*request == NULL,mpi_errno,MPI_ERR_OTHER,"**nomemreq");
             
             MPIU_Object_set_ref(*request, 2);
             (*request)->kind = MPID_REQUEST_SEND;
@@ -586,7 +586,7 @@ static int MPIDI_CH3I_Send_rma_msg(MPIDI_RMA_ops *rma_op, MPID_Win *win_ptr,
 
         *request = MPID_Request_create();
         if (*request == NULL) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomemreq");
         }
 
         MPIU_Object_set_ref(*request, 2);
@@ -673,7 +673,7 @@ static int MPIDI_CH3I_Recv_rma_msg(MPIDI_RMA_ops *rma_op, MPID_Win *win_ptr,
        handle. */  
     req = MPID_Request_create();
     if (req == NULL) {
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomemreq");
     }
 
     *request = req;
@@ -1911,7 +1911,7 @@ static int MPIDI_CH3I_Send_lock_put_or_acc(MPID_Win *win_ptr)
 
         request = MPID_Request_create();
         if (request == NULL) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomemreq");
         }
 
         MPIU_Object_set_ref(request, 2);
@@ -2014,7 +2014,7 @@ static int MPIDI_CH3I_Send_lock_get(MPID_Win *win_ptr)
        handle. */  
     rreq = MPID_Request_create();
     if (rreq == NULL) {
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomemreq");
     }
 
     MPIU_Object_set_ref(rreq, 2);
@@ -2256,12 +2256,14 @@ int MPIDI_CH3_PktHandler_Put( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
         req->dev.dtype_info = (MPIDI_RMA_dtype_info *) 
             MPIU_Malloc(sizeof(MPIDI_RMA_dtype_info));
         if (! req->dev.dtype_info) {
-            MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+            MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %s",
+				 "MPIDI_RMA_dtype_info");
         }
 
         req->dev.dataloop = MPIU_Malloc(put_pkt->dataloop_size);
         if (! req->dev.dataloop) {
-            MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+            MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %d",
+				 put_pkt->dataloop_size);
         }
 
         /* if we received all of the dtype_info and dataloop, copy it
@@ -2396,12 +2398,14 @@ int MPIDI_CH3_PktHandler_Get( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
 	req->dev.dtype_info = (MPIDI_RMA_dtype_info *) 
 	    MPIU_Malloc(sizeof(MPIDI_RMA_dtype_info));
 	if (! req->dev.dtype_info) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %s",
+				 "MPIDI_RMA_dtype_info");
 	}
 	
 	req->dev.dataloop = MPIU_Malloc(get_pkt->dataloop_size);
 	if (! req->dev.dataloop) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %d",
+				 get_pkt->dataloop_size);
 	}
 	
         /* if we received all of the dtype_info and dataloop, copy it
@@ -2488,7 +2492,8 @@ int MPIDI_CH3_PktHandler_Accumulate( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
 	tmp_buf = MPIU_Malloc(accum_pkt->count * 
 			      (MPIR_MAX(extent,true_extent)));
 	if (!tmp_buf) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem");
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %d",
+			 accum_pkt->count * MPIR_MAX(extent,true_extent));
 	}
 	
 	/* adjust for potential negative lower bound in datatype */
@@ -2539,12 +2544,14 @@ int MPIDI_CH3_PktHandler_Accumulate( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
 	req->dev.dtype_info = (MPIDI_RMA_dtype_info *) 
 	    MPIU_Malloc(sizeof(MPIDI_RMA_dtype_info));
 	if (! req->dev.dtype_info) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %s",
+				 "MPIDI_RMA_dtype_info");
 	}
 	
 	req->dev.dataloop = MPIU_Malloc(accum_pkt->dataloop_size);
 	if (! req->dev.dataloop) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %d",
+				 accum_pkt->dataloop_size);
 	}
 	
         if (data_len >= sizeof(MPIDI_RMA_dtype_info) + accum_pkt->dataloop_size)
@@ -2634,7 +2641,8 @@ int MPIDI_CH3_PktHandler_Lock( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
 	
 	new_ptr = (MPIDI_Win_lock_queue *) MPIU_Malloc(sizeof(MPIDI_Win_lock_queue));
 	if (!new_ptr) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %s",
+				 "MPIDI_Win_lock_queue");
 	}
 	if (prev_ptr != NULL)
 	    prev_ptr->next = new_ptr;
@@ -2707,12 +2715,14 @@ int MPIDI_CH3_PktHandler_LockPutUnlock( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
 	
 	new_ptr = (MPIDI_Win_lock_queue *) MPIU_Malloc(sizeof(MPIDI_Win_lock_queue));
 	if (!new_ptr) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %s",
+				 "MPIDI_Win_lock_queue");
 	}
 	
 	new_ptr->pt_single_op = (MPIDI_PT_single_op *) MPIU_Malloc(sizeof(MPIDI_PT_single_op));
 	if (new_ptr->pt_single_op == NULL) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %s",
+				 "MPIDI_PT_single_op");
 	}
 	
 	/* FIXME: MT: The queuing may need to be done atomically. */
@@ -2742,7 +2752,8 @@ int MPIDI_CH3_PktHandler_LockPutUnlock( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
 	/* allocate memory to receive the data */
 	new_ptr->pt_single_op->data = MPIU_Malloc(req->dev.recv_data_sz);
 	if (new_ptr->pt_single_op->data == NULL) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %d",
+				 req->dev.recv_data_sz);
 	}
 
 	new_ptr->pt_single_op->data_recd = 0;
@@ -2874,11 +2885,13 @@ int MPIDI_CH3_PktHandler_LockGetUnlock( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
 	
 	new_ptr = (MPIDI_Win_lock_queue *) MPIU_Malloc(sizeof(MPIDI_Win_lock_queue));
 	if (!new_ptr) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %s",
+				 "MPIDI_Win_lock_queue");
 	}
 	new_ptr->pt_single_op = (MPIDI_PT_single_op *) MPIU_Malloc(sizeof(MPIDI_PT_single_op));
 	if (new_ptr->pt_single_op == NULL) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %s",
+				 "MPIDI_PT_Single_op");
 	}
 	
 	if (prev_ptr != NULL)
@@ -2950,12 +2963,14 @@ int MPIDI_CH3_PktHandler_LockAccumUnlock( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
     
     new_ptr = (MPIDI_Win_lock_queue *) MPIU_Malloc(sizeof(MPIDI_Win_lock_queue));
     if (!new_ptr) {
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %s",
+			     "MPIDI_Win_lock_queue");
     }
     
     new_ptr->pt_single_op = (MPIDI_PT_single_op *) MPIU_Malloc(sizeof(MPIDI_PT_single_op));
     if (new_ptr->pt_single_op == NULL) {
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %s",
+			     "MPIDI_PT_single_op");
     }
     
     MPID_Win_get_ptr(lock_accum_unlock_pkt->target_win_handle, win_ptr);
@@ -2988,7 +3003,8 @@ int MPIDI_CH3_PktHandler_LockAccumUnlock( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt,
     /* allocate memory to receive the data */
     new_ptr->pt_single_op->data = MPIU_Malloc(req->dev.recv_data_sz);
     if (new_ptr->pt_single_op->data == NULL) {
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomem" );
+	MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %d",
+			     req->dev.recv_data_sz);
     }
     
     new_ptr->pt_single_op->data_recd = 0;

src/mpid/ch3/src/mpid_init.c

@@ -381,7 +381,8 @@ static int InitPG( int *argc, char ***argv,
         /* This memory will be freed by the PG_Destroy if there is an error */
 	pg_id = MPIU_Malloc(MAX_JOBID_LEN);
 	if (pg_id == NULL) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER, "**nomem");
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %d",
+				 MAX_JOBID_LEN);
 	}
 
         mpi_errno = PMI2_Job_GetId(pg_id, MAX_JOBID_LEN);
@@ -403,7 +404,8 @@ static int InitPG( int *argc, char ***argv,
 	/* This memory will be freed by the PG_Destroy if there is an error */
 	pg_id = MPIU_Malloc(pg_id_sz + 1);
 	if (pg_id == NULL) {
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER, "**nomem");
+	    MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**nomem","**nomem %d",
+				 pg_id_sz+1);
 	}
 
 	/* Note in the singleton init case, the pg_id is a dummy.
@@ -501,7 +503,8 @@ int MPIDI_CH3I_BCInit( char **bc_val_p, int *val_max_sz_p )
     /* This memroy is returned by this routine */
     *bc_val_p = MPIU_Malloc(*val_max_sz_p);
     if (*bc_val_p == NULL) {
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER, "**nomem");
+	MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER, "**nomem","**nomem %d",
+			     *val_max_sz_p);
     }
     
     /* Add a null to simplify looking at the bc */

src/mpid/ch3/src/mpid_irecv.c

@@ -38,7 +38,7 @@ int MPID_Irecv(void * buf, int count, MPI_Datatype datatype, int rank, int tag,
 	}
 	else
 	{
-	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_NO_MEM, "**nomem");
+	    MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomemreq");
 	}
 	goto fn_exit;
     }
@@ -50,7 +50,7 @@ int MPID_Irecv(void * buf, int count, MPI_Datatype datatype, int rank, int tag,
     if (rreq == NULL)
     {
 	MPIU_THREAD_CS_EXIT(MSGQUEUE,);
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_NO_MEM, "**nomem");
+	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomemreq");
     }
 
     if (found)

src/mpid/ch3/src/mpid_recv.c

@@ -45,7 +45,7 @@ int MPID_Recv(void * buf, int count, MPI_Datatype datatype, int rank, int tag,
                                        comm, buf, count, datatype, &found);
     if (rreq == NULL) {
 	MPIU_THREAD_CS_EXIT(MSGQUEUE,);
-	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_NO_MEM, "**nomem");
+	MPIU_ERR_SETANDJUMP(mpi_errno,MPI_ERR_OTHER,"**nomemreq");
     }
 
     if (found)

src/mpid/ch3/src/mpid_startall.c

@@ -303,7 +303,7 @@ int MPID_Recv_init(void * buf, int count, MPI_Datatype datatype, int rank, int t
     if (rreq == NULL)
     {
 	/* --BEGIN ERROR HANDLING-- */
-	mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, FCNAME, __LINE__, MPI_ERR_OTHER, "**nomem", 0);
+	mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, FCNAME, __LINE__, MPI_ERR_OTHER, "**nomemreq", 0);
 	/* --END ERROR HANDLING-- */
 	goto fn_exit;
     }

src/mpid/ch3/src/mpidi_isend_self.c

@@ -48,7 +48,8 @@ int MPIDI_Isend_self(const void * buf, int count, MPI_Datatype datatype, int ran
 	MPIU_Object_set_ref(sreq, 0);
 	MPIDI_CH3_Request_destroy(sreq);
 	sreq = NULL;
-        MPIU_ERR_SET1(mpi_errno, MPI_ERR_NO_MEM, "**nomem", "**nomemuereq %d", MPIDI_CH3U_Recvq_count_unexp());
+        MPIU_ERR_SET1(mpi_errno, MPI_ERR_OTHER, "**nomem", 
+		      "**nomemuereq %d", MPIDI_CH3U_Recvq_count_unexp());
 	goto fn_exit;
     }
     /* --END ERROR HANDLING-- */