[mpich2-commits] r5434 - in mpich2/branches/release/mpich2-1.2: . confdb src/mpid/ch3/channels/nemesis/nemesis/netmod/mx

[balaji at mcs.anl.gov]

Author: balaji
Date: 2009-10-08 09:06:24 -0500 (Thu, 08 Oct 2009)
New Revision: 5434

Modified:
   mpich2/branches/release/mpich2-1.2/
   mpich2/branches/release/mpich2-1.2/confdb/
   mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_poll.c
   mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_send.c
Log:
Merge r5432 and r5433 from trunk -- fixes to the MX compilation error
(ticket #892).



Property changes on: mpich2/branches/release/mpich2-1.2
___________________________________________________________________
Modified: svn:mergeinfo
   - /mpich2/branches/dev/ckpt2:5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/trunk:5410,5418,5422,5429
   + /mpich2/branches/dev/ckpt2:5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/trunk:5410,5418,5422,5429,5432-5433


Property changes on: mpich2/branches/release/mpich2-1.2/confdb
___________________________________________________________________
Modified: svn:mergeinfo
   - /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/trunk/confdb:5410,5418,5422,5429
   + /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/trunk/confdb:5410,5418,5422,5429,5432-5433

Modified: mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_poll.c
===================================================================
--- mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_poll.c	2009-10-08 10:01:55 UTC (rev 5433)
+++ mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_poll.c	2009-10-08 14:06:24 UTC (rev 5434)
@@ -692,8 +692,8 @@
   mx_request_t *mx_request = NULL;
   mx_return_t ret;
   uint32_t    result;
-  int matched = FALSE;
-
+  int matched   = FALSE;
+  int mpi_errno = MPI_SUCCESS;
    
   MPID_NEM_MX_GET_REQ_FROM_HASH(rreq,mx_request);
   if(mx_request != NULL)
@@ -752,10 +752,17 @@
   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);
   MPIU_Assert(last == rreq->dev.segment_size);

Modified: mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_send.c
===================================================================
--- mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_send.c	2009-10-08 10:01:55 UTC (rev 5433)
+++ mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/mx/mx_send.c	2009-10-08 14:06:24 UTC (rev 5434)
@@ -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;