<!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/4cdf8a06da2dc6bbaf4b19045d77f698ed972cff">4cdf8a06</a></strong>
<div>
<span>by Phil Carns</span>
<i>at 2016-05-23T20:53:18-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap">fgetc wrapper</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#620f2ecad2bb6f74b2fcd0134963a841" style="text-decoration: none">
darshan-runtime/lib/darshan-stdio.c
</a>
</li>
<li class="file-stats">
<a href="#ad29afc395839758d41094872298bd0d" style="text-decoration: none">
darshan-runtime/share/ld-opts/darshan-stdio-ld-opts
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="620f2ecad2bb6f74b2fcd0134963a841">
<a href="https://xgitlab.cels.anl.gov/darshan/darshan/commit/4cdf8a06da2dc6bbaf4b19045d77f698ed972cff#diff-0">
<strong>
darshan-runtime/lib/darshan-stdio.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/darshan-runtime/lib/darshan-stdio.c
</span><span style="background: #ddffdd; color: #000000">+++ b/darshan-runtime/lib/darshan-stdio.c
</span><span style="color: #aaaaaa">@@ -36,7 +36,7 @@
</span> *
* functions for reading data
* --------------
<span style="background: #ffdddd; color: #000000">- * int fgetc(FILE *);
</span><span style="background: #ddffdd; color: #000000">+ * int fgetc(FILE *); DONE
</span> * char *fgets(char *, int, FILE *);
* size_t fread(void *, size_t, size_t, FILE *); DONE
* int fscanf(FILE *, const char *, ...);
<span style="color: #aaaaaa">@@ -99,6 +99,7 @@ DARSHAN_FORWARD_DECL(fclose, int, (FILE *fp));
</span> DARSHAN_FORWARD_DECL(fflush, int, (FILE *fp));
DARSHAN_FORWARD_DECL(fwrite, size_t, (const void *ptr, size_t size, size_t nmemb, FILE *stream));
DARSHAN_FORWARD_DECL(fread, size_t, (void *ptr, size_t size, size_t nmemb, FILE *stream));
<span style="background: #ddffdd; color: #000000">+DARSHAN_FORWARD_DECL(fgetc, int, (FILE *stream));
</span> DARSHAN_FORWARD_DECL(fseek, int, (FILE *stream, long offset, int whence));
/* The stdio_file_runtime structure maintains necessary runtime metadata
<span style="color: #aaaaaa">@@ -427,6 +428,26 @@ size_t DARSHAN_DECL(fread)(void *ptr, size_t size, size_t nmemb, FILE *stream)
</span> return(ret);
}
<span style="background: #ddffdd; color: #000000">+size_t DARSHAN_DECL(fgetc)(FILE *stream)
+{
+ int ret;
+ double tm1, tm2;
+
+ MAP_OR_FAIL(fgetc);
+
+ tm1 = darshan_core_wtime();
+ ret = __real_fgetc(stream);
+ tm2 = darshan_core_wtime();
+
+ STDIO_LOCK();
+ stdio_runtime_initialize();
+ if(ret != EOF)
+ STDIO_RECORD_READ(stream, 1, tm1, tm2);
+ STDIO_UNLOCK();
+
+ return(ret);
+}
+
</span> int DARSHAN_DECL(fseek)(FILE *stream, long offset, int whence)
{
int ret;
</code></pre>
<br>
</li>
<li id="ad29afc395839758d41094872298bd0d">
<a href="https://xgitlab.cels.anl.gov/darshan/darshan/commit/4cdf8a06da2dc6bbaf4b19045d77f698ed972cff#diff-1">
<strong>
darshan-runtime/share/ld-opts/darshan-stdio-ld-opts
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="background: #ffdddd; color: #000000">--- a/darshan-runtime/share/ld-opts/darshan-stdio-ld-opts
</span><span style="background: #ddffdd; color: #000000">+++ b/darshan-runtime/share/ld-opts/darshan-stdio-ld-opts
</span><span style="color: #aaaaaa">@@ -7,4 +7,5 @@
</span> --wrap=fclose
--wrap=fwrite
--wrap=fread
<span style="background: #ddffdd; color: #000000">+--wrap=fgetc
</span> --wrap=fseek
</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/commit/4cdf8a06da2dc6bbaf4b19045d77f698ed972cff">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>