<!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/9e6663d9f1891f63ebf7dda5b7ae5ee3677e9d52">9e6663d9</a></strong>
<div>
<span>by Phil Carns</span>
<i>at 2016-05-23T21:13:46-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap">fscanf and vfscanf wrappers
- needs testing</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/9e6663d9f1891f63ebf7dda5b7ae5ee3677e9d52#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">@@ -16,6 +16,7 @@
</span> * - POSIX_FWRITES
* - POSIX_FSEEKS
* - add regression test cases for all functions captured here
<span style="background: #ddffdd; color: #000000">+ * - especially the scanf and printf variants
</span> */
/* catalog of stdio functions instrumented by this module
<span style="color: #aaaaaa">@@ -39,7 +40,8 @@
</span> * int fgetc(FILE *); DONE
* char *fgets(char *, int, FILE *); DONE
* size_t fread(void *, size_t, size_t, FILE *); DONE
<span style="background: #ffdddd; color: #000000">- * int fscanf(FILE *, const char *, ...);
</span><span style="background: #ddffdd; color: #000000">+ * int fscanf(FILE *, const char *, ...); DONE
+ * int vfscanf(FILE *, const char *, va_list); DONE
</span> * int getc(FILE *);
* int getc_unlocked(FILE *);
* int getw(FILE *);
<span style="color: #aaaaaa">@@ -100,6 +102,8 @@ 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(fscanf, int, (FILE *stream, const char *format, ...));
+DARSHAN_FORWARD_DECL(vfscanf, int, (FILE *stream, const char *format, va_list ap));
</span> DARSHAN_FORWARD_DECL(fgets, char*, (char *s, int size, FILE *stream));
DARSHAN_FORWARD_DECL(fseek, int, (FILE *stream, long offset, int whence));
<span style="color: #aaaaaa">@@ -449,6 +453,59 @@ size_t DARSHAN_DECL(fgetc)(FILE *stream)
</span> return(ret);
}
<span style="background: #ddffdd; color: #000000">+int DARSHAN_DECL(fscanf)(FILE *stream, const char *format, ...)
+{
+ int ret;
+ double tm1, tm2;
+ va_list ap;
+ long start_off, end_off;
+
+ MAP_OR_FAIL(vfscanf);
+
+ tm1 = darshan_core_wtime();
+ /* NOTE: we intentionally switch to vfscanf here to handle the variable
+ * length arguments.
+ */
+ start_off = ftell(stream);
+ va_start(ap, format);
+ ret = __real_vfscanf(stream, format, ap);
+ va_end(ap);
+ end_off = ftell(stream);
+ tm2 = darshan_core_wtime();
+
+ STDIO_LOCK();
+ stdio_runtime_initialize();
+ if(ret != 0)
+ STDIO_RECORD_READ(stream, end_off-start_off, tm1, tm2);
+ STDIO_UNLOCK();
+
+ return(ret);
+}
+
+int DARSHAN_DECL(vfscanf)(FILE *stream, const char *format, va_list ap)
+{
+ int ret;
+ double tm1, tm2;
+ long start_off, end_off;
+
+ MAP_OR_FAIL(vfscanf);
+
+ tm1 = darshan_core_wtime();
+ start_off = ftell(stream);
+ ret = __real_vfscanf(stream, format, ap);
+ end_off = ftell(stream);
+ tm2 = darshan_core_wtime();
+
+ STDIO_LOCK();
+ stdio_runtime_initialize();
+ if(ret != 0)
+ STDIO_RECORD_READ(stream, end_off-start_off, tm1, tm2);
+ STDIO_UNLOCK();
+
+ return(ret);
+}
+
+
</span> char* DARSHAN_DECL(fgets)(char *s, int size, FILE *stream)
{
char *ret;
</code></pre>
<br>
</li>
<li id="ad29afc395839758d41094872298bd0d">
<a href="https://xgitlab.cels.anl.gov/darshan/darshan/commit/9e6663d9f1891f63ebf7dda5b7ae5ee3677e9d52#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">@@ -8,5 +8,7 @@
</span> --wrap=fwrite
--wrap=fread
--wrap=fgetc
<span style="background: #ddffdd; color: #000000">+--wrap=fscanf
+--wrap=vfscanf
</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/9e6663d9f1891f63ebf7dda5b7ae5ee3677e9d52">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>