[mpich2-commits] r4122 - in mpich2/trunk/src/mpi/romio/adio: ad_bgl common include

[robl at mcs.anl.gov]

Author: robl
Date: 2009-03-18 15:15:18 -0500 (Wed, 18 Mar 2009)
New Revision: 4122

Modified:
   mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_open.c
   mpich2/trunk/src/mpi/romio/adio/common/ad_init.c
   mpich2/trunk/src/mpi/romio/adio/include/adioi.h
Log:
found something else interesting to visualize with mpe


Modified: mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_open.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_open.c	2009-03-18 19:46:13 UTC (rev 4121)
+++ mpich2/trunk/src/mpi/romio/adio/ad_bgl/ad_bgl_open.c	2009-03-18 20:15:18 UTC (rev 4122)
@@ -133,8 +133,13 @@
 	amode = amode | O_RDWR;
     if (fd->access_mode & ADIO_EXCL)
 	amode = amode | O_EXCL;
-
+#ifdef ADIOI_MPE_LOGGING
+    MPE_Log_event(ADIOI_MPE_open_a, 0, NULL);
+#endif
     fd->fd_sys = open(fd->filename, amode, perm);
+#ifdef ADIOI_MPE_LOGGING
+    MPE_Log_event(ADIOI_MPE_open_b, 0, NULL);
+#endif
   DBG_FPRINTF(stderr,"open('%s',%#X,%#X) rc=%d, errno=%d\n",fd->filename,amode,perm,fd->fd_sys,errno);
     fd->fd_direct = -1;
 
@@ -158,6 +163,10 @@
     ((ADIOI_BGL_fs*)fd->fs_ptr)->fsync_aggr = ADIOI_BGL_FSYNC_AGGREGATION_DISABLED; 
     
 
+
+#ifdef ADIOI_MPE_LOGGING
+        MPE_Log_event(ADIOI_MPE_stat_a, 0, NULL);
+#endif
     /* Get the (real) underlying file system block size */
     rc = stat64(fd->filename,&bgl_stat);
       if (rc >= 0)
@@ -194,6 +203,9 @@
       }
       ADIOI_Free(dir);
     }
+#ifdef ADIOI_MPE_LOGGING
+	MPE_Log_event(ADIOI_MPE_stat_b, 0, NULL);
+#endif
     if ((bgl_statfs.f_type == GPFS_SUPER_MAGIC) ||
         (bgl_statfs.f_type == PVFS2_SUPER_MAGIC))
     {

Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_init.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_init.c	2009-03-18 19:46:13 UTC (rev 4121)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_init.c	2009-03-18 20:15:18 UTC (rev 4122)
@@ -77,6 +77,9 @@
         MPE_Log_get_state_eventIDs( &ADIOI_MPE_unlock_a, &ADIOI_MPE_unlock_b );
         MPE_Log_get_state_eventIDs( &ADIOI_MPE_postwrite_a,
                                     &ADIOI_MPE_postwrite_b );
+	MPE_Log_get_state_eventIDs( &ADIOI_MPE_openinternal_a, 
+			&ADIOI_MPE_openinternal_b);
+	MPE_Log_get_state_eventIDs( &ADIOI_MPE_stat_a, &ADIOI_MPE_stat_b);
 
         int  comm_world_rank;
         MPI_Comm_rank( MPI_COMM_WORLD, &comm_world_rank );
@@ -100,6 +103,8 @@
                                 "unlock", "purple" );
             MPE_Describe_state( ADIOI_MPE_postwrite_a, ADIOI_MPE_postwrite_b,
                                 "postwrite", "ivory" );
+	    MPE_Describe_state( ADIOI_MPE_openinternal_a, ADIOI_MPE_openinternal_b, "open system", "blue");
+	    MPE_Describe_state( ADIOI_MPE_stat_a, ADIOI_MPE_stat_b, "stat", "purple");
         }
     }
 #endif

Modified: mpich2/trunk/src/mpi/romio/adio/include/adioi.h
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/include/adioi.h	2009-03-18 19:46:13 UTC (rev 4121)
+++ mpich2/trunk/src/mpi/romio/adio/include/adioi.h	2009-03-18 20:15:18 UTC (rev 4122)
@@ -794,6 +794,10 @@
 int  ADIOI_MPE_unlock_b;
 int  ADIOI_MPE_postwrite_a;
 int  ADIOI_MPE_postwrite_b;
+int  ADIOI_MPE_openinternal_a;
+int  ADIOI_MPE_openinternal_b;
+int  ADIOI_MPE_stat_a;
+int  ADIOI_MPE_stat_b;
 #endif
 
 #ifdef ROMIO_INSIDE_MPICH2