[Darshan-commits] [Darshan] branch, dev-modular, updated. darshan-2.3.1-89-gb70229e

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".

The branch, dev-modular has been updated
       via  b70229e4c9d745170efca03084c3b3b244792eb5 (commit)
      from  58ae2da29e36978ead086d05597df9c7dfbee614 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b70229e4c9d745170efca03084c3b3b244792eb5
Author: Phil Carns <carns at mcs.anl.gov>
Date:   Mon Apr 6 16:22:25 2015 -0400

    stub logutils for mpiio

-----------------------------------------------------------------------

Summary of changes:
 darshan-util/Makefile.in                           |    9 +++++++--
 ...n-posix-logutils.c => darshan-mpiio-logutils.c} |   10 +++++-----
 darshan-util/darshan-mpiio-logutils.h              |   15 +++++++++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)
 copy darshan-util/{darshan-posix-logutils.c => darshan-mpiio-logutils.c} (78%)
 create mode 100644 darshan-util/darshan-mpiio-logutils.h


Diff of changes:
diff --git a/darshan-util/Makefile.in b/darshan-util/Makefile.in
index 1e3ad31..c91a434 100644
--- a/darshan-util/Makefile.in
+++ b/darshan-util/Makefile.in
@@ -51,10 +51,15 @@ darshan-posix-logutils.o: darshan-posix-logutils.c darshan-logutils.h darshan-po
 darshan-posix-logutils.po: darshan-posix-logutils.c darshan-logutils.h darshan-posix-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-posix-log-format.h | uthash-1.9.2
 	$(CC) $(CFLAGS_SHARED) -c  $< -o $@
 
-libdarshan-util.so: darshan-logutils.po darshan-posix-logutils.po
+darshan-mpiio-logutils.o: darshan-mpiio-logutils.c darshan-logutils.h darshan-mpiio-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-mpiio-log-format.h | uthash-1.9.2
+	$(CC) $(CFLAGS) -c  $< -o $@
+darshan-mpiio-logutils.po: darshan-mpiio-logutils.c darshan-logutils.h darshan-mpiio-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-mpiio-log-format.h | uthash-1.9.2
+	$(CC) $(CFLAGS_SHARED) -c  $< -o $@
+
+libdarshan-util.so: darshan-logutils.po darshan-posix-logutils.po darshan-mpiio-logutils.po
 	$(CC) $(CFLAGS_SHARED) $(LDFLAGS) -o $@ $^ $(LIBS)
 	
-libdarshan-util.a: darshan-logutils.o darshan-posix-logutils.o
+libdarshan-util.a: darshan-logutils.o darshan-posix-logutils.o darshan-mpiio-logutils.o
 	ar rcs libdarshan-util.a $^
 
 jenkins: util/bin/jenkins.o lookup3.o
diff --git a/darshan-util/darshan-posix-logutils.c b/darshan-util/darshan-mpiio-logutils.c
similarity index 78%
copy from darshan-util/darshan-posix-logutils.c
copy to darshan-util/darshan-mpiio-logutils.c
index 51ba78d..33fc1c3 100644
--- a/darshan-util/darshan-posix-logutils.c
+++ b/darshan-util/darshan-mpiio-logutils.c
@@ -17,9 +17,9 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "darshan-posix-logutils.h"
+#include "darshan-mpiio-logutils.h"
 
-int darshan_log_get_posix_file(darshan_fd fd, struct darshan_posix_file *file)
+int darshan_log_get_mpiio_file(darshan_fd fd, struct darshan_mpiio_file *file)
 {
     int i;
     int ret;
@@ -29,7 +29,7 @@ int darshan_log_get_posix_file(darshan_fd fd, struct darshan_posix_file *file)
      */
     memset(file, 0, sizeof(*file));
 
-    ret = darshan_log_get_moddat(fd, DARSHAN_POSIX_MOD,
+    ret = darshan_log_get_moddat(fd, DARSHAN_MPIIO_MOD,
         (void *)file, sizeof(*file));
     if(ret == 1)
     {
@@ -38,9 +38,9 @@ int darshan_log_get_posix_file(darshan_fd fd, struct darshan_posix_file *file)
             /* swap bytes if necessary */
             DARSHAN_BSWAP64(&file->f_id);
             DARSHAN_BSWAP64(&file->rank);
-            for(i=0; i<POSIX_NUM_INDICES; i++)
+            for(i=0; i<DARSHAN_MPIIO_NUM_INDICES; i++)
                 DARSHAN_BSWAP64(&file->counters[i]);
-            for(i=0; i<POSIX_F_NUM_INDICES; i++)
+            for(i=0; i<DARSHAN_MPIIO_F_NUM_INDICES; i++)
                 DARSHAN_BSWAP64(&file->fcounters[i]);
         }
     }
diff --git a/darshan-util/darshan-mpiio-logutils.h b/darshan-util/darshan-mpiio-logutils.h
new file mode 100644
index 0000000..965225f
--- /dev/null
+++ b/darshan-util/darshan-mpiio-logutils.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2015 University of Chicago.
+ * See COPYRIGHT notice in top-level directory.
+ *
+ */
+
+#ifndef __DARSHAN_MPIIO_LOG_UTILS_H
+#define __DARSHAN_MPIIO_LOG_UTILS_H
+
+#include "darshan-logutils.h"
+#include "darshan-mpiio-log-format.h"
+
+int darshan_log_get_mpiio_file(darshan_fd fd, struct darshan_mpiio_file *file);
+
+#endif


hooks/post-receive
--