Changeset 1249 for mpich2/trunk/src/mpi/romio/adio/ad_bgl

Timestamp:

08/02/08 21:32:54 (7 months ago)

Author:

balaji

Message:

Merging the BG/P changes into trunk. Let's see how the nightly tests do.

Files:

• mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl.c (modified) (1 diff)
• mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl.h (modified) (1 diff)
• mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_aggrs.c (modified) (27 diffs)
• mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_aggrs.h (modified) (2 diffs)
• mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_close.c (modified) (1 diff)
• mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_fcntl.c (modified) (1 diff)
• mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_rdcoll.c (modified) (36 diffs)
• mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c (modified) (29 diffs)
• mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_wrcoll.c (modified) (29 diffs)
• mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c (modified) (30 diffs)

mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl.c

@@ -1 +1 @@
-/* ---------------------------------------------------------------- */
-/* (C)Copyright IBM Corp.  2007, 2008                               */
+/* ---------------------------------------------------------------- */
-/**
- * \file ad_bgl.c

mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl.h

@@ -29 +29 @@
-#endif
-
+#if 0 
-int ADIOI_BGL_aio(ADIO_File fd, void *buf, int len, ADIO_Offset offset,
-                  int wr, void *handle);
+#endif
-
-void ADIOI_BGL_Open(ADIO_File fd, int *error_code);

mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_aggrs.c

@@ -1 +1 @@
-/* ---------------------------------------------------------------- */
-/* (C)Copyright IBM Corp.  2007, 2008                               */
+/* ---------------------------------------------------------------- */
-/**
- * \file ad_bgl_aggrs.c
@@ -17 +18 @@
-#include "ad_bgl_pset.h"
-#include "ad_bgl_aggrs.h"
+
+#ifdef USE_DBG_LOGGING
+  #define AGG_DEBUG 1
+#endif
+
-
-
@@ -220 +226 @@
-                                        int *aggrsInPset )
-{
-
-
+
-    int i; 
-#   endif
@@ -230 +235 @@
-    tmp_ranklist = (int *) ADIOI_Malloc (confInfo->nProcs * sizeof(int));
-
-
-
-
+
+
+
+
-#   endif
-
@@ -240 +246 @@
-#   define VERIFY 0
-#   if VERIFY
-printf(
+DBG_FPRINTF(stderr,
-            confInfo->PsetSize        ,
-            confInfo->numPsets        ,
@@ -251 +257 @@
-#   endif
-
-
-
-
+
+
+
+
-#   endif
-
@@ -292 +299 @@
-    ADIO_Offset min_st_offset, max_end_offset, *fd_start, *fd_end, *fd_size;
-    int i, aggr;
+#   if AGG_DEBUG
-    static char myname[] = "ADIOI_BGL_GPFS_Calc_file_domains";
+#   endif
-    __blksize_t blksize = 1048576; /* default to 1M */
-    if(fs_ptr && ((ADIOI_BGL_fs*)fs_ptr)->blksize) /* ignore null ptr or 0 blksize */
-      blksize = ((ADIOI_BGL_fs*)fs_ptr)->blksize;
-
-
+
+
+
-    /* find the range of all the requests */
-    min_st_offset  = st_offsets [0];
@@ -306 +316 @@
-    }
-
-printf(
+DBG_FPRINTF(stderr,
-
-    /* determine the "file domain (FD)" of each process, i.e., the portion of
@@ -333 +343 @@
-                        else fd_size[i] = (nb_cn_small+1) * blksize;
-
-
+
+
-                   "gpfs_ub       %llu, "
-                   "gpfs_lb       %llu, "
@@ -355 +366 @@
-                   naggs_small
-                   );
-
+
+
-    fd_size[0]       -= gpfs_lb_rdoff;
-    fd_size[naggs-1] -= gpfs_ub_rdoff;
@@ -523 +535 @@
-
-     *
-printf(
+DBG_FPRINTF(stderr,
-            naggs,
-            min_st_offset,
@@ -588 +600 @@
-    }
-
-printf
+DBG_FPRINTF
-
-    /* 
@@ -621 +633 @@
- * (including this one)
- */
-in
+ADIO_Offse
-                           int contig_access_count, ADIO_Offset 
-                           min_st_offset, ADIO_Offset *fd_start,
@@ -630 +642 @@
-                           ADIOI_Access **my_req_ptr,
-                           int **buf_idx_ptr)
+/* Possibly reconsider if buf_idx's are ok as int's, or should they be aints/offsets? 
+   They are used as memory buffer indices so it seems like the 2G limit is in effect */
-{
-    int *count_my_req_per_proc, count_my_req_procs, *buf_idx;
@@ -721 +735 @@
-
-        /* for each separate contiguous access from this process */
-
+
+
+
+
+
-
-        l = my_req[proc].count;
-(int) fd_len; /* NOTE: Why is curr_idx an int?  Fix? */
+fd_len;
-
-        rem_len = len_list[i] - fd_len;
@@ -734 +752 @@
-         */
-        my_req[proc].offsets[l] = off;
+  ADIOI_Assert(fd_len == (int) fd_len);
-        my_req[proc].lens[l] = (int) fd_len;
-        my_req[proc].count++;
@@ -743 +762 @@
-                                         fd_size, fd_start, fd_end);
-
-
+
+
+
+
+
-
-            l = my_req[proc].count;
@@ -750 +773 @@
-
-            my_req[proc].offsets[l] = off;
+      ADIOI_Assert(fd_len == (int) fd_len);
-            my_req[proc].lens[l] = (int) fd_len;
-            my_req[proc].count++;
@@ -758 +782 @@
-    for (i=0; i<nprocs; i++) {
-        if (count_my_req_per_proc[i] > 0) {
-FPRINTF(stdout
+DBG_FPRINTF(stderr
-                    my_req[i].count);
-            for (l=0; l < my_req[i].count; l++) {
-FPRINTF(stdout, "   off[%d] = %L
+DBG_FPRINTF(stderr, "   off[%d] = %ll
-                        my_req[i].offsets[l], l, my_req[i].lens[l]);
-            }
-        }
-
-
-
-
-
-
+
+
-#endif
-
@@ -778 +798 @@
-
-/*
-
+ (copied to bgl and switched to all to all for performance)
- *
- * param[in]  count_my_req_procs        Number of processes whose file domain my
@@ -867 +887 @@
-                ADIOI_Malloc(count_others_req_per_proc[i]*sizeof(int)); 
-
-unsigned)others_req[i].offsets < (unsigned
+MPIR_Upint)others_req[i].offsets < (MPIR_Upint
-                recvBufForOffsets = others_req[i].offsets;
-unsigned)others_req[i].lens < (unsigned
+MPIR_Upint)others_req[i].lens < (MPIR_Upint
-                recvBufForLens = others_req[i].lens;
-
@@ -884 +904 @@
-        }
-    }
+    /* If no recv buffer was allocated in the loop above, make it NULL */
+    if ( recvBufForOffsets == (void*)0xFFFFFFFF) recvBufForOffsets = NULL;
+    if ( recvBufForLens    == (void*)0xFFFFFFFF) recvBufForLens    = NULL;
-    
-    /* Now send the calculated offsets and lengths to respective processes */
@@ -895 +918 @@
-    {
-        if ( (my_req[i].count) &&
-unsigned)my_req[i].offsets <= (unsigned
-  
+MPIR_Upint)my_req[i].offsets <= (MPIR_Upint
+
-           
-        if ( (my_req[i].count) &&
-unsigned)my_req[i].lens <= (unsigned
+MPIR_Upint)my_req[i].lens <= (MPIR_Upint
-            sendBufForLens = my_req[i].lens;
-    }
+
+    /* If no send buffer was found in the loop above, make it NULL */
+    if ( sendBufForOffsets == (void*)0xFFFFFFFF) sendBufForOffsets = NULL;
+    if ( sendBufForLens    == (void*)0xFFFFFFFF) sendBufForLens    = NULL;
-
-    /* Calculate the displacements from the sendBufForOffsets/Lens */
@@ -911 +938 @@
-            sdispls[i] = 0;
-        else
-
-
+
+
+
+
-
-        // Receive these offsets from process i.
@@ -919 +948 @@
-            rdispls[i] = 0;
-        else
-
-
+
+
+
+
-    }
-
@@ -941 +972 @@
-            sdispls[i] = 0;
-        else
-
-
+
+
+
+
-        
-        // Receive these offsets from process i.
@@ -949 +982 @@
-            rdispls[i] = 0;
-        else
-
-
+
+
+
+
-    }
-

mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_aggrs.h

@@ -1 +1 @@
-/* ---------------------------------------------------------------- */
-/* (C)Copyright IBM Corp.  2007, 2008                               */
+/* ---------------------------------------------------------------- */
-/**
- * \file ad_bgl_aggrs.h
@@ -61 +62 @@
-    /* overriding ADIOI_Calc_my_req for the default implementation is specific for 
-       static file domain partitioning */
-in
+ADIO_Offse
-                                 int contig_access_count, ADIO_Offset
-                                 min_st_offset, ADIO_Offset *fd_start,

mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_close.c

@@ -1 +1 @@
-/* ---------------------------------------------------------------- */
-/* (C)Copyright IBM Corp.  2007, 2008                               */
+/* ---------------------------------------------------------------- */
-/**
-open
+close
- * \brief ???
- */

mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_fcntl.c

@@ -1 +1 @@
-/* ---------------------------------------------------------------- */
-/* (C)Copyright IBM Corp.  2007, 2008                               */
+/* ---------------------------------------------------------------- */
-/**
- * \file ad_bgl_fcntl.c

mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_rdcoll.c

@@ -23 +23 @@
-#endif
-
+#ifdef USE_DBG_LOGGING
+  #define RDCOLL_DEBUG 1
+#endif
+
+
-/* prototypes of functions used for collective reads only. */
-static void ADIOI_Read_and_exch(ADIO_File fd, void *buf, MPI_Datatype
@@ -28 +33 @@
-                                int myrank, ADIOI_Access
-                                *others_req, ADIO_Offset *offset_list,
-in
+ADIO_Offse
-                                ADIO_Offset
-                                min_st_offset, ADIO_Offset fd_size,
@@ -34 +39 @@
-                                int *buf_idx, int *error_code);
-static void ADIOI_R_Exchange_data(ADIO_File fd, void *buf, ADIOI_Flatlist_node
-in
+ADIO_Offse
-                                  *len_list, int *send_size, int *recv_size,
-                                  int *count, int *start_pos, 
@@ -48 +53 @@
-                                  MPI_Aint buftype_extent, int *buf_idx);
-static void ADIOI_R_Exchange_data_alltoallv(ADIO_File fd, void *buf, ADIOI_Flatlist_node
-in
+ADIO_Offse
-                                  *len_list, int *send_size, int *recv_size,
-                                  int *count, int *start_pos,
@@ -63 +68 @@
-static void ADIOI_Fill_user_buffer(ADIO_File fd, void *buf, ADIOI_Flatlist_node
-                                   *flat_buf, char **recv_buf, ADIO_Offset 
-in
-int
+ADIO_Offse
+unsigned
-                                   MPI_Request *requests, MPI_Status *statuses,
-                                   int *recd_from_proc, int nprocs,
@@ -75 +80 @@
-extern void ADIOI_Calc_my_off_len(ADIO_File fd, int bufcount, MPI_Datatype
-                            datatype, int file_ptr_type, ADIO_Offset
-in
+ADIO_Offse
-                            **len_list_ptr, ADIO_Offset *start_offset_ptr,
-                            ADIO_Offset *end_offset_ptr, int
@@ -107 +112 @@
-    ADIO_Offset *bgl_offsets0 = NULL, *bgl_offsets = NULL;
-    int  ii;
-
-
+
+
+
-    double io_time = 0., all_time, max_all_time; 
-    double tstep1, max_tstep1;
@@ -118 +124 @@
-    double tstep4, max_tstep4;
-    double sum_sz;
-
+
-#if BGL_PROFILE 
-    BGLMPIO_T_CIO_RESET( 0, r )
@@ -158 +164 @@
-#endif
-
-
-
+
+
+
-              len_list[i]);
-
+
+
-
-        /* each process communicates its start and end offsets to other 
@@ -224 +232 @@
-        if (buftype_is_contig && filetype_is_contig) {
-            if (file_ptr_type == ADIO_EXPLICIT_OFFSET) {
-
+ADIO_Offset)(
-                ADIO_ReadContig(fd, buf, count, datatype, ADIO_EXPLICIT_OFFSET,
-                       off, status, error_code);
@@ -384 +392 @@
-}
-
-#if 0
-void ADIOI_Calc_my_off_len(ADIO_File fd, int bufcount, MPI_Datatype
-                            datatype, int file_ptr_type, ADIO_Offset
-                            offset, ADIO_Offset **offset_list_ptr, int
-                            **len_list_ptr, ADIO_Offset *start_offset_ptr,
-                            ADIO_Offset *end_offset_ptr, int
-                           *contig_access_count_ptr)
-{
-    int filetype_size, buftype_size, etype_size;
-    int i, j, k, frd_size=0, old_frd_size=0, st_index=0;
-    int n_filetypes, etype_in_filetype;
-    ADIO_Offset abs_off_in_filetype=0;
-    int bufsize, sum, n_etypes_in_filetype, size_in_filetype;
-    int contig_access_count, *len_list, flag, filetype_is_contig;
-    MPI_Aint filetype_extent, filetype_lb;
-    ADIOI_Flatlist_node *flat_file;
-    ADIO_Offset *offset_list, off, end_offset=0, disp;
-    
-/* For this process's request, calculate the list of offsets and
-   lengths in the file and determine the start and end offsets. */
-
-    ADIOI_Datatype_iscontig(fd->filetype, &filetype_is_contig);
-
-    MPI_Type_size(fd->filetype, &filetype_size);
-    MPI_Type_extent(fd->filetype, &filetype_extent);
-    MPI_Type_lb(fd->filetype, &filetype_lb);
-    MPI_Type_size(datatype, &buftype_size);
-    etype_size = fd->etype_size;
-
-    if ( ! filetype_size ) {
-        *contig_access_count_ptr = 0;
-        *offset_list_ptr = (ADIO_Offset *) ADIOI_Malloc(2*sizeof(ADIO_Offset));
-        *len_list_ptr = (int *) ADIOI_Malloc(2*sizeof(int));
-        /* 2 is for consistency. everywhere I malloc one more than needed */
-
-        offset_list = *offset_list_ptr;
-        len_list = *len_list_ptr;
-        offset_list[0] = (file_ptr_type == ADIO_INDIVIDUAL) ? fd->fp_ind : 
-                 fd->disp + etype_size * offset;
-        len_list[0] = 0;
-        *start_offset_ptr = offset_list[0];
-        *end_offset_ptr = offset_list[0] + len_list[0] - 1;
-        
-        return;
-    }
-
-    if (filetype_is_contig) {
-        *contig_access_count_ptr = 1;        
-        *offset_list_ptr = (ADIO_Offset *) ADIOI_Malloc(2*sizeof(ADIO_Offset));
-        *len_list_ptr = (int *) ADIOI_Malloc(2*sizeof(int));
-        /* 2 is for consistency. everywhere I malloc one more than needed */
-
-        offset_list = *offset_list_ptr;
-        len_list = *len_list_ptr;
-        offset_list[0] = (file_ptr_type == ADIO_INDIVIDUAL) ? fd->fp_ind : 
-                 fd->disp + etype_size * offset;
-        len_list[0] = bufcount * buftype_size;
-        *start_offset_ptr = offset_list[0];
-        *end_offset_ptr = offset_list[0] + len_list[0] - 1;
-
-        /* update file pointer */
-        if (file_ptr_type == ADIO_INDIVIDUAL) fd->fp_ind = *end_offset_ptr + 1;
-    }
-
-    else {
-
-       /* First calculate what size of offset_list and len_list to allocate */
-   
-       /* filetype already flattened in ADIO_Open or ADIO_Fcntl */
-        flat_file = ADIOI_Flatlist;
-        while (flat_file->type != fd->filetype) flat_file = flat_file->next;
-        disp = fd->disp;
-
-        if (file_ptr_type == ADIO_INDIVIDUAL) {
-            offset = fd->fp_ind; /* in bytes */
-            n_filetypes = -1;
-            flag = 0;
-            while (!flag) {
-                n_filetypes++;
-                for (i=0; i<flat_file->count; i++) {
-                    if (disp + flat_file->indices[i] + 
-                        (ADIO_Offset) n_filetypes*filetype_extent + 
-                        flat_file->blocklens[i] >= offset) 
-                    {
-                        st_index = i;
-                        frd_size = (int) (disp + flat_file->indices[i] + 
-                            (ADIO_Offset) n_filetypes*filetype_extent
-                                + flat_file->blocklens[i] - offset);
-                        flag = 1;
-                        break;
-                    }
-                }
-            }
-        }
-        else {
-            n_etypes_in_filetype = filetype_size/etype_size;
-            n_filetypes = (int) (offset / n_etypes_in_filetype);
-            etype_in_filetype = (int) (offset % n_etypes_in_filetype);
-            size_in_filetype = etype_in_filetype * etype_size;
- 
-            sum = 0;
-            for (i=0; i<flat_file->count; i++) {
-                sum += flat_file->blocklens[i];
-                if (sum > size_in_filetype) {
-                    st_index = i;
-                    frd_size = sum - size_in_filetype;
-                    abs_off_in_filetype = flat_file->indices[i] +
-                        size_in_filetype - (sum - flat_file->blocklens[i]);
-                    break;
-                }
-            }
-
-            /* abs. offset in bytes in the file */
-            offset = disp + (ADIO_Offset) n_filetypes*filetype_extent + 
-                abs_off_in_filetype;
-        }
-
-         /* calculate how much space to allocate for offset_list, len_list */
-
-        old_frd_size = frd_size;
-        contig_access_count = i = 0;
-        j = st_index;
-        bufsize = buftype_size * bufcount;
-        frd_size = ADIOI_MIN(frd_size, bufsize);
-        while (i < bufsize) {
-            if (frd_size) contig_access_count++;
-            i += frd_size;
-            j = (j + 1) % flat_file->count;
-            frd_size = ADIOI_MIN(flat_file->blocklens[j], bufsize-i);
-        }
-
-        /* allocate space for offset_list and len_list */
-
-        *offset_list_ptr = (ADIO_Offset *)
-                 ADIOI_Malloc((contig_access_count+1)*sizeof(ADIO_Offset));  
-        *len_list_ptr = (int *) ADIOI_Malloc((contig_access_count+1)*sizeof(int));
-        /* +1 to avoid a 0-size malloc */
-
-        offset_list = *offset_list_ptr;
-        len_list = *len_list_ptr;
-
-      /* find start offset, end offset, and fill in offset_list and len_list */
-
-        *start_offset_ptr = offset; /* calculated above */
-
-        i = k = 0;
-        j = st_index;
-        off = offset;
-        frd_size = ADIOI_MIN(old_frd_size, bufsize);
-        while (i < bufsize) {
-            if (frd_size) {
-                offset_list[k] = off;
-                len_list[k] = frd_size;
-                k++;
-            }
-            i += frd_size;
-            end_offset = off + frd_size - 1;
-
-     /* Note: end_offset points to the last byte-offset that will be accessed.
-         e.g., if start_offset=0 and 100 bytes to be read, end_offset=99*/
-
-            if (off + frd_size < disp + flat_file->indices[j] +
-                flat_file->blocklens[j] + 
-                (ADIO_Offset) n_filetypes*filetype_extent)
-            {
-                off += frd_size;
-                /* did not reach end of contiguous block in filetype.
-                 * no more I/O needed. off is incremented by frd_size. 
-                 */
-            }
-            else {
-                if (j < (flat_file->count - 1)) j++;
-                else {
-                    /* hit end of flattened filetype; 
-                     * start at beginning again 
-                     */
-                    j = 0;
-                    n_filetypes++;
-                }
-                off = disp + flat_file->indices[j] + 
-                    (ADIO_Offset) n_filetypes*filetype_extent;
-                frd_size = ADIOI_MIN(flat_file->blocklens[j], bufsize-i);
-            }
-        }
-
-        /* update file pointer */
-        if (file_ptr_type == ADIO_INDIVIDUAL) fd->fp_ind = off;
-
-        *contig_access_count_ptr = contig_access_count;
-        *end_offset_ptr = end_offset;
-    }
-}
-#endif
-
-static void ADIOI_Read_and_exch(ADIO_File fd, void *buf, MPI_Datatype
-                         datatype, int nprocs,
-                         int myrank, ADIOI_Access
-                         *others_req, ADIO_Offset *offset_list,
-in
+ADIO_Offse
-                         min_st_offset, ADIO_Offset fd_size,
-                         ADIO_Offset *fd_start, ADIO_Offset *fd_end,
@@ -597 +411 @@
-   at least another 8Mbytes of temp space is unacceptable. */
-
-size, 
+
-    ADIO_Offset st_loc=-1, end_loc=-1, off, done, real_off, req_off;
-    char *read_buf = NULL, *tmp_buf;
-    int *curr_offlen_ptr, *count, *send_size, *recv_size;
-
-
+
+
+
+
-    MPI_Status status;
-    ADIOI_Flatlist_node *flat_buf=NULL;
-    MPI_Aint buftype_extent;
-    int coll_bufsize;
-
+
-    int iii;
-
+
-    *error_code = MPI_SUCCESS;  /* changed below if error */
-    /* only I/O errors are currently reported */
@@ -741 +557 @@
-        MPE_Log_event(13, 0, "start computation");
-#endif
-(int) (ADIOI_MIN(coll_bufsize, end_loc-st_loc+1-done)
+ADIOI_MIN((unsigned)coll_bufsize, end_loc-st_loc+1-done
-        real_off = off - for_curr_iter;
-        real_size = size + for_curr_iter;
@@ -749 +565 @@
-
-        for (i=0; i<nprocs; i++) {
-
+
+
+
-            if (others_req[i].count) {
-                start_pos[i] = curr_offlen_ptr[i];
@@ -772 +590 @@
-                    if (req_off < real_off + real_size) {
-                        count[i]++;
+      ADIOI_Assert((((ADIO_Offset)(MPIR_Upint)read_buf)+req_off-real_off) == (ADIO_Offset)(MPIR_Upint)(read_buf+req_off-real_off));
-                        MPI_Address(read_buf+req_off-real_off, 
-                               &(others_req[i].mem_ptrs[j]));
-
-                         req_off, req_len));
-
-
-    partial_send[i] = (int) (real_off+real_size-
-                           
+
+send_size[i] += (int)(ADIOI_MIN(real_off + real_size - req_off, 
+
+
+if (real_off+real_size-req_off < (ADIO_Offset)(unsigned)req_len) {
+    partial_send[i] = (int) (real_off + real_size -
-                            if ((j+1 < others_req[i].count) && 
-                                 (others_req[i].offsets[j+1] < 
@@ -785 +604 @@
-                                /* this is the case illustrated in the
-                                   figure above. */
-
-
-
+
+
-                                /* max because it must cover requests 
-                                   from different processes */
@@ -808 +626 @@
-#endif
-        if (flag) {
-
+
+
-                            ADIO_EXPLICIT_OFFSET, off, &status, error_code);
-
-printf( "\tread_coll: 700, data read [%3
-; iii++) { printf(
-printf(
-
+
+DBG_FPRINTF(stderr, "\tread_coll: 700, data read [%ll
+ && iii<80; iii++) { DBGV_FPRINTF(stderr,
+DBG_FPRINTF(stderr,
+
-
-            if (*error_code != MPI_SUCCESS) return;
@@ -852 +671 @@
-        if (for_next_iter) {
-            tmp_buf = (char *) ADIOI_Malloc(for_next_iter);
+      ADIOI_Assert((((ADIO_Offset)(MPIR_Upint)read_buf)+real_size-for_next_iter) == (ADIO_Offset)(MPIR_Upint)(read_buf+real_size-for_next_iter));
+      ADIOI_Assert((for_next_iter+coll_bufsize) == (size_t)(for_next_iter+coll_bufsize));
-            memcpy(tmp_buf, read_buf+real_size-for_next_iter, for_next_iter);
-            ADIOI_Free(read_buf);
@@ -905 +726 @@
-
-static void ADIOI_R_Exchange_data(ADIO_File fd, void *buf, ADIOI_Flatlist_node
-in
+ADIO_Offse
-                         *len_list, int *send_size, int *recv_size,
-                         int *count, int *start_pos, int *partial_send, 
@@ -943 +764 @@
-        j = 0;
-        for (i=0; i < nprocs; i++) 
-
+ 
-                MPI_Irecv(((char *) buf) + buf_idx[i], recv_size[i], 
-                  MPI_BYTE, i, myrank+i+100*iter, fd->comm, requests+j);
@@ -963 +784 @@
-                              myrank+i+100*iter, fd->comm, requests+j);
-                    j++;
-
-
+
+
+
+
-                }
-    }
@@ -1009 +832 @@
-        if (!buftype_is_contig) 
-            ADIOI_Fill_user_buffer(fd, buf, flat_buf, recv_buf,
-
+(unsigned*)
-                                   requests, statuses, recd_from_proc, 
-                                   nprocs, contig_access_count,
@@ -1029 +852 @@
-}
-
+static void ADIOI_Fill_user_buffer(ADIO_File fd, void *buf, ADIOI_Flatlist_node
+                                   *flat_buf, char **recv_buf, ADIO_Offset 
+                                   *offset_list, ADIO_Offset *len_list, 
+                                   unsigned *recv_size, 
+                                   MPI_Request *requests, MPI_Status *statuses,
+                                   int *recd_from_proc, int nprocs,
+                                   int contig_access_count, 
+                                   ADIO_Offset min_st_offset, 
+                                   ADIO_Offset fd_size, ADIO_Offset *fd_start, 
+                                   ADIO_Offset *fd_end,
+                                   MPI_Aint buftype_extent)
+{
+/* this function is only called if buftype is not contig */
-
-#define ADIOI_BUF_INCR \
@@ -1043 +879 @@
-            } \
-            user_buf_idx = flat_buf->indices[flat_buf_idx] + \
-n_buftypes*
+(ADIO_Offset)n_buftypes*(ADIO_Offset)
-            flat_buf_sz = flat_buf->blocklens[flat_buf_idx]; \
-        } \
@@ -1055 +891 @@
-    while (size) { \
-        size_in_buf = ADIOI_MIN(size, flat_buf_sz); \
+  ADIOI_Assert((((ADIO_Offset)(MPIR_Upint)buf) + user_buf_idx) == (ADIO_Offset)(MPIR_Upint)(buf + user_buf_idx)); \
+  ADIOI_Assert(size_in_buf == (size_t)size_in_buf); \
-        memcpy(((char *) buf) + user_buf_idx, \
-               &(recv_buf[p][recv_buf_idx[p]]), size_in_buf); \
-
+/* already tested (size_t)size_in_buf*/ 
-        user_buf_idx += size_in_buf; \
-        flat_buf_sz -= size_in_buf; \
@@ -1067 +905 @@
-            } \
-            user_buf_idx = flat_buf->indices[flat_buf_idx] + \
-n_buftypes*
+(ADIO_Offset)n_buftypes*(ADIO_Offset)
-            flat_buf_sz = flat_buf->blocklens[flat_buf_idx]; \
-        } \
@@ -1077 +915 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    ADIO_Offset off, len, rem_len, user_buf_idx;
-
-int
+
+unsigned
-
-/*  curr_from_proc[p] = amount of data recd from proc. p that has already
@@ -1103 +929 @@
-    user_buf_idx = current location in user buffer 
-    recv_buf_idx[p] = current location in recv_buf of proc. p  */
-int *) ADIOI_Malloc(nprocs * sizeof(int
-int *) ADIOI_Malloc(nprocs * sizeof(int
-int *) ADIOI_Malloc(nprocs * sizeof(int
+unsigned *) ADIOI_Malloc(nprocs * sizeof(unsigned
+unsigned *) ADIOI_Malloc(nprocs * sizeof(unsigned
+unsigned *) ADIOI_Malloc(nprocs * sizeof(unsigned
-
-    for (i=0; i < nprocs; i++) {
@@ -1123 +949 @@
-    for (i=0; i<contig_access_count; i++) { 
-        off     = offset_list[i];
-(ADIO_Offset) 
+
-
-        /* this request may span the file domains of more than one process */
@@ -1143 +969 @@
-                if (curr_from_proc[p]+len > done_from_proc[p]) {
-                    if (done_from_proc[p] > curr_from_proc[p]) {
-(int)
+
-                              done_from_proc[p], recv_size[p]-recv_buf_idx[p]);
-                        buf_incr = done_from_proc[p] - curr_from_proc[p];
-                        ADIOI_BUF_INCR
-
+
+
-                        curr_from_proc[p] = done_from_proc[p] + size;
-                        ADIOI_BUF_COPY
-                    }
-                    else {
-
-
-
+
+
+
+
-                        ADIOI_BUF_COPY
-                    }
-                }
-                else {
-
-
+
+
+
-                    ADIOI_BUF_INCR
-                }
-            }
-            else {
-(int)
+
-                ADIOI_BUF_INCR
-            }
@@ -1182 +1011 @@
-static void ADIOI_R_Exchange_data_alltoallv(
-                ADIO_File fd, void *buf, ADIOI_Flatlist_node
-in
+ADIO_Offse
-                *len_list, int *send_size, int *recv_size, 
-                int *count, int *start_pos, int *partial_send,
@@ -1195 +1024 @@
-    int i, j, k=0, tmp=0, nprocs_recv, nprocs_send;
-    char **recv_buf = NULL;
-
-
-
+
+
-    int rtail, stail;
-    char *sbuf_ptr, *from_ptr;
@@ -1241 +1069 @@
-            sbuf_ptr = all_send_buf + sdispls[i];
-            for (j=0; j<count[i]; j++) {
-
+
+
-                len      =           others_req[i].lens[     start_pos[i]+j ]  ;
-                memcpy( sbuf_ptr, from_ptr, len );
@@ -1250 +1079 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if (nprocs_send) {
-printf(
-printf(
-printf(
+DBG_FPRINTF(stderr,
+DBG_FPRINTF(stderr,
+DBG_FPRINTF(stderr,
-    }
-#endif
@@ -1280 +1107 @@
-
-#if 0
-printf(
-printf(
-printf(
+DBG_FPRINTF(stderr,
+DBG_FPRINTF(stderr,
+DBG_FPRINTF(stderr,
-#endif
-    
@@ -1289 +1116 @@
-        if (!buftype_is_contig)
-            ADIOI_Fill_user_buffer(fd, buf, flat_buf, recv_buf,
-
+(unsigned*)
-                                   requests, statuses,          /* never used inside */
-                                   recd_from_proc,

mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_read.c

@@ -22 +22 @@
-                     ADIO_Offset offset, ADIO_Status *status, int *error_code)
-{
-
+
+
-    static char myname[] = "ADIOI_BGL_READCONTIG";
-
@@ -36 +37 @@
-
-    MPI_Type_size(datatype, &datatype_size);
-
+
+
-
-#if BGL_PROFILE
@@ -49 +51 @@
-        else ADIOI_READ_LOCK(fd, offset, SEEK_SET, len);
-                if (bglmpio_timing2) io_time2 = MPI_Wtime();
-
+(unsigned int)
-                if (bglmpio_timing2) bglmpio_prof_cr[ BGLMPIO_CIO_T_POSI_RW ] += (MPI_Wtime() - io_time2);
-        ADIOI_UNLOCK(fd, offset, SEEK_SET, len);
@@ -65 +67 @@
-        else ADIOI_READ_LOCK(fd, offset, SEEK_SET, len);
-                if (bglmpio_timing2) io_time2 = MPI_Wtime();
-
+(unsigned int)
-                if (bglmpio_timing2) bglmpio_prof_cr[ BGLMPIO_CIO_T_POSI_RW ] += (MPI_Wtime() - io_time2);
-        ADIOI_UNLOCK(fd, offset, SEEK_SET, len);
@@ -80 +82 @@
-            ADIOI_WRITE_LOCK(fd, offset, SEEK_SET, len);
-        else ADIOI_READ_LOCK(fd, offset, SEEK_SET, len);
-
+(unsigned int)
-        ADIOI_UNLOCK(fd, offset, SEEK_SET, len);
-        fd->fp_sys_posn = offset + err;
@@ -92 +94 @@
-            ADIOI_WRITE_LOCK(fd, offset, SEEK_SET, len);
-        else ADIOI_READ_LOCK(fd, offset, SEEK_SET, len);
-
+(unsigned int)
-        ADIOI_UNLOCK(fd, offset, SEEK_SET, len);
-        fd->fp_ind += err;
@@ -121 +123 @@
-
-
+void ADIOI_BGL_ReadStrided(ADIO_File fd, void *buf, int count,
+                       MPI_Datatype datatype, int file_ptr_type,
+                       ADIO_Offset offset, ADIO_Status *status, int
+                       *error_code)
+{
+/* offset is in units of etype relative to the filetype. */
-
-#define ADIOI_BUFFERED_READ \
@@ -126 +134 @@
-    if (req_off >= readbuf_off + readbuf_len) { \
-        readbuf_off = req_off; \
-int
+unsigned
-        lseek(fd->fd_sys, readbuf_off, SEEK_SET);\
-        if (!(fd->atomicity)) ADIOI_READ_LOCK(fd, readbuf_off, SEEK_SET, readbuf_len);\
@@ -134 +142 @@
-    } \
-    while (req_len > readbuf_off + readbuf_len - req_off) { \
+  ADIOI_Assert((readbuf_off + readbuf_len - req_off) == (int) (readbuf_off + readbuf_len - req_off));\
-        partial_read = (int) (readbuf_off + readbuf_len - req_off); \
-        tmp_buf = (char *) ADIOI_Malloc(partial_read); \
@@ -142 +151 @@
-        ADIOI_Free(tmp_buf); \
-        readbuf_off += readbuf_len-partial_read; \
-int
+unsigned
-                                       end_offset-readbuf_off+1)); \
-        lseek(fd->fd_sys, readbuf_off+partial_read, SEEK_SET);\
@@ -150 +159 @@
-        if (err == -1) err_flag = 1; \
-    } \
+    ADIOI_Assert(req_len == (size_t)req_len); \
-    memcpy((char *)buf + userbuf_off, readbuf+req_off-readbuf_off, req_len); \
-}
-
-
-void ADIOI_BGL_ReadStrided(ADIO_File fd, void *buf, int count,
-                       MPI_Datatype datatype, int file_ptr_type,
-                       ADIO_Offset offset, ADIO_Status *status, int
-                       *error_code)
-{
-/* offset is in units of etype relative to the filetype. */
-
-    ADIOI_Flatlist_node *flat_buf, *flat_file;
-
-
-
+
+
+
+
+
+
-    ADIO_Offset abs_off_in_filetype=0;
-req_len, 
+
-    MPI_Aint filetype_extent, buftype_extent; 
-    int buf_count, buftype_is_contig, filetype_is_contig;
-
+, req_len, sum
-    ADIO_Offset off, req_off, disp, end_offset=0, readbuf_off, start_off;
-    char *readbuf, *tmp_buf, *value;
-frd_size, st_n_filetypes, readbuf_len
-new_brd_size, new_frd_size, err_flag=0, info_flag, max_bufsize
-
+n_filetypes
+err_flag=0, info_flag
+
-    static char myname[] = "ADIOI_BGL_READSTRIDED";
-
@@ -208 +215 @@
-    etype_size = fd->etype_size;
-
+    ADIOI_Assert((buftype_size * count) == ((ADIO_Offset)(unsigned)buftype_size * (ADIO_Offset)count));
-    bufsize = buftype_size * count;
-
@@ -227 +235 @@
-
-        off = (file_ptr_type == ADIO_INDIVIDUAL) ? fd->fp_ind : 
-
+(ADIO_Offset)
-
-        start_off = off;
@@ -233 +241 @@
-        readbuf_off = off;
-        readbuf = (char *) ADIOI_Malloc(max_bufsize);
-int
+unsigned
-
-/* if atomicity is true, lock (exclusive) the region to be accessed */
@@ -246 +254 @@
-
-        for (j=0; j<count; j++) 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        if (fd->atomicity)
@@ -282 +293 @@
-            flag = 0;
-            while (!flag) {
+        int i;
-                n_filetypes++;
-                for (i=0; i<flat_file->count; i++) {
-                    if (disp + flat_file->indices[i] + 
-(ADIO_Offset) n_filetypes*
+n_filetypes*(ADIO_Offset)
-                            >= offset) {
-                        st_index = i;
-(int) (
-(ADIO_Offset) n_filetypes*
-)
+
+n_filetypes*(ADIO_Offset)
+
-                        flag = 1;
-                        break;
@@ -298 +310 @@
-        }
-        else {
+    int i;
-            n_etypes_in_filetype = filetype_size/etype_size;
-(int) (offset / n_etypes_in_filetype)
-(int) (offset % n_etypes_in_filetype)
+offset / n_etypes_in_filetype
+offset % n_etypes_in_filetype
-            size_in_filetype = etype_in_filetype * etype_size;
- 
@@ -316 +329 @@
-
-            /* abs. offset in bytes in the file */
-(ADIO_Offset) n_filetypes*
+n_filetypes*(ADIO_Offset)
-        }
-
@@ -326 +339 @@
-        st_frd_size = frd_size;
-        st_n_filetypes = n_filetypes;
-
+_offset
-        j = st_index;
-        off = offset;
-        frd_size = ADIOI_MIN(st_frd_size, bufsize);
-
-
+_offset
+_offset
-            end_offset = off + frd_size - 1;
-
@@ -340 +353 @@
-            }
-
-(ADIO_Offset) n_filetypes*
-
+n_filetypes*(ADIO_Offset)
+_offset
-        }
-
@@ -351 +364 @@
-        readbuf_off = offset;
-        readbuf = (char *) ADIOI_Malloc(max_bufsize);
-int
+unsigned
-
-        lseek(fd->fd_sys, offset, SEEK_SET);
@@ -365 +378 @@
-   common case. */
-
-
+_offset
-            j = st_index;
-            off = offset;
-            n_filetypes = st_n_filetypes;
-            frd_size = ADIOI_MIN(st_frd_size, bufsize);
-
+_offset
-                if (frd_size) { 
-                    /* TYPE_UB and TYPE_LB can result in 
@@ -379 +392 @@
-                    req_off = off;
-                    req_len = frd_size;
-
+_offset
-                    ADIOI_BUFFERED_READ
-                }
-
+_offset
-
-                if (off + frd_size < disp + flat_file->indices[j] +
-(ADIO_Offset) n_filetypes*
+n_filetypes*(ADIO_Offset)
-                       off += frd_size;
-                /* did not reach end of contiguous block in filetype.
@@ -396 +409 @@
-                    }
-                    off = disp + flat_file->indices[j] + 
-(ADIO_Offset) n_filetypes*
-
+n_filetypes*(ADIO_Offset)
+_offset
-                }
-            }
@@ -409 +422 @@
-
-            k = num = buf_count = 0;
- = (int) (flat_buf->indices[0])
+_offset = flat_buf->indices[0]
-            j = st_index;
-            off = offset;
@@ -424 +437 @@
-                    req_off = off;
-                    req_len = size;
-
+_offset
-                    ADIOI_BUFFERED_READ
-                }
@@ -440 +453 @@
-
-                    off = disp + flat_file->indices[j] + 
-(ADIO_Offset) n_filetypes*
+n_filetypes*(ADIO_Offset)
-
-                    new_frd_size = flat_file->blocklens[j];
-                    if (size != brd_size) {
-
+_offset
-                        new_brd_size -= size;
-                    }
@@ -454 +467 @@
-                    k = (k + 1)%flat_buf->count;
-                    buf_count++;
- = (int) (buftype_extent*
+_offset = ((ADIO_Offset)buftype_extent*(ADIO_Offset)
-                        flat_buf->indices[k]); 
-                    new_brd_size = flat_buf->blocklens[k];
@@ -462 +475 @@
-                    }
-                }
+    ADIOI_Assert(((ADIO_Offset)num + size) == (unsigned)(num + size));
-                num += size;
-                frd_size = new_frd_size;

mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_wrcoll.c

@@ -27 +27 @@
-                         datatype, int nprocs, int myrank, ADIOI_Access
-                         *others_req, ADIO_Offset *offset_list,
-in
+ADIO_Offse
-                         min_st_offset, ADIO_Offset fd_size,
-                         ADIO_Offset *fd_start, ADIO_Offset *fd_end,
@@ -33 +33 @@
-static void ADIOI_W_Exchange_data(ADIO_File fd, void *buf, char *write_buf,
-                         ADIOI_Flatlist_node *flat_buf, ADIO_Offset 
-in
+ADIO_Offse
-                         int *recv_size, ADIO_Offset off, int size,
-                         int *count, int *start_pos, int *partial_recv, 
@@ -50 +50 @@
-                ADIOI_Flatlist_node *flat_buf, 
-                ADIO_Offset *offset_list, 
-in
+ADIO_Offse
-                ADIO_Offset off, int size,                              /* 2 */
-                int *count, int *start_pos, int *partial_recv,
@@ -66 +66 @@
-static void ADIOI_Fill_send_buffer(ADIO_File fd, void *buf, ADIOI_Flatlist_node
-                           *flat_buf, char **send_buf, ADIO_Offset 
-in
+ADIO_Offse
-                           MPI_Request *requests, int *sent_to_proc, 
-                           int nprocs, int myrank, 
@@ -77 +77 @@
-static void ADIOI_Fill_send_buffer_nosend(ADIO_File fd, void *buf, ADIOI_Flatlist_node
-                           *flat_buf, char **send_buf, ADIO_Offset 
-in
+ADIO_Offse
-                           MPI_Request *requests, int *sent_to_proc, 
-                           int nprocs, int myrank, 
@@ -119 +119 @@
-    int  ii;
-
-
-
+
+
+
-    double io_time = 0, all_time, max_all_time;
-    double tstep1, max_tstep1;
@@ -130 +131 @@
-    double tstep4, max_tstep4;
-    double sum_sz;
-
+
-#if BGL_PROFILE 
-    BGLMPIO_T_CIO_RESET( 0, w )
@@ -377 +378 @@
-                                 ADIOI_Access
-                                 *others_req, ADIO_Offset *offset_list,
-
-
-
+
+
-                                 ADIO_Offset *fd_start, ADIO_Offset *fd_end,
-                                 int *buf_idx, int *error_code)
@@ -392 +392 @@
-   at least another 8Mbytes of temp space is unacceptable. */
-
-
+
+
+
-    ADIO_Offset st_loc=-1, end_loc=-1, off, done, req_off;
-    char *write_buf=NULL;
@@ -529 +531 @@
-        for (i=0; i < nprocs; i++) count[i] = recv_size[i] = 0;
-
-(int) (ADIOI_MIN(coll_bufsize, end_loc-st_loc+1-done)
+ADIOI_MIN((unsigned)coll_bufsize, end_loc-st_loc+1-done
-
-        for (i=0; i < nprocs; i++) {
@@ -553 +555 @@
-                    if (req_off < off + size) {
-                        count[i]++;
+      ADIOI_Assert((((ADIO_Offset)(MPIR_Upint)write_buf)+req_off-off) == (ADIO_Offset)(MPIR_Upint)(write_buf+req_off-off));
-                        MPI_Address(write_buf+req_off-off, 
-                               &(others_req[i].mem_ptrs[j]));
-
-
-
-
+
+
+
+
+
-                        {
-                            partial_recv[i] = (int) (off + size - req_off);
@@ -621 +625 @@
-
-        if (flag) {
-
+
+
-                        off, &status, error_code);
-            if (*error_code != MPI_SUCCESS) return;
@@ -681 +686 @@
-static void ADIOI_W_Exchange_data(ADIO_File fd, void *buf, char *write_buf,
-                                  ADIOI_Flatlist_node *flat_buf, ADIO_Offset 
-in
+ADIO_Offse
-                                  int *recv_size, ADIO_Offset off, int size,
-                                  int *count, int *start_pos,
@@ -921 +926 @@
-            } \
-            user_buf_idx = flat_buf->indices[flat_buf_idx] + \
-n_buftypes*
+(ADIO_Offset)n_buftypes*(ADIO_Offset)
-            flat_buf_sz = flat_buf->blocklens[flat_buf_idx]; \
-        } \
@@ -933 +938 @@
-    while (size) { \
-        size_in_buf = ADIOI_MIN(size, flat_buf_sz); \
+  ADIOI_Assert((((ADIO_Offset)(MPIR_Upint)buf) + user_buf_idx) == (ADIO_Offset)(MPIR_Upint)(buf + user_buf_idx)); \
+  ADIOI_Assert(size_in_buf == (size_t)size_in_buf); \
-        memcpy(&(send_buf[p][send_buf_idx[p]]), \
-               ((char *) buf) + user_buf_idx, size_in_buf); \
@@ -945 +952 @@
-            } \
-            user_buf_idx = flat_buf->indices[flat_buf_idx] + \
-n_buftypes*
+(ADIO_Offset)n_buftypes*(ADIO_Offset)
-            flat_buf_sz = flat_buf->blocklens[flat_buf_idx]; \
-        } \
@@ -954 +961 @@
-}
-
-
-
-static void ADIOI_Fill_send_buffer(ADIO_File fd, void *buf, ADIOI_Flatlist_node
-                           *flat_buf, char **send_buf, ADIO_Offset 
-in
+ADIO_Offse
-                           MPI_Request *requests, int *sent_to_proc, 
-                           int nprocs, int myrank, 
@@ -970 +975 @@
-/* this function is only called if buftype is not contig */
-
-
-
+
+
+
-    ADIO_Offset off, len, rem_len, user_buf_idx;
-
@@ -998 +1004 @@
-    for (i=0; i<contig_access_count; i++) { 
-        off     = offset_list[i];
-(ADIO_Offset) 
+
-
-        /*this request may span the file domains of more than one process*/
@@ -1018 +1024 @@
-                if (curr_to_proc[p]+len > done_to_proc[p]) {
-                    if (done_to_proc[p] > curr_to_proc[p]) {
-(int)
+
-                                done_to_proc[p], send_size[p]-send_buf_idx[p]);
-                        buf_incr = done_to_proc[p] - curr_to_proc[p];
-                        ADIOI_BUF_INCR
-
+
+
+
-                        curr_to_proc[p] = done_to_proc[p] + size;
-                        ADIOI_BUF_COPY
-                    }
-                    else {
-
-
+
+
+
-                        curr_to_proc[p] += size;
-                        ADIOI_BUF_COPY
@@ -1039 +1048 @@
-                }
-                else {
-
-
+
+
+
-                    ADIOI_BUF_INCR
-                }
-            }
-            else {
-(int)
+
-                ADIOI_BUF_INCR
-            }
@@ -1184 +1194 @@
-                ADIOI_Flatlist_node *flat_buf, 
-                ADIO_Offset *offset_list, 
-in
+ADIO_Offse
-                ADIO_Offset off, int size,                              /* 2 */
-                int *count, int *start_pos, int *partial_recv,
@@ -1199 +1209 @@
-                int *error_code)
-{   
-tmp=0, nprocs_recv, nprocs_send, erri
+nprocs_recv, nprocs_send
-    char **send_buf = NULL;
-
-
-
+
+
-    int rtail, stail;
-    char *sbuf_ptr, *to_ptr;
@@ -1327 +1336 @@
-            sbuf_ptr = all_recv_buf + rdispls[i];
-            for (j=0; j<count[i]; j++) {
-
+
+
-                len    =           others_req[i].lens[     start_pos[i]+j ]  ;
-                memcpy( to_ptr, sbuf_ptr, len );
@@ -1352 +1362 @@
-static void ADIOI_Fill_send_buffer_nosend(ADIO_File fd, void *buf, ADIOI_Flatlist_node
-                           *flat_buf, char **send_buf, ADIO_Offset 
-in
+ADIO_Offse
-                           MPI_Request *requests, int *sent_to_proc, 
-                           int nprocs, int myrank, 
@@ -1364 +1374 @@
-/* this function is only called if buftype is not contig */
-
-
-
+
+
+
-    ADIO_Offset off, len, rem_len, user_buf_idx;
-
@@ -1392 +1403 @@
-    for (i=0; i<contig_access_count; i++) { 
-        off     = offset_list[i];
-(ADIO_Offset) 
+
-
-        /*this request may span the file domains of more than one process*/
@@ -1412 +1423 @@
-                if (curr_to_proc[p]+len > done_to_proc[p]) {
-                    if (done_to_proc[p] > curr_to_proc[p]) {
-(int)
+
-                                done_to_proc[p], send_size[p]-send_buf_idx[p]);
-                        buf_incr = done_to_proc[p] - curr_to_proc[p];
-                        ADIOI_BUF_INCR
-
+
+
+
-                        curr_to_proc[p] = done_to_proc[p] + size;
-                        ADIOI_BUF_COPY
-                    }
-                    else {
-
-
+
+
+
-                        curr_to_proc[p] += size;
-                        ADIOI_BUF_COPY
@@ -1436 +1450 @@
-                }
-                else {
+        ADIOI_Assert((curr_to_proc[p] + len) == (unsigned)((ADIO_Offset)curr_to_proc[p] + len));
-                    curr_to_proc[p] += (int)len;
-(int)
+
-                    ADIOI_BUF_INCR
-                }
-            }
-            else {
-(int)
+
-                ADIOI_BUF_INCR
-            }

mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_write.c

@@ -22 +22 @@
-                     ADIO_Offset offset, ADIO_Status *status, int *error_code)
-{
-
+
+
-    static char myname[] = "ADIOI_BGL_WRITECONTIG";
-
@@ -36 +37 @@
-                          
-    MPI_Type_size(datatype, &datatype_size);
-
+
+
-
-#if BGL_PROFILE
@@ -47 +49 @@
-        ADIOI_WRITE_LOCK(fd, offset, SEEK_SET, len);
-                if (bglmpio_timing2) io_time2 = MPI_Wtime();
-
+(unsigned int)
-                if (bglmpio_timing2) bglmpio_prof_cw[ BGLMPIO_CIO_T_POSI_RW ] += (MPI_Wtime() - io_time2);
-        ADIOI_UNLOCK(fd, offset, SEEK_SET, len);
@@ -61 +63 @@
-        ADIOI_WRITE_LOCK(fd, offset, SEEK_SET, len);
-                if (bglmpio_timing2) io_time2 = MPI_Wtime();
-
+(unsigned int)
-                if (bglmpio_timing2) bglmpio_prof_cw[ BGLMPIO_CIO_T_POSI_RW ] += (MPI_Wtime() - io_time2);
-        ADIOI_UNLOCK(fd, offset, SEEK_SET, len);
@@ -74 +76 @@
-            lseek(fd->fd_sys, offset, SEEK_SET);
-        ADIOI_WRITE_LOCK(fd, offset, SEEK_SET, len);
-
+(unsigned int)
-        ADIOI_UNLOCK(fd, offset, SEEK_SET, len);
-        fd->fp_sys_posn = offset + err;
@@ -84 +86 @@
-            lseek(fd->fd_sys, fd->fp_ind, SEEK_SET);
-        ADIOI_WRITE_LOCK(fd, offset, SEEK_SET, len);
-
+(unsigned int)
-        ADIOI_UNLOCK(fd, offset, SEEK_SET, len);
-        fd->fp_ind += err;
@@ -114 +116 @@
-
-
+void ADIOI_BGL_WriteStrided(ADIO_File fd, void *buf, int count,
+                       MPI_Datatype datatype, int file_ptr_type,
+                       ADIO_Offset offset, ADIO_Status *status, int
+                       *error_code)
+{
+/* offset is in units of etype relative to the filetype. */
-
-
@@ -124 +132 @@
-        if (err == -1) err_flag = 1; \
-        writebuf_off = req_off; \
-int
+unsigned
-        if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
-        lseek(fd->fd_sys, writebuf_off, SEEK_SET); \
@@ -136 +144 @@
-        } \
-    } \
-
+
+
-    memcpy(writebuf+req_off-writebuf_off, (char *)buf +userbuf_off, write_sz);\
-    while (write_sz != req_len) { \
@@ -146 +155 @@
-        userbuf_off += write_sz; \
-        writebuf_off += writebuf_len; \
-int
+unsigned
-        if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len); \
-        lseek(fd->fd_sys, writebuf_off, SEEK_SET); \
@@ -174 +183 @@
-        if (err == -1) err_flag = 1; \
-        writebuf_off = req_off; \
-int
+unsigned
-    } \
-
+
+
-    memcpy(writebuf+req_off-writebuf_off, (char *)buf +userbuf_off, write_sz);\
-    while (write_sz != req_len) { \
@@ -187 +197 @@
-        userbuf_off += write_sz; \
-        writebuf_off += writebuf_len; \
-int
+unsigned
-        write_sz = ADIOI_MIN(req_len, writebuf_len); \
-        memcpy(writebuf, (char *)buf + userbuf_off, write_sz);\
@@ -195 +205 @@
-
-
-void ADIOI_BGL_WriteStrided(ADIO_File fd, void *buf, int count,
-                       MPI_Datatype datatype, int file_ptr_type,
-                       ADIO_Offset offset, ADIO_Status *status, int
-                       *error_code)
-{
-/* offset is in units of etype relative to the filetype. */
-
-    ADIOI_Flatlist_node *flat_buf, *flat_file;
-
-
-
+
+
+
+
-    ADIO_Offset abs_off_in_filetype=0;
-, req_len
+
-    MPI_Aint filetype_extent, buftype_extent; 
-    int buf_count, buftype_is_contig, filetype_is_contig;
@@ -213 +218 @@
-    ADIO_Offset off, req_off, disp, end_offset=0, writebuf_off, start_off;
-    char *writebuf, *value;
-
-
+
+
+
+
-    static char myname[] = "ADIOI_BGL_WRITESTRIDED";
-
@@ -248 +255 @@
-    etype_size = fd->etype_size;
-
+    ADIOI_Assert((buftype_size * count) == ((ADIO_Offset)(unsigned)buftype_size * (ADIO_Offset)count));
-    bufsize = buftype_size * count;
-
@@ -273 +281 @@
-        writebuf_off = off;
-        writebuf = (char *) ADIOI_Malloc(max_bufsize);
-int
+unsigned
-
-/* if atomicity is true, lock the region to be accessed */
@@ -280 +288 @@
-
-        for (j=0; j<count; j++) 
+        {
+          int i;
-            for (i=0; i<flat_buf->count; i++) {
-j*
+(ADIO_Offset)j*(ADIO_Offset)
-                req_off = off;
-                req_len = flat_buf->blocklens[i];
@@ -287 +297 @@
-                off += flat_buf->blocklens[i];
-            }
+        }
-
-        /* write the buffer out finally */
@@ -322 +333 @@
-            flag = 0;
-            while (!flag) {
+        int i;
-                n_filetypes++;
-                for (i=0; i<flat_file->count; i++) {
-                    if (disp + flat_file->indices[i] + 
-(ADIO_Offset) n_filetypes*
+n_filetypes*(ADIO_Offset)
-                            >= offset) {
-                        st_index = i;
-(int) (
-(ADIO_Offset) n_filetypes*
-)
+
+n_filetypes*(ADIO_Offset)
+
-                        flag = 1;
-                        break;
@@ -338 +350 @@
-        }
-        else {
+    int i;
-            n_etypes_in_filetype = filetype_size/etype_size;
-(int) (offset / n_etypes_in_filetype)
-(int) (offset % n_etypes_in_filetype)
+offset / n_etypes_in_filetype
+offset % n_etypes_in_filetype
-            size_in_filetype = etype_in_filetype * etype_size;
- 
@@ -356 +369 @@
-
-            /* abs. offset in bytes in the file */
-(ADIO_Offset) n_filetypes*
+n_filetypes*(ADIO_Offset)
-        }
-
@@ -366 +379 @@
-        st_fwr_size = fwr_size;
-        st_n_filetypes = n_filetypes;
-
+_offset
-        j = st_index;
-        off = offset;
-        fwr_size = ADIOI_MIN(st_fwr_size, bufsize);
-
-
+_offset
+_offset
-            end_offset = off + fwr_size - 1;
-
@@ -380 +393 @@
-            }
-
-(ADIO_Offset) n_filetypes*
-
+n_filetypes*(ADIO_Offset)
+_offset
-        }
-
@@ -391 +404 @@
-        writebuf_off = offset;
-        writebuf = (char *) ADIOI_Malloc(max_bufsize);
-int
+unsigned
-        if (!(fd->atomicity)) ADIOI_WRITE_LOCK(fd, writebuf_off, SEEK_SET, writebuf_len);
-        lseek(fd->fd_sys, writebuf_off, SEEK_SET); 
@@ -409 +422 @@
-   common case. */
-
-
+_offset
-            j = st_index;
-            off = offset;
-            n_filetypes = st_n_filetypes;
-            fwr_size = ADIOI_MIN(st_fwr_size, bufsize);
-
+_offset
-                if (fwr_size) { 
-                    /* TYPE_UB and TYPE_LB can result in 
-                       fwr_size = 0. save system call in such cases */ 
-                    /* lseek(fd->fd_sys, off, SEEK_SET);
-
+_offset
-
-                    req_off = off;
-                    req_len = fwr_size;
-
+_offset
-                    ADIOI_BUFFERED_WRITE
-                }
-
+_offset
-
-                if (off + fwr_size < disp + flat_file->indices[j] +
-(ADIO_Offset) n_filetypes*
+n_filetypes*(ADIO_Offset)
-                       off += fwr_size;
-                /* did not reach end of contiguous block in filetype.
@@ -440 +453 @@
-                    }
-                    off = disp + flat_file->indices[j] + 
-(ADIO_Offset) n_filetypes*
-
+n_filetypes*(ADIO_Offset)
+_offset
-                }
-            }
@@ -453 +466 @@
-
-            k = num = buf_count = 0;
- = (int) (flat_buf->indices[0])
+_offset = flat_buf->indices[0]
-            j = st_index;
-            off = offset;
@@ -464 +477 @@
-                if (size) {
-                    /* lseek(fd->fd_sys, off, SEEK_SET);
-
+_offset
-
-                    req_off = off;
-                    req_len = size;
-
+_offset
-                    ADIOI_BUFFERED_WRITE
-                }
@@ -484 +497 @@
-
-                    off = disp + flat_file->indices[j] + 
-(ADIO_Offset) n_filetypes*
+n_filetypes*(ADIO_Offset)
-
-                    new_fwr_size = flat_file->blocklens[j];
-                    if (size != bwr_size) {
-
+_offset
-                        new_bwr_size -= size;
-                    }
@@ -498 +511 @@
-                    k = (k + 1)%flat_buf->count;
-                    buf_count++;
- = (int) (buftype_extent*
-)
+_offset = (ADIO_Offset)buftype_extent*(ADIO_Offset)
+
-                    new_bwr_size = flat_buf->blocklens[k];
-                    if (size != fwr_size) {