add fence to more ADIO layers

Author: adammoody

src/mpi/romio/adio/ad_nfs/ad_nfs.c

@@ -32,6 +32,7 @@ struct ADIOI_Fns_struct ADIO_NFS_operations = {
     ADIOI_GEN_IreadStrided,     /* IreadStrided */
     ADIOI_GEN_IwriteStrided,    /* IwriteStrided */
     ADIOI_GEN_Flush,    /* Flush */
+    ADIOI_GEN_Fence,    /* Fence */
     ADIOI_NFS_Resize,   /* Resize */
     ADIOI_GEN_Delete,   /* Delete */
     ADIOI_NFS_Feature,  /* Features */

src/mpi/romio/adio/ad_testfs/Makefile.mk

@@ -20,6 +20,7 @@ romio_other_sources +=                \
     adio/ad_testfs/ad_testfs_iwrite.c \
     adio/ad_testfs/ad_testfs_wait.c   \
     adio/ad_testfs/ad_testfs_flush.c  \
+    adio/ad_testfs/ad_testfs_fence.c  \
     adio/ad_testfs/ad_testfs_seek.c   \
     adio/ad_testfs/ad_testfs_resize.c \
     adio/ad_testfs/ad_testfs_hints.c  \

src/mpi/romio/adio/ad_testfs/ad_testfs.c

@@ -30,6 +30,7 @@ struct ADIOI_Fns_struct ADIO_TESTFS_operations = {
     ADIOI_TESTFS_IreadStrided,  /* IreadStrided */
     ADIOI_TESTFS_IwriteStrided, /* IwriteStrided */
     ADIOI_TESTFS_Flush, /* Flush */
+    ADIOI_TESTFS_Fence, /* Fence */
     ADIOI_TESTFS_Resize,        /* Resize */
     ADIOI_TESTFS_Delete,        /* Delete */
     ADIOI_GEN_Feature,  /* Features */

src/mpi/romio/adio/ad_testfs/ad_testfs.h

@@ -62,6 +62,7 @@ void ADIOI_TESTFS_IwriteStrided(ADIO_File fd, const void *buf, int count,
                                 ADIO_Offset offset, ADIO_Request * request, int
                                 *error_code);
 void ADIOI_TESTFS_Flush(ADIO_File fd, int *error_code);
+void ADIOI_TESTFS_Fence(ADIO_File fd, int *error_code);
 void ADIOI_TESTFS_Resize(ADIO_File fd, ADIO_Offset size, int *error_code);
 ADIO_Offset ADIOI_TESTFS_SeekIndividual(ADIO_File fd, ADIO_Offset offset,
                                         int whence, int *error_code);

src/mpi/romio/adio/ad_testfs/ad_testfs_fence.c

@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) by Argonne National Laboratory
+ *     See COPYRIGHT in top-level directory
+ */
+
+#include "ad_testfs.h"
+#include "adioi.h"
+
+void ADIOI_TESTFS_Fence(ADIO_File fd, int *error_code)
+{
+    int myrank, nprocs;
+
+    *error_code = MPI_SUCCESS;
+
+    MPI_Comm_size(fd->comm, &nprocs);
+    MPI_Comm_rank(fd->comm, &myrank);
+    FPRINTF(stdout, "[%d/%d] ADIOI_TESTFS_Fence called on %s\n", myrank, nprocs, fd->filename);
+}

src/mpi/romio/adio/ad_ufs/ad_ufs.c

@@ -35,6 +35,7 @@ struct ADIOI_Fns_struct ADIO_UFS_operations = {
     ADIOI_GEN_IreadStrided,     /* IreadStrided */
     ADIOI_GEN_IwriteStrided,    /* IwriteStrided */
     ADIOI_GEN_Flush,    /* Flush */
+    ADIOI_GEN_Fence,    /* Fence */
     ADIOI_GEN_Resize,   /* Resize */
     ADIOI_GEN_Delete,   /* Delete */
     ADIOI_GEN_Feature,  /* Features */

src/mpi/romio/adio/include/adioi.h

@@ -226,6 +226,7 @@ struct ADIOI_Fns_struct {
                                      MPI_Datatype datatype, int file_ptr_type,
                                      ADIO_Offset offset, ADIO_Request * request, int *error_code);
     void (*ADIOI_xxx_Flush) (ADIO_File fd, int *error_code);
+    void (*ADIOI_xxx_Fence) (ADIO_File fd, int *error_code);
     void (*ADIOI_xxx_Resize) (ADIO_File fd, ADIO_Offset size, int *error_code);
     void (*ADIOI_xxx_Delete) (const char *filename, int *error_code);
     int (*ADIOI_xxx_Feature) (ADIO_File fd, int flag);
@@ -397,6 +398,7 @@ void ADIOI_Info_print_keyvals(MPI_Info info);
 
 void ADIOI_GEN_Fcntl(ADIO_File fd, int flag, ADIO_Fcntl_t * fcntl_struct, int *error_code);
 void ADIOI_GEN_Flush(ADIO_File fd, int *error_code);
+void ADIOI_GEN_Fence(ADIO_File fd, int *error_code);
 void ADIOI_GEN_OpenColl(ADIO_File fd, int rank, int access_mode, int *error_code);
 void ADIOI_SCALEABLE_OpenColl(ADIO_File fd, int rank, int access_mode, int *error_code);
 void ADIOI_FAILSAFE_OpenColl(ADIO_File fd, int rank, int access_mode, int *error_code);

src/mpi/romio/mpi-io/fence.c

@@ -36,11 +36,11 @@ int MPI_File_fence(MPI_File fh)
 {
     int error_code;
     ADIO_File adio_fh;
-    static char myname[] = "MPI_FILE_SYNC";
+    static char myname[] = "MPI_FILE_FENCE";
 #ifdef MPI_hpux
     int fl_xmpi;
 
-    HPMP_IO_START(fl_xmpi, BLKMPIFILESYNC, TRDTBLOCK, adio_fh, MPI_DATATYPE_NULL, -1);
+    HPMP_IO_START(fl_xmpi, BLKMPIFILEFENCE, TRDTBLOCK, adio_fh, MPI_DATATYPE_NULL, -1);
 #endif /* MPI_hpux */
     ROMIO_THREAD_CS_ENTER();
 

src/mpi/romio/mpi-io/mpioprof.h

@@ -139,6 +139,8 @@
 #define MPI_File_get_atomicity PMPI_File_get_atomicity
 #undef MPI_File_sync
 #define MPI_File_sync PMPI_File_sync
+#undef MPI_File_fence
+#define MPI_File_fence PMPI_File_fence
 
 #undef MPI_Type_create_subarray
 #define MPI_Type_create_subarray PMPI_Type_create_subarray