<!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/551c339c02254cdd99b2ef5b720c7da1b58fed13">551c339c</a></strong>
<div>
<span>by Phil Carns</span>
<i>at 2016-05-23T21:18:51-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap">getc 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/551c339c02254cdd99b2ef5b720c7da1b58fed13#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">@@ -42,7 +42,7 @@
</span> * size_t fread(void *, size_t, size_t, FILE *); DONE
* int fscanf(FILE *, const char *, ...); DONE
* int vfscanf(FILE *, const char *, va_list); DONE
<span style="background: #ffdddd; color: #000000">- * int getc(FILE *);
</span><span style="background: #ddffdd; color: #000000">+ * int getc(FILE *); DONE
</span> * int getc_unlocked(FILE *);
* int getw(FILE *);
*
<span style="color: #aaaaaa">@@ -102,6 +102,7 @@ DARSHAN_FORWARD_DECL(fflush, int, (FILE *fp));
</span> 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));
DARSHAN_FORWARD_DECL(fgetc, int, (FILE *stream));
<span style="background: #ddffdd; color: #000000">+DARSHAN_FORWARD_DECL(_IO_getc, int, (FILE *stream));
</span> DARSHAN_FORWARD_DECL(fscanf, int, (FILE *stream, const char *format, ...));
DARSHAN_FORWARD_DECL(vfscanf, int, (FILE *stream, const char *format, va_list ap));
DARSHAN_FORWARD_DECL(fgets, char*, (char *s, int size, FILE *stream));
<span style="color: #aaaaaa">@@ -453,6 +454,27 @@ size_t DARSHAN_DECL(fgetc)(FILE *stream)
</span> return(ret);
}
<span style="background: #ddffdd; color: #000000">+/* NOTE: stdio.h typically implements getc() as a macro pointing to _IO_getc */
+size_t DARSHAN_DECL(_IO_getc)(FILE *stream)
+{
+ int ret;
+ double tm1, tm2;
+
+ MAP_OR_FAIL(_IO_getc);
+
+ tm1 = darshan_core_wtime();
+ ret = __real__IO_getc(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(fscanf)(FILE *stream, const char *format, ...)
{
int ret;
</code></pre>
<br>
</li>
<li id="ad29afc395839758d41094872298bd0d">
<a href="https://xgitlab.cels.anl.gov/darshan/darshan/commit/551c339c02254cdd99b2ef5b720c7da1b58fed13#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">@@ -10,5 +10,6 @@
</span> --wrap=fgetc
--wrap=fscanf
--wrap=vfscanf
<span style="background: #ddffdd; color: #000000">+--wrap=_IO_getc
</span> --wrap=fgets
--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/551c339c02254cdd99b2ef5b720c7da1b58fed13">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>