r10633 - in mpich2/trunk/src/mpi/romio/adio: ad_bg ad_bgl ad_lustre ad_nfs ad_piofs ad_pvfs ad_pvfs2 ad_zoidfs common - commits

20 Nov 2012

Author: goodell
Date: 2012-11-20 16:20:53 -0600 (Tue, 20 Nov 2012)
New Revision: 10633

Modified:
   mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c
   mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c
   mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c
   mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c
   mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c
   mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c
   mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c
   mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_write.c
   mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c
   mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c
   mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c
   mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c
   mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c
   mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c
   mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c
   mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c
   mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c
   mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c
   mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c
Log:
update count in status for adio when filetype_size is zero

Contributed by IBM.  Patch 0001 from code discussions.

Modified: mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c
===================================================================

--- mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_read.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -212,6 +212,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_bg/ad_bg_write.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -253,6 +253,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -203,6 +203,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -253,6 +253,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -188,6 +188,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if (!filetype_size) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS;
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -187,6 +187,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -290,6 +290,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_write.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_write.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_piofs/ad_piofs_write.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -93,6 +93,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_read.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -150,6 +150,9 @@
     ADIOI_Datatype_iscontig(fd->filetype, &filetype_is_contig);
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs/ad_pvfs_write.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -130,6 +130,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }
@@ -514,6 +517,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_read_list_classic.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -70,6 +70,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/ad_pvfs2_write_list_classic.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -86,6 +86,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_read_list.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -72,6 +72,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/ad_zoidfs_write_list.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -86,6 +86,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_read_str.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -87,6 +87,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_read_str_naive.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -36,6 +36,9 @@
 
     MPI_Type_size(fd->filetype, (int*)&filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, buftype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_write_nolock.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -58,6 +58,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_write_str.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -157,6 +157,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, datatype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c	2012-11-20 22:20:51 UTC (rev 10632)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_write_str_naive.c	2012-11-20 22:20:53 UTC (rev 10633)
@@ -37,6 +37,9 @@
 
     MPI_Type_size(fd->filetype, &filetype_size);
     if ( ! filetype_size ) {
+#ifdef HAVE_STATUS_SET_BYTES
+	MPIR_Status_set_bytes(status, buftype, 0);
+#endif
 	*error_code = MPI_SUCCESS; 
 	return;
     }

    

r10633 - in mpich2/trunk/src/mpi/romio/adio: ad_bg ad_bgl ad_lustre ad_nfs ad_piofs ad_pvfs ad_pvfs2 ad_zoidfs common

goodell＠mcs.anl.gov

tags

participants (1)