[mpich2-commits] r7924 - in mpich2/branches/release/mpich2-1.3.x: . confdb maint src/mpi/romio/adio/ad_lustre src/mpi/romio/adio/ad_nfs src/mpi/romio/adio/ad_panfs src/mpi/romio/adio/common src/mpi/romio/adio/include src/mpi/romio/mpi-io src/mpi/romio/mpi-io/fortran src/mpi/romio/mpi-io/glue/default src/mpi/romio/mpi2-other/array src/mpid src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp src/mpl/src
robl at mcs.anl.gov
robl at mcs.anl.gov
Wed Feb 9 14:33:42 CST 2011
Author: robl
Date: 2011-02-09 14:33:41 -0600 (Wed, 09 Feb 2011)
New Revision: 7924
Modified:
mpich2/branches/release/mpich2-1.3.x/
mpich2/branches/release/mpich2-1.3.x/confdb/
mpich2/branches/release/mpich2-1.3.x/maint/Version
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/common/ad_read_str.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/common/ad_write_str.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/include/adioi.h
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/fortran/get_viewf.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/glue/default/mpio_err.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/iwrite_sh.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/read_sh.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/write_sh.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi2-other/array/darray.c
mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi2-other/array/subarray.c
mpich2/branches/release/mpich2-1.3.x/src/mpid/
mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c
mpich2/branches/release/mpich2-1.3.x/src/mpl/src/mplstr.c
mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf
Log:
merging r7921 r7922 and r7923 from trunk: Michael Raymond <mraymond at sgi.com>
contributed some compiler warning cleanups.
Property changes on: mpich2/branches/release/mpich2-1.3.x
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/mpich2/branches/dev/coll-err-ret:7771-7802
/mpich2/branches/dev/error-return:7662-7670
/mpich2/branches/dev/ftb:5661-5730
/mpich2/branches/dev/lapi:5817
/mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406
/mpich2/trunk:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912
+ /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/mpich2/branches/dev/coll-err-ret:7771-7802
/mpich2/branches/dev/error-return:7662-7670
/mpich2/branches/dev/ftb:5661-5730
/mpich2/branches/dev/lapi:5817
/mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406
/mpich2/trunk:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923
Property changes on: mpich2/branches/release/mpich2-1.3.x/confdb
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/dev/coll-err-ret/confdb:7771-7802
/mpich2/branches/dev/error-return/confdb:7662-7670
/mpich2/branches/dev/ftb/confdb:5661-5730
/mpich2/branches/dev/lapi/confdb:5817
/mpich2/branches/dev/wintcp_async_progress/confdb:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb:5406
/mpich2/trunk/confdb:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912
+ /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/dev/coll-err-ret/confdb:7771-7802
/mpich2/branches/dev/error-return/confdb:7662-7670
/mpich2/branches/dev/ftb/confdb:5661-5730
/mpich2/branches/dev/lapi/confdb:5817
/mpich2/branches/dev/wintcp_async_progress/confdb:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb:5406
/mpich2/trunk/confdb:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923
Property changes on: mpich2/branches/release/mpich2-1.3.x/maint/Version
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/maint/Version:5050
/mpich2/branches/dev/ckpt2/maint/Version:5057-6537
/mpich2/branches/dev/coll-err-ret/maint/Version:7771-7802
/mpich2/branches/dev/ftb/maint/Version:5661-5730
/mpich2/branches/dev/lapi/maint/Version:5817
/mpich2/branches/dev/wintcp_async_progress/maint/Version:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/maint/Version:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/maint/Version:5406
/mpich2/trunk/maint/Version:7422-7425,7429-7433,7435,7437-7438,7442-7447,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7676-7678,7681,7684,7686,7688,7690-7692,7694,7696,7700,7705,7707-7710,7712,7714,7719,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912
/mpich2/trunk/src/pm/hydra/VERSION:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7447,7604,7671,7674,7683,7685,7687,7701-7702,7720,7722
+ /mpich2/branches/dev/ckpt/maint/Version:5050
/mpich2/branches/dev/ckpt2/maint/Version:5057-6537
/mpich2/branches/dev/coll-err-ret/maint/Version:7771-7802
/mpich2/branches/dev/ftb/maint/Version:5661-5730
/mpich2/branches/dev/lapi/maint/Version:5817
/mpich2/branches/dev/wintcp_async_progress/maint/Version:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/maint/Version:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/maint/Version:5406
/mpich2/trunk/maint/Version:7422-7425,7429-7433,7435,7437-7438,7442-7447,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7676-7678,7681,7684,7686,7688,7690-7692,7694,7696,7700,7705,7707-7710,7712,7714,7719,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923
/mpich2/trunk/src/pm/hydra/VERSION:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7447,7604,7671,7674,7683,7685,7687,7701-7702,7720,7722
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_lustre/ad_lustre_wrstr.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -18,8 +18,9 @@
ADIO_WriteContig(fd, writebuf, writebuf_len, MPI_BYTE, \
ADIO_EXPLICIT_OFFSET, writebuf_off, \
&status1, error_code); \
- if (!(fd->atomicity)) \
+ if (!(fd->atomicity)) { \
ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ } \
if (*error_code != MPI_SUCCESS) { \
*error_code = MPIO_Err_create_code(*error_code, \
MPIR_ERR_RECOVERABLE, \
@@ -35,8 +36,9 @@
writebuf_len = (unsigned) ADIOI_MIN(end_offset - writebuf_off + 1, \
(writebuf_off / stripe_size + 1) * \
stripe_size - writebuf_off); \
- if (!(fd->atomicity)) \
+ if (!(fd->atomicity)) { \
ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ } \
ADIO_ReadContig(fd, writebuf, writebuf_len, MPI_BYTE, \
ADIO_EXPLICIT_OFFSET, \
writebuf_off, &status1, error_code); \
@@ -58,8 +60,9 @@
while (write_sz != req_len) { \
ADIO_WriteContig(fd, writebuf, writebuf_len, MPI_BYTE, \
ADIO_EXPLICIT_OFFSET, writebuf_off, &status1, error_code); \
- if (!(fd->atomicity)) \
+ if (!(fd->atomicity)) { \
ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ } \
if (*error_code != MPI_SUCCESS) { \
*error_code = MPIO_Err_create_code(*error_code, \
MPIR_ERR_RECOVERABLE, myname, \
@@ -75,8 +78,9 @@
writebuf_len = (unsigned) ADIOI_MIN(end_offset - writebuf_off + 1, \
(writebuf_off / stripe_size + 1) * \
stripe_size - writebuf_off); \
- if (!(fd->atomicity)) \
+ if (!(fd->atomicity)) { \
ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ } \
ADIO_ReadContig(fd, writebuf, writebuf_len, MPI_BYTE, \
ADIO_EXPLICIT_OFFSET, \
writebuf_off, &status1, error_code); \
@@ -222,8 +226,9 @@
writebuf_len = 0;
/* if atomicity is true, lock the region to be accessed */
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_WRITE_LOCK(fd, start_off, SEEK_SET, bufsize);
+ }
for (j = 0; j < count; j++) {
for (i = 0; i < flat_buf->count; i++) {
@@ -241,8 +246,9 @@
ADIO_EXPLICIT_OFFSET, writebuf_off, &status1,
error_code);
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_UNLOCK(fd, start_off, SEEK_SET, bufsize);
+ }
if (*error_code != MPI_SUCCESS) {
ADIOI_Free(writebuf);
return;
@@ -379,8 +385,9 @@
}
/* if atomicity is true, lock the region to be accessed */
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_WRITE_LOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
writebuf_off = 0;
writebuf_len = 0;
@@ -505,12 +512,14 @@
ADIO_WriteContig(fd, writebuf, writebuf_len, MPI_BYTE,
ADIO_EXPLICIT_OFFSET,
writebuf_off, &status1, error_code);
- if (!(fd->atomicity))
+ if (!(fd->atomicity)) {
ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);
+ }
if (*error_code != MPI_SUCCESS) return;
}
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_UNLOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
ADIOI_Free(writebuf);
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_nfs/ad_nfs_read.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -28,9 +28,9 @@
MPE_Log_event( ADIOI_MPE_lseek_b, 0, NULL );
#endif
}
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_WRITE_LOCK(fd, offset, SEEK_SET, len);
- else ADIOI_READ_LOCK(fd, offset, SEEK_SET, len);
+ } else ADIOI_READ_LOCK(fd, offset, SEEK_SET, len);
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_read_a, 0, NULL );
#endif
@@ -53,9 +53,9 @@
MPE_Log_event( ADIOI_MPE_lseek_b, 0, NULL );
#endif
}
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_WRITE_LOCK(fd, offset, SEEK_SET, len);
- else ADIOI_READ_LOCK(fd, offset, SEEK_SET, len);
+ } else ADIOI_READ_LOCK(fd, offset, SEEK_SET, len);
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_read_a, 0, NULL );
#endif
@@ -132,9 +132,9 @@
readbuf_off = req_off; \
readbuf_len = (int) (ADIOI_MIN(max_bufsize, end_offset-readbuf_off+1));\
lseek(fd->fd_sys, readbuf_off, SEEK_SET);\
- if (!(fd->atomicity)) ADIOI_READ_LOCK(fd, readbuf_off, SEEK_SET, readbuf_len);\
+ if (!(fd->atomicity)) {ADIOI_READ_LOCK(fd, readbuf_off, SEEK_SET, readbuf_len);} \
err = read(fd->fd_sys, readbuf, readbuf_len);\
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, readbuf_off, SEEK_SET, readbuf_len);\
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, readbuf_off, SEEK_SET, readbuf_len);} \
if (err == -1) err_flag = 1; \
} \
while (req_len > readbuf_off + readbuf_len - req_off) { \
@@ -149,9 +149,9 @@
readbuf_len = (int) (partial_read + ADIOI_MIN(max_bufsize, \
end_offset-readbuf_off+1)); \
lseek(fd->fd_sys, readbuf_off+partial_read, SEEK_SET);\
- if (!(fd->atomicity)) ADIOI_READ_LOCK(fd, readbuf_off+partial_read, SEEK_SET, readbuf_len-partial_read);\
+ if (!(fd->atomicity)) {ADIOI_READ_LOCK(fd, readbuf_off+partial_read, SEEK_SET, readbuf_len-partial_read);} \
err = read(fd->fd_sys, readbuf+partial_read, readbuf_len-partial_read);\
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, readbuf_off+partial_read, SEEK_SET, readbuf_len-partial_read);\
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, readbuf_off+partial_read, SEEK_SET, readbuf_len-partial_read);} \
if (err == -1) err_flag = 1; \
} \
memcpy((char *)buf + userbuf_off, readbuf+req_off-readbuf_off, req_len); \
@@ -224,8 +224,9 @@
readbuf_len = (int) (ADIOI_MIN(max_bufsize, end_offset-readbuf_off+1));
/* if atomicity is true, lock (exclusive) the region to be accessed */
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_WRITE_LOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_lseek_a, 0, NULL );
@@ -234,7 +235,7 @@
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_lseek_b, 0, NULL );
#endif
- if (!(fd->atomicity)) ADIOI_READ_LOCK(fd, readbuf_off, SEEK_SET, readbuf_len);
+ if (!(fd->atomicity)) {ADIOI_READ_LOCK(fd, readbuf_off, SEEK_SET, readbuf_len);}
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_read_a, 0, NULL );
#endif
@@ -242,7 +243,7 @@
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_read_b, 0, NULL );
#endif
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, readbuf_off, SEEK_SET, readbuf_len);
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, readbuf_off, SEEK_SET, readbuf_len);}
if (err == -1) err_flag = 1;
for (j=0; j<count; j++)
@@ -254,8 +255,9 @@
off += flat_buf->blocklens[i];
}
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_UNLOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
if (file_ptr_type == ADIO_INDIVIDUAL) fd->fp_ind = off;
@@ -383,8 +385,9 @@
}
/* if atomicity is true, lock (exclusive) the region to be accessed */
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_WRITE_LOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
/* initial read into readbuf */
readbuf_off = offset;
@@ -398,7 +401,7 @@
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_lseek_b, 0, NULL );
#endif
- if (!(fd->atomicity)) ADIOI_READ_LOCK(fd, offset, SEEK_SET, readbuf_len);
+ if (!(fd->atomicity)) {ADIOI_READ_LOCK(fd, offset, SEEK_SET, readbuf_len);}
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_read_a, 0, NULL );
#endif
@@ -406,7 +409,7 @@
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_read_b, 0, NULL );
#endif
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, offset, SEEK_SET, readbuf_len);
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, offset, SEEK_SET, readbuf_len);}
if (err == -1) err_flag = 1;
@@ -519,8 +522,9 @@
}
}
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_UNLOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
if (file_ptr_type == ADIO_INDIVIDUAL) fd->fp_ind = off;
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_nfs/ad_nfs_write.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -152,11 +152,11 @@
if (req_off >= writebuf_off + writebuf_len) { \
lseek(fd->fd_sys, writebuf_off, SEEK_SET); \
err = write(fd->fd_sys, writebuf, writebuf_len); \
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
if (err == -1) err_flag = 1; \
writebuf_off = req_off; \
writebuf_len = (int) (ADIOI_MIN(max_bufsize,end_offset-writebuf_off+1));\
- if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
lseek(fd->fd_sys, writebuf_off, SEEK_SET); \
err = read(fd->fd_sys, writebuf, writebuf_len); \
if (err == -1) { \
@@ -172,13 +172,13 @@
while (write_sz != req_len) { \
lseek(fd->fd_sys, writebuf_off, SEEK_SET); \
err = write(fd->fd_sys, writebuf, writebuf_len); \
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
if (err == -1) err_flag = 1; \
req_len -= write_sz; \
userbuf_off += write_sz; \
writebuf_off += writebuf_len; \
writebuf_len = (int) (ADIOI_MIN(max_bufsize,end_offset-writebuf_off+1));\
- if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
lseek(fd->fd_sys, writebuf_off, SEEK_SET); \
err = read(fd->fd_sys, writebuf, writebuf_len); \
if (err == -1) { \
@@ -203,11 +203,11 @@
MPE_Log_event( ADIOI_MPE_lseek_a, 0, NULL ); \
lseek(fd->fd_sys, writebuf_off, SEEK_SET); \
MPE_Log_event( ADIOI_MPE_lseek_b, 0, NULL ); \
- if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
MPE_Log_event( ADIOI_MPE_write_a, 0, NULL ); \
err = write(fd->fd_sys, writebuf, writebuf_len); \
MPE_Log_event( ADIOI_MPE_write_b, 0, NULL ); \
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
if (err == -1) err_flag = 1; \
writebuf_off = req_off; \
writebuf_len = (int) (ADIOI_MIN(max_bufsize,end_offset-writebuf_off+1));\
@@ -218,11 +218,11 @@
MPE_Log_event( ADIOI_MPE_lseek_a, 0, NULL ); \
lseek(fd->fd_sys, writebuf_off, SEEK_SET); \
MPE_Log_event( ADIOI_MPE_lseek_b, 0, NULL ); \
- if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
MPE_Log_event( ADIOI_MPE_write_a, 0, NULL ); \
err = write(fd->fd_sys, writebuf, writebuf_len); \
MPE_Log_event( ADIOI_MPE_write_b, 0, NULL ); \
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
if (err == -1) err_flag = 1; \
req_len -= write_sz; \
userbuf_off += write_sz; \
@@ -237,9 +237,9 @@
{ \
if (req_off >= writebuf_off + writebuf_len) { \
lseek(fd->fd_sys, writebuf_off, SEEK_SET); \
- if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
err = write(fd->fd_sys, writebuf, writebuf_len); \
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
if (err == -1) err_flag = 1; \
writebuf_off = req_off; \
writebuf_len = (int) (ADIOI_MIN(max_bufsize,end_offset-writebuf_off+1));\
@@ -248,9 +248,9 @@
memcpy(writebuf+req_off-writebuf_off, (char *)buf +userbuf_off, write_sz);\
while (write_sz != req_len) { \
lseek(fd->fd_sys, writebuf_off, SEEK_SET); \
- if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
err = write(fd->fd_sys, writebuf, writebuf_len); \
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
if (err == -1) err_flag = 1; \
req_len -= write_sz; \
userbuf_off += write_sz; \
@@ -327,8 +327,9 @@
writebuf_len = (int) (ADIOI_MIN(max_bufsize,end_offset-writebuf_off+1));
/* if atomicity is true, lock the region to be accessed */
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_WRITE_LOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
for (j=0; j<count; j++)
for (i=0; i<flat_buf->count; i++) {
@@ -347,7 +348,7 @@
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_lseek_b, 0, NULL );
#endif
- if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);
+ if (!(fd->atomicity)) {ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);}
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_write_a, 0, NULL );
#endif
@@ -355,11 +356,12 @@
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_write_b, 0, NULL );
#endif
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);}
if (err == -1) err_flag = 1;
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_UNLOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
ADIOI_Free(writebuf); /* malloced in the buffered_write macro */
@@ -486,14 +488,15 @@
}
/* if atomicity is true, lock the region to be accessed */
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_WRITE_LOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
/* initial read for the read-modify-write */
writebuf_off = offset;
writebuf = (char *) ADIOI_Malloc(max_bufsize);
writebuf_len = (int)(ADIOI_MIN(max_bufsize,end_offset-writebuf_off+1));
- if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);
+ if (!(fd->atomicity)) {ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);}
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_lseek_a, 0, NULL );
#endif
@@ -635,7 +638,7 @@
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_lseek_b, 0, NULL );
#endif
- if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);
+ if (!(fd->atomicity)) {ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);}
#ifdef ADIOI_MPE_LOGGING
MPE_Log_event( ADIOI_MPE_write_a, 0, NULL );
#endif
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/ad_panfs/ad_panfs_open.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -156,7 +156,7 @@
char* slash;
struct stat stat_buf;
int err;
- char *value, *path, *file_name_ptr;
+ char *path;
/* Check that the file does not exist before
* trying to create it. The ioctl itself should
@@ -327,6 +327,8 @@
ADIOI_Snprintf(temp_buffer,TEMP_BUFFER_SIZE,"%u",file_query_args.layout.u.raid10.layout_visit_policy);
ADIOI_Info_set(fd->info, "panfs_layout_visit_policy", temp_buffer);
break;
+ default:
+ break;
}
}
}
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/common/ad_read_str.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/common/ad_read_str.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/common/ad_read_str.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -126,8 +126,9 @@
readbuf_len = (unsigned) (ADIOI_MIN(max_bufsize, end_offset-readbuf_off+1));
/* if atomicity is true, lock (exclusive) the region to be accessed */
- if ((fd->atomicity) && ADIO_Feature(fd, ADIO_LOCKS))
+ if ((fd->atomicity) && ADIO_Feature(fd, ADIO_LOCKS)) {
ADIOI_WRITE_LOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
ADIO_ReadContig(fd, readbuf, readbuf_len, MPI_BYTE,
ADIO_EXPLICIT_OFFSET, readbuf_off, &status1, error_code);
@@ -144,8 +145,9 @@
}
}
- if ((fd->atomicity) && ADIO_Feature(fd, ADIO_LOCKS))
+ if ((fd->atomicity) && ADIO_Feature(fd, ADIO_LOCKS)) {
ADIOI_UNLOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
if (file_ptr_type == ADIO_INDIVIDUAL) fd->fp_ind = off;
@@ -265,8 +267,9 @@
}
/* if atomicity is true, lock (exclusive) the region to be accessed */
- if ((fd->atomicity) && ADIO_Feature(fd, ADIO_LOCKS))
+ if ((fd->atomicity) && ADIO_Feature(fd, ADIO_LOCKS)) {
ADIOI_WRITE_LOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
readbuf_off = 0;
readbuf_len = 0;
@@ -382,8 +385,9 @@
}
}
- if ((fd->atomicity) && ADIO_Feature(fd, ADIO_LOCKS))
+ if ((fd->atomicity) && ADIO_Feature(fd, ADIO_LOCKS)) {
ADIOI_UNLOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
if (file_ptr_type == ADIO_INDIVIDUAL) fd->fp_ind = off;
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/common/ad_write_str.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/common/ad_write_str.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/common/ad_write_str.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -14,7 +14,7 @@
if (writebuf_len) { \
ADIO_WriteContig(fd, writebuf, writebuf_len, MPI_BYTE, \
ADIO_EXPLICIT_OFFSET, writebuf_off, &status1, error_code); \
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
if (*error_code != MPI_SUCCESS) { \
*error_code = MPIO_Err_create_code(*error_code, \
MPIR_ERR_RECOVERABLE, myname, \
@@ -25,7 +25,7 @@
} \
writebuf_off = req_off; \
writebuf_len = (unsigned) (ADIOI_MIN(max_bufsize,end_offset-writebuf_off+1));\
- if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
ADIO_ReadContig(fd, writebuf, writebuf_len, MPI_BYTE, \
ADIO_EXPLICIT_OFFSET, writebuf_off, &status1, error_code); \
if (*error_code != MPI_SUCCESS) { \
@@ -42,7 +42,7 @@
while (write_sz != req_len) { \
ADIO_WriteContig(fd, writebuf, writebuf_len, MPI_BYTE, \
ADIO_EXPLICIT_OFFSET, writebuf_off, &status1, error_code); \
- if (!(fd->atomicity)) ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
if (*error_code != MPI_SUCCESS) { \
*error_code = MPIO_Err_create_code(*error_code, \
MPIR_ERR_RECOVERABLE, myname, \
@@ -54,7 +54,7 @@
userbuf_off += write_sz; \
writebuf_off += writebuf_len; \
writebuf_len = (unsigned) (ADIOI_MIN(max_bufsize,end_offset-writebuf_off+1));\
- if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
+ if (!(fd->atomicity)) {ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);} \
ADIO_ReadContig(fd, writebuf, writebuf_len, MPI_BYTE, \
ADIO_EXPLICIT_OFFSET, writebuf_off, &status1, error_code); \
if (*error_code != MPI_SUCCESS) { \
@@ -191,8 +191,9 @@
writebuf_len = (unsigned) (ADIOI_MIN(max_bufsize, end_offset-writebuf_off+1));
/* if atomicity is true, lock the region to be accessed */
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_WRITE_LOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
for (j=0; j<count; j++)
{
@@ -209,8 +210,9 @@
ADIO_WriteContig(fd, writebuf, writebuf_len, MPI_BYTE, ADIO_EXPLICIT_OFFSET,
writebuf_off, &status1, error_code);
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_UNLOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
if (*error_code != MPI_SUCCESS) return;
@@ -334,8 +336,9 @@
}
/* if atomicity is true, lock the region to be accessed */
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_WRITE_LOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
writebuf_off = 0;
writebuf_len = 0;
@@ -457,12 +460,14 @@
if (writebuf_len) {
ADIO_WriteContig(fd, writebuf, writebuf_len, MPI_BYTE, ADIO_EXPLICIT_OFFSET,
writebuf_off, &status1, error_code);
- if (!(fd->atomicity))
+ if (!(fd->atomicity)) {
ADIOI_UNLOCK(fd, writebuf_off, SEEK_SET, writebuf_len);
+ }
if (*error_code != MPI_SUCCESS) return;
}
- if (fd->atomicity)
+ if (fd->atomicity) {
ADIOI_UNLOCK(fd, start_off, SEEK_SET, end_offset-start_off+1);
+ }
ADIOI_Free(writebuf);
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/include/adioi.h
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/include/adioi.h 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/adio/include/adioi.h 2011-02-09 20:33:41 UTC (rev 7924)
@@ -835,7 +835,7 @@
#define ADIOI_AINT_CAST_TO_OFFSET ADIOI_AINT_CAST_TO_LONG_LONG
#define ADIOI_ENSURE_AINT_FITS_IN_PTR(aint_value)
#define ADIOI_Assert assert
- #define MPIR_Upint unsigned int
+ #define MPIR_Upint unsigned long
#define MPIU_THREADPRIV_DECL
#endif
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/fortran/get_viewf.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/fortran/get_viewf.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/fortran/get_viewf.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -160,7 +160,8 @@
tmprep = (char *) ADIOI_Malloc((MPI_MAX_DATAREP_STRING+1) * sizeof(char));
fh_c = MPI_File_f2c(*fh);
- *ierr = MPI_File_get_view(fh_c, disp, etype, filetype, tmprep);
+ *ierr = MPI_File_get_view(fh_c, disp, (MPI_Datatype*)etype,
+ (MPI_Datatype*)filetype, tmprep);
tmpreplen = strlen(tmprep);
if (tmpreplen <= str_len) {
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/glue/default/mpio_err.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/glue/default/mpio_err.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/glue/default/mpio_err.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -83,8 +83,6 @@
{
MPI_Abort(mpi_comm, 1);
}
- else
- {
- return error_code;
- }
+
+ return error_code;
}
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/iwrite_sh.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/iwrite_sh.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/iwrite_sh.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -93,14 +93,16 @@
/* to maintain strict atomicity semantics with other concurrent
operations, lock (exclusive) and call blocking routine */
- if (fh->file_system != ADIO_NFS)
+ if (fh->file_system != ADIO_NFS) {
ADIOI_WRITE_LOCK(fh, off, SEEK_SET, bufsize);
+ }
ADIO_WriteContig(fh, buf, count, datatype, ADIO_EXPLICIT_OFFSET,
off, &status, &error_code);
- if (fh->file_system != ADIO_NFS)
+ if (fh->file_system != ADIO_NFS) {
ADIOI_UNLOCK(fh, off, SEEK_SET, bufsize);
+ }
MPIO_Completed_request_create(&fh, bufsize, &error_code, request);
}
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/read_sh.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/read_sh.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/read_sh.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -106,14 +106,16 @@
could be a concurrent noncontiguous request. On NFS, locking
is done in the ADIO_ReadContig.*/
- if ((fh->atomicity) && (fh->file_system != ADIO_NFS))
+ if ((fh->atomicity) && (fh->file_system != ADIO_NFS)) {
ADIOI_WRITE_LOCK(fh, off, SEEK_SET, bufsize);
+ }
ADIO_ReadContig(fh, buf, count, datatype, ADIO_EXPLICIT_OFFSET,
off, status, &error_code);
- if ((fh->atomicity) && (fh->file_system != ADIO_NFS))
+ if ((fh->atomicity) && (fh->file_system != ADIO_NFS)) {
ADIOI_UNLOCK(fh, off, SEEK_SET, bufsize);
+ }
}
else
{
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/write_sh.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/write_sh.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi-io/write_sh.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -106,14 +106,16 @@
could be a concurrent noncontiguous request. On NFS, locking is
done in the ADIO_WriteContig.*/
- if ((fh->atomicity) && (fh->file_system != ADIO_NFS))
+ if ((fh->atomicity) && (fh->file_system != ADIO_NFS)) {
ADIOI_WRITE_LOCK(fh, off, SEEK_SET, bufsize);
+ }
ADIO_WriteContig(fh, buf, count, datatype, ADIO_EXPLICIT_OFFSET,
off, status, &error_code);
- if ((fh->atomicity) && (fh->file_system != ADIO_NFS))
+ if ((fh->atomicity) && (fh->file_system != ADIO_NFS)) {
ADIOI_UNLOCK(fh, off, SEEK_SET, bufsize);
+ }
}
else
{
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi2-other/array/darray.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi2-other/array/darray.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi2-other/array/darray.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -49,9 +49,8 @@
MPI_Datatype *newtype)
{
int err, error_code;
- MPI_Datatype type_old, type_new, types[3];
- int procs, tmp_rank, i, tmp_size, blklens[3], *coords;
- MPI_Aint *st_offsets, orig_extent, disps[3], size_with_aint;
+ int i;
+ MPI_Aint orig_extent, size_with_aint;
MPI_Offset size_with_offset;
static char myname[] = "MPI_TYPE_CREATE_DARRAY";
Modified: mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi2-other/array/subarray.c
===================================================================
--- mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi2-other/array/subarray.c 2011-02-09 17:44:50 UTC (rev 7923)
+++ mpich2/branches/release/mpich2-1.3.x/src/mpi/romio/mpi2-other/array/subarray.c 2011-02-09 20:33:41 UTC (rev 7924)
@@ -43,9 +43,8 @@
int order, MPI_Datatype oldtype,
MPI_Datatype *newtype)
{
- MPI_Aint extent, disps[3], size, size_with_aint;
- int i, blklens[3], err;
- MPI_Datatype tmp1, tmp2, types[3];
+ MPI_Aint extent, size_with_aint;
+ int i, err, error_code;
MPI_Offset size_with_offset;
/* --BEGIN ERROR HANDLING-- */
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/mpid
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpid:5050
/mpich2/branches/dev/ckpt2/src/mpid:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid:7771-7802
/mpich2/branches/dev/error-return/src/mpid:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid:5661-5730
/mpich2/branches/dev/lapi/src/mpid:5817
/mpich2/branches/dev/wintcp_async_progress/src/mpid:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid:5406
/mpich2/trunk/src/mpid:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912
+ /mpich2/branches/dev/ckpt/src/mpid:5050
/mpich2/branches/dev/ckpt2/src/mpid:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid:7771-7802
/mpich2/branches/dev/error-return/src/mpid:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid:5661-5730
/mpich2/branches/dev/lapi/src/mpid:5817
/mpich2/branches/dev/wintcp_async_progress/src/mpid:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid:5406
/mpich2/trunk/src/mpid:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5050
/mpich2/branches/dev/ckpt2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7771-7802
/mpich2/branches/dev/error-return/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5661-5730
/mpich2/branches/dev/lapi/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5817
/mpich2/branches/dev/win_rrvm/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:6416,6428
/mpich2/branches/dev/wintcp_async_progress/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5406
/mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912
+ /mpich2/branches/dev/ckpt/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5050
/mpich2/branches/dev/ckpt2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7771-7802
/mpich2/branches/dev/error-return/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5661-5730
/mpich2/branches/dev/lapi/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5817
/mpich2/branches/dev/win_rrvm/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:6416,6428
/mpich2/branches/dev/wintcp_async_progress/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5406
/mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923
Property changes on: mpich2/branches/release/mpich2-1.3.x/src/mpl/src/mplstr.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/mpich2/branches/dev/coll-err-ret/src/mpl/src/mplstr.c:7771-7802
/mpich2/branches/dev/error-return/src/mpl/src/mplstr.c:7662-7670
/mpich2/branches/dev/ftb/src/mpl/src/mplstr.c:5661-5730
/mpich2/branches/dev/lapi/src/mpl/src/mplstr.c:5817
/mpich2/branches/release/mpich2-1.1.1/src/mpl/src/string/mplstr.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpl/src/string/mplstr.c:5406
/mpich2/trunk/src/mpl/src/mplstr.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912
+ /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/mpich2/branches/dev/coll-err-ret/src/mpl/src/mplstr.c:7771-7802
/mpich2/branches/dev/error-return/src/mpl/src/mplstr.c:7662-7670
/mpich2/branches/dev/ftb/src/mpl/src/mplstr.c:5661-5730
/mpich2/branches/dev/lapi/src/mpl/src/mplstr.c:5817
/mpich2/branches/release/mpich2-1.1.1/src/mpl/src/string/mplstr.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpl/src/string/mplstr.c:5406
/mpich2/trunk/src/mpl/src/mplstr.c:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923
Property changes on: mpich2/branches/release/mpich2-1.3.x/winconfigure.wsf
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/winconfigure.wsf:5050
/mpich2/branches/dev/ckpt2/winconfigure.wsf:5057-6537
/mpich2/branches/dev/coll-err-ret/winconfigure.wsf:7771-7802
/mpich2/branches/dev/error-return/winconfigure.wsf:7662-7670
/mpich2/branches/dev/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
/mpich2/trunk/winconfigure.wsf:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912
+ /mpich2/branches/dev/ckpt/winconfigure.wsf:5050
/mpich2/branches/dev/ckpt2/winconfigure.wsf:5057-6537
/mpich2/branches/dev/coll-err-ret/winconfigure.wsf:7771-7802
/mpich2/branches/dev/error-return/winconfigure.wsf:7662-7670
/mpich2/branches/dev/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
/mpich2/trunk/winconfigure.wsf:7355-7359,7366-7367,7371-7402,7406-7409,7411-7416,7419-7420,7422-7425,7429-7433,7435,7437-7438,7442-7448,7459-7460,7462,7469-7470,7473-7478,7484-7485,7488-7491,7493-7502,7504,7507-7508,7510-7517,7519-7527,7529-7530,7532,7536,7538-7566,7568,7570,7572,7574,7576,7578,7581,7583,7592,7596,7604,7607-7622,7624-7630,7632-7635,7637,7639,7641-7643,7646-7649,7651-7654,7658-7659,7663,7665,7668,7671,7674,7676-7678,7681,7683-7688,7690-7692,7694,7696,7700-7702,7705,7707-7710,7712,7714,7719-7720,7722,7724-7725,7728-7729,7733,7735-7737,7739,7741,7744-7748,7751-7754,7758-7759,7761-7762,7766,7772,7774,7779-7781,7788,7793,7799-7801,7803,7807-7808,7811,7813,7815-7816,7819,7821,7829-7831,7833,7835-7837,7839-7843,7852,7858,7860,7862,7866,7872-7874,7879-7880,7882,7884,7886-7888,7890,7895,7897,7899,7903-7904,7906,7908,7910,7912,7921-7923
More information about the mpich2-commits
mailing list