Last commit for TODAY ! At least the hello_world example work.

This commit was SVN r2111.

src/mca/ptl/gm/src/ptl_gm.c

@@ -61,9 +61,6 @@ OBJ_CLASS_INSTANCE (mca_ptl_gm_send_request_t,
 
 OBJ_CLASS_INSTANCE (mca_ptl_gm_peer_t, ompi_list_item_t, NULL, NULL);
 
-
-
-
 /*
  *
  */
@@ -80,9 +77,11 @@ mca_ptl_gm_add_procs (struct mca_ptl_base_module_t *ptl,
     mca_ptl_gm_proc_t *ptl_proc;
     mca_ptl_gm_peer_t *ptl_peer;
     unsigned int lid;
+    ompi_proc_t* local_proc = ompi_proc_local();
 
     for (i = 0; i < nprocs; i++) {
         ompi_proc = ompi_procs[i];
+        if( ompi_proc == local_proc ) continue;
         ptl_proc =
             mca_ptl_gm_proc_create ((mca_ptl_gm_module_t *) ptl,
                                     ompi_proc);
@@ -101,8 +100,7 @@ mca_ptl_gm_add_procs (struct mca_ptl_base_module_t *ptl,
         /* XXX: */
         /* FIXME: */
 
-       for (j=0; j < num_peer_ptls; j++)
-       {
+        for (j=0; j < num_peer_ptls; j++) {
             /*XXX: check for self */
 
             ptl_peer = OBJ_NEW (mca_ptl_gm_peer_t);
@@ -125,7 +123,7 @@ mca_ptl_gm_add_procs (struct mca_ptl_base_module_t *ptl,
             }
             ptl_peer->local_id = lid;
 
-        ptl_proc->peer_arr[0] = ptl_peer;
+            ptl_proc->peer_arr[ptl_proc->proc_peer_count] = ptl_peer;
             ptl_proc->proc_peer_count++;
             ptl_peer->peer_addr = ptl_proc->proc_addrs + i;
         }
@@ -148,9 +146,6 @@ mca_ptl_gm_add_procs (struct mca_ptl_base_module_t *ptl,
     return OMPI_SUCCESS;
 }
 
-
-
-
 /*
  *
  */
@@ -167,9 +162,6 @@ mca_ptl_gm_del_procs (struct mca_ptl_base_module_t *ptl,
     return OMPI_SUCCESS;
 }
 
-
-
-
 /*
  *
  */
@@ -208,12 +200,6 @@ mca_ptl_gm_request_init(struct mca_ptl_base_module_t *ptl,
     return OMPI_SUCCESS;
 }
 
-
-
-
-
-
-
 /*
  *
  */

src/mca/ptl/gm/src/ptl_gm_priv.c

@@ -167,8 +167,6 @@ void ptl_gm_ctrl_frag(struct mca_ptl_gm_module_t *ptl,
 
 }
 
-
-
 mca_ptl_gm_recv_frag_t* ptl_gm_data_frag( struct mca_ptl_gm_module_t *ptl,
                                           gm_recv_event_t* event )
 {
@@ -201,15 +199,13 @@ mca_ptl_gm_recv_frag_t* ptl_gm_data_frag( struct mca_ptl_gm_module_t *ptl,
                                  &recv_frag->frag_recv.frag_base.frag_header.hdr_match,
                                  &(recv_frag->frag_recv),
                                  NULL );
-
-
-    if (!matched) {
+    if( matched ) {
+        mca_ptl_gm_matched( &(ptl->super), &(recv_frag->frag_recv) );
+        return NULL;
+    }
     ompi_output(0,"matching receive not yet posted\n");
     return recv_frag;
 }
-    /* this one was matched => nothing more to do */
-    return NULL;
-}
 
 
 
@@ -249,7 +245,6 @@ int mca_ptl_gm_incoming_recv (mca_ptl_gm_component_t * gm_comp)
 
     for( i = 0; i< gm_comp->gm_num_ptl_modules; i++) {
         ptl = gm_comp->gm_ptl_modules[i];
-
         event = gm_receive(ptl->my_port);
 
         switch (gm_ntohc(event->recv.type)) {
@@ -269,6 +264,8 @@ int mca_ptl_gm_incoming_recv (mca_ptl_gm_component_t * gm_comp)
                 /* mark the fragment as having pending buffers */
                 frag->have_allocated_buffer = true;
             }
+            gm_provide_receive_buffer( ptl->my_port, gm_ntohp(event->recv.message),
+                                       GM_SIZE, GM_LOW_PRIORITY );
             break;
         case GM_NO_RECV_EVENT:
             break;
@@ -277,9 +274,6 @@ int mca_ptl_gm_incoming_recv (mca_ptl_gm_component_t * gm_comp)
             gm_unknown(ptl->my_port, event);
 
         }
-        /* Alway repost the message */
-        gm_provide_receive_buffer( ptl->my_port, gm_ntohp(event->recv.message),
-                                   GM_SIZE, GM_LOW_PRIORITY );
     }  
     return 0;
 }

src/mca/ptl/gm/src/ptl_gm_proc.c

@@ -126,8 +126,7 @@ mca_ptl_gm_proc_create (mca_ptl_gm_module_t * ptl, ompi_proc_t * ompi_proc)
         return NULL;
     }
 
-     if(NULL == mca_ptl_gm_component.gm_local && ompi_proc ==
-ompi_proc_local() )
+    if(NULL == mca_ptl_gm_component.gm_local && ompi_proc == ompi_proc_local() )
         mca_ptl_gm_component.gm_local = ptl_proc;
 
     return ptl_proc;