Return OMPI_ERR_RESOURCE_BUSY from sm->btl_send() function if there is no place in cb. This will prevent OB1 from doing early completion of small sends.

This commit was SVN r18424.

ompi/mca/btl/sm/btl_sm.c

@@ -640,7 +640,7 @@ int mca_btl_sm_send(
      */
     MCA_BTL_SM_FIFO_WRITE(endpoint, endpoint->my_smp_rank,
             endpoint->peer_smp_rank, frag->hdr, false, rc);
-    return OMPI_SUCCESS;
+    return rc;
 }
 
 int mca_btl_sm_ft_event(int state) {

ompi/mca/btl/sm/btl_sm_fifo.h

@@ -17,7 +17,7 @@ do {                                                                        \
     if(ompi_fifo_write_to_head(hdr, fifo, mca_btl_sm_component.sm_mpool)    \
             != OMPI_SUCCESS) {                                              \
         btl_sm_add_pending(endpoint_peer, hdr, resend);                     \
-        rc = OMPI_ERR_TEMP_OUT_OF_RESOURCE;                                 \
+        rc = OMPI_ERR_RESOURCE_BUSY;                                        \
     } else {                                                                \
         MCA_BTL_SM_SIGNAL_PEER(endpoint_peer);                              \
         rc = OMPI_SUCCESS;                                                  \