<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
</head>
<body>
<style type="text/css">
img {
max-width: 100%; height: auto;
}
</style>
<div class="content">
<h3>
Philip Carns pushed to branch dev-stdio
at <a href="https://xgitlab.cels.anl.gov/darshan/darshan">darshan / darshan</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://xgitlab.cels.anl.gov/darshan/darshan/commit/f88ebef63933df7d3c2697ed5c7dbbb413a19f0b">f88ebef6</a></strong>
<div>
<span>by Phil Carns</span>
<i>at 2016-05-01T07:57:38-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap">fix minor potential bug in open timestamp
- be careful to record start timestamp of first open to start rather
than start timestamp of first open to complete</pre>
</li>
<li>
<strong><a href="https://xgitlab.cels.anl.gov/darshan/darshan/commit/8d3a2c8a31d18374464745402e23d37fafaa3225">8d3a2c8a</a></strong>
<div>
<span>by Phil Carns</span>
<i>at 2016-05-01T07:58:33-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap">Merge remote-tracking branch 'origin/master' into dev-stdio</pre>
</li>
</ul>
<h4>4 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#620f2ecad2bb6f74b2fcd0134963a841" style="text-decoration: none">
darshan-runtime/lib/darshan-hdf5.c
</a>
</li>
<li class="file-stats">
<a href="#ad29afc395839758d41094872298bd0d" style="text-decoration: none">
darshan-runtime/lib/darshan-mpiio.c
</a>
</li>
<li class="file-stats">
<a href="#c0b0bf6d71bc5fc7e6d50d69c8aa2413" style="text-decoration: none">
darshan-runtime/lib/darshan-pnetcdf.c
</a>
</li>
<li class="file-stats">
<a href="#2ace16276b68c7d5aef163bb260bd9f7" style="text-decoration: none">
darshan-runtime/lib/darshan-posix.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="620f2ecad2bb6f74b2fcd0134963a841">
<a href="https://xgitlab.cels.anl.gov/darshan/darshan/compare/841429de3ffaaaed5cf574d84e35e78206d62b5a...8d3a2c8a31d18374464745402e23d37fafaa3225#diff-0">
<strong>
darshan-runtime/lib/darshan-hdf5.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/darshan-runtime/lib/darshan-hdf5.c
</span><span style="background: #ddffdd; color: #000000">+++ b/darshan-runtime/lib/darshan-hdf5.c
</span><span style="color: #aaaaaa">@@ -115,7 +115,8 @@ hid_t DARSHAN_DECL(H5Fcreate)(const char *filename, unsigned flags,
</span> file = hdf5_file_by_name_sethid(filename, ret);
if(file)
{
<span style="background: #ffdddd; color: #000000">- if(file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] == 0)
</span><span style="background: #ddffdd; color: #000000">+ if(file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] == 0 ||
+ file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] > tm1)
</span> file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] = tm1;
file->file_record->counters[HDF5_OPENS] += 1;
}
<span style="color: #aaaaaa">@@ -154,7 +155,8 @@ hid_t DARSHAN_DECL(H5Fopen)(const char *filename, unsigned flags,
</span> file = hdf5_file_by_name_sethid(filename, ret);
if(file)
{
<span style="background: #ffdddd; color: #000000">- if(file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] == 0)
</span><span style="background: #ddffdd; color: #000000">+ if(file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] == 0 ||
+ file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] > tm1)
</span> file->file_record->fcounters[HDF5_F_OPEN_TIMESTAMP] = tm1;
file->file_record->counters[HDF5_OPENS] += 1;
}
</code></pre>
<br>
</li>
<li id="ad29afc395839758d41094872298bd0d">
<a href="https://xgitlab.cels.anl.gov/darshan/darshan/compare/841429de3ffaaaed5cf574d84e35e78206d62b5a...8d3a2c8a31d18374464745402e23d37fafaa3225#diff-1">
<strong>
darshan-runtime/lib/darshan-mpiio.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/darshan-runtime/lib/darshan-mpiio.c
</span><span style="background: #ddffdd; color: #000000">+++ b/darshan-runtime/lib/darshan-mpiio.c
</span><span style="color: #aaaaaa">@@ -151,7 +151,8 @@ static void mpiio_shutdown(void);
</span> file->file_record->counters[MPIIO_COLL_OPENS] += 1; \
if(__info != MPI_INFO_NULL) \
file->file_record->counters[MPIIO_HINTS] += 1; \
<span style="background: #ffdddd; color: #000000">- if(file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] == 0) \
</span><span style="background: #ddffdd; color: #000000">+ if(file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] == 0 || \
+ file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] > __tm1) \
</span> file->file_record->fcounters[MPIIO_F_OPEN_TIMESTAMP] = __tm1; \
DARSHAN_TIMER_INC_NO_OVERLAP(file->file_record->fcounters[MPIIO_F_META_TIME], __tm1, __tm2, file->last_meta_end); \
} while(0)
</code></pre>
<br>
</li>
<li id="c0b0bf6d71bc5fc7e6d50d69c8aa2413">
<a href="https://xgitlab.cels.anl.gov/darshan/darshan/compare/841429de3ffaaaed5cf574d84e35e78206d62b5a...8d3a2c8a31d18374464745402e23d37fafaa3225#diff-2">
<strong>
darshan-runtime/lib/darshan-pnetcdf.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/darshan-runtime/lib/darshan-pnetcdf.c
</span><span style="background: #ddffdd; color: #000000">+++ b/darshan-runtime/lib/darshan-pnetcdf.c
</span><span style="color: #aaaaaa">@@ -112,7 +112,8 @@ int DARSHAN_DECL(ncmpi_create)(MPI_Comm comm, const char *path,
</span> file = pnetcdf_file_by_name_setncid(path, (*ncidp));
if(file)
{
<span style="background: #ffdddd; color: #000000">- if(file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] == 0)
</span><span style="background: #ddffdd; color: #000000">+ if(file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] == 0 ||
+ file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] > tm1)
</span> file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] = tm1;
DARSHAN_MPI_CALL(PMPI_Comm_size)(comm, &comm_size);
if(comm_size == 1)
<span style="color: #aaaaaa">@@ -160,7 +161,8 @@ int DARSHAN_DECL(ncmpi_open)(MPI_Comm comm, const char *path,
</span> file = pnetcdf_file_by_name_setncid(path, (*ncidp));
if(file)
{
<span style="background: #ffdddd; color: #000000">- if(file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] == 0)
</span><span style="background: #ddffdd; color: #000000">+ if(file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] == 0 ||
+ file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] > tm1)
</span> file->file_record->fcounters[PNETCDF_F_OPEN_TIMESTAMP] = tm1;
DARSHAN_MPI_CALL(PMPI_Comm_size)(comm, &comm_size);
if(comm_size == 1)
</code></pre>
<br>
</li>
<li id="2ace16276b68c7d5aef163bb260bd9f7">
<a href="https://xgitlab.cels.anl.gov/darshan/darshan/compare/841429de3ffaaaed5cf574d84e35e78206d62b5a...8d3a2c8a31d18374464745402e23d37fafaa3225#diff-3">
<strong>
darshan-runtime/lib/darshan-posix.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/darshan-runtime/lib/darshan-posix.c
</span><span style="background: #ddffdd; color: #000000">+++ b/darshan-runtime/lib/darshan-posix.c
</span><span style="color: #aaaaaa">@@ -224,7 +224,8 @@ static void posix_shutdown(void);
</span> file->file_record->counters[POSIX_FOPENS] += 1; \
else \
file->file_record->counters[POSIX_OPENS] += 1; \
<span style="background: #ffdddd; color: #000000">- if(file->file_record->fcounters[POSIX_F_OPEN_TIMESTAMP] == 0) \
</span><span style="background: #ddffdd; color: #000000">+ if(file->file_record->fcounters[POSIX_F_OPEN_TIMESTAMP] == 0 || \
+ file->file_record->fcounters[POSIX_F_OPEN_TIMESTAMP] > __tm1) \
</span> file->file_record->fcounters[POSIX_F_OPEN_TIMESTAMP] = __tm1; \
DARSHAN_TIMER_INC_NO_OVERLAP(file->file_record->fcounters[POSIX_F_META_TIME], __tm1, __tm2, file->last_meta_end); \
} while(0)
</code></pre>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px">
<p style="color: #777; font-size: small">
—
<br>
<a href="https://xgitlab.cels.anl.gov/darshan/darshan/compare/841429de3ffaaaed5cf574d84e35e78206d62b5a...8d3a2c8a31d18374464745402e23d37fafaa3225">View it on GitLab</a>.
<br>
You're receiving this email because of your account on xgitlab.cels.anl.gov.
If you'd like to receive fewer emails, you can
adjust your notification settings.
</p>
</div>
</body>
</html>