Comm_spawn stuff

This commit was SVN r3765.

src/mca/gpr/proxy/gpr_proxy_component.c

@@ -360,7 +360,7 @@ void mca_gpr_proxy_notify_recv(int status, ompi_process_name_t* sender,
     /* dismantle message and free memory */
 
  RETURN_ERROR:
-    OBJ_RELEASE(message);
+    free(message);
 
     /* reissue non-blocking receive */
     mca_oob_recv_packed_nb(MCA_OOB_NAME_ANY, MCA_OOB_TAG_GPR_NOTIFY, 0, mca_gpr_proxy_notify_recv, NULL);

src/mca/gpr/replica/gpr_replica_xmit_alerts.c

@@ -318,5 +318,6 @@ void mca_gpr_replica_remote_notify(ompi_process_name_t *recipient, int recipient
     }
 
     ompi_buffer_free(msg);
-    OBJ_RELEASE(message);
+    /* FIX */
+    free(message);
 }

src/mca/oob/tcp/oob_tcp_msg.c

@@ -61,7 +61,7 @@ int mca_oob_tcp_msg_wait(mca_oob_tcp_msg_t* msg, int* rc)
             int rc;
             OMPI_THREAD_UNLOCK(&msg->msg_lock);
             rc = ompi_event_loop(OMPI_EVLOOP_ONCE);
-            assert(rc == 0);
+            assert(rc >= 0);
             OMPI_THREAD_LOCK(&msg->msg_lock);
         } else {
            ompi_condition_wait(&msg->msg_condition, &msg->msg_lock);
@@ -105,7 +105,7 @@ int mca_oob_tcp_msg_timedwait(mca_oob_tcp_msg_t* msg, int* rc, struct timespec*
             int rc;
             OMPI_THREAD_UNLOCK(&msg->msg_lock);
             rc = ompi_event_loop(OMPI_EVLOOP_ONCE);
-            assert(rc == 0);
+            assert(rc >= 0);
             OMPI_THREAD_LOCK(&msg->msg_lock);
         } else {
            ompi_condition_timedwait(&msg->msg_condition, &msg->msg_lock, abstime);
@@ -363,7 +363,7 @@ static void mca_oob_tcp_msg_data(mca_oob_tcp_msg_t* msg, mca_oob_tcp_peer_t* pee
      * the message header has already been converted back to host -
      * so must convert back to network to match.
     */
-    post = mca_oob_tcp_msg_match_post(&peer->peer_name, ntohl(msg->msg_hdr.msg_tag),true);
+    post = mca_oob_tcp_msg_match_post(&peer->peer_name, msg->msg_hdr.msg_tag, true);
     if(NULL != post) {
                                                                                                                           
         if(post->msg_flags & MCA_OOB_ALLOC) {

src/mca/oob/tcp/oob_tcp_recv.c

@@ -221,8 +221,6 @@ int mca_oob_tcp_recv_nb(
     msg->msg_hdr.msg_dst = *peer;
     msg->msg_hdr.msg_size = size;
     msg->msg_hdr.msg_tag = tag;
-    MCA_OOB_TCP_HDR_HTON(&msg->msg_hdr);
-
     msg->msg_type = MCA_OOB_TCP_POSTED;
     msg->msg_rc = 0;
     msg->msg_flags = flags;