[mpich2-commits] r5433 - mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx

[mercierg at mcs.anl.gov]

Author: mercierg
Date: 2009-10-08 05:01:55 -0500 (Thu, 08 Oct 2009)
New Revision: 5433

Modified:
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_poll.c
   mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_send.c
Log:
The previous commit was a fix for ticket #892.
Some experimental code was also commited. Back to the previous version
for non-contiguous datype management. This has to be fixed, though.



Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_poll.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_poll.c	2009-10-08 09:42:17 UTC (rev 5432)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_poll.c	2009-10-08 10:01:55 UTC (rev 5433)
@@ -734,8 +734,8 @@
   MPID_IOV  *iov;
   MPIDI_msg_sz_t last;
   int num_entries = MX_MAX_SEGMENTS;
-  //int iov_num_ub  = rreq->dev.user_count * dt_ptr->max_contig_blocks;
-  int n_iov       = 0 ; //iov_num_ub;
+  int iov_num_ub  = rreq->dev.user_count * dt_ptr->max_contig_blocks;
+  int n_iov       = iov_num_ub;
   int mpi_errno   = MPI_SUCCESS;
   int index;
   
@@ -752,16 +752,16 @@
   rreq->dev.segment_first = 0;
   rreq->dev.segment_size = data_sz;
   last = rreq->dev.segment_size;
-   
+  
+  /* 
   MPID_Segment_count_contig_blocks(sreq->dev.segment_ptr ,first,&last,&n_iov);
   MPIU_Assert(n_iov > 0);
-   
-  /* 
+  */
+
   if(n_iov <= 0)
   {
      n_iov = rreq->dev.user_count * dt_ptr->n_elements;
   } 
-  */
    
   iov = MPIU_Malloc(n_iov*sizeof(MPID_IOV));
   MPID_Segment_unpack_vector(rreq->dev.segment_ptr, rreq->dev.segment_first, &last, iov, &n_iov);

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_send.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_send.c	2009-10-08 09:42:17 UTC (rev 5432)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_send.c	2009-10-08 10:01:55 UTC (rev 5433)
@@ -410,6 +410,12 @@
     sreq->dev.segment_first = 0;
     sreq->dev.segment_size = data_sz;
     last = sreq->dev.segment_size;
+   
+    /*
+    MPID_Segment_count_contig_blocks(sreq->dev.segment_ptr ,first,&last,&n_iov);
+    MPIU_Assert(n_iov > 0);
+    */
+
     if(n_iov <= 0)
     {	
        n_iov = count * dt_ptr->n_elements;