[Darshan-commits] [Git][darshan/darshan][dev-stdio] rewind wrapper

[Philip Carns]

Philip Carns pushed to branch dev-stdio at darshan / darshan


Commits:
904b6dbc by Phil Carns at 2016-05-23T23:26:29-04:00
rewind wrapper

- - - - -


2 changed files:

- darshan-runtime/lib/darshan-stdio.c
- darshan-runtime/share/ld-opts/darshan-stdio-ld-opts


Changes:

=====================================
darshan-runtime/lib/darshan-stdio.c
=====================================
--- a/darshan-runtime/lib/darshan-stdio.c
+++ b/darshan-runtime/lib/darshan-stdio.c
@@ -64,7 +64,7 @@
  * int      fseeko64(FILE *, off_t, int);                   DONE
  * int      fsetpos(FILE *, const fpos_t *);                DONE
  * int      fsetpos64(FILE *, const fpos_t *);              DONE
- * void     rewind(FILE *);
+ * void     rewind(FILE *);                                 DONE
  * int      ungetc(int, FILE *);
  *
  * Omissions: _unlocked() variants of the various flush, read, and write
@@ -125,6 +125,7 @@ DARSHAN_FORWARD_DECL(fseeko, int, (FILE *stream, off_t offset, int whence));
 DARSHAN_FORWARD_DECL(fseeko64, int, (FILE *stream, off_t offset, int whence));
 DARSHAN_FORWARD_DECL(fsetpos, int, (FILE *stream, const fpos_t *pos));
 DARSHAN_FORWARD_DECL(fsetpos64, int, (FILE *stream, const fpos_t *pos));
+DARSHAN_FORWARD_DECL(rewind, void, (FILE *stream));
 
 /* The stdio_file_runtime structure maintains necessary runtime metadata
  * for the STDIO file record (darshan_stdio_record structure, defined in
@@ -744,6 +745,33 @@ char* DARSHAN_DECL(fgets)(char *s, int size, FILE *stream)
 }
 
 
+void DARSHAN_DECL(rewind)(FILE *stream)
+{
+    struct stdio_file_runtime* file;
+    double tm1, tm2;
+
+    MAP_OR_FAIL(rewind);
+
+    tm1 = darshan_core_wtime();
+    __real_rewind(stream);
+    tm2 = darshan_core_wtime();
+
+    STDIO_LOCK();
+    stdio_runtime_initialize();
+    file = stdio_file_by_stream(stream);
+    if(file)
+    {
+        file->offset = 0;
+        DARSHAN_TIMER_INC_NO_OVERLAP(
+            file->file_record->fcounters[STDIO_F_META_TIME],
+            tm1, tm2, file->last_meta_end);
+        file->file_record->counters[STDIO_SEEKS] += 1;
+    }
+    STDIO_UNLOCK();
+
+    return;
+}
+
 int DARSHAN_DECL(fseek)(FILE *stream, long offset, int whence)
 {
     int ret;


=====================================
darshan-runtime/share/ld-opts/darshan-stdio-ld-opts
=====================================
--- a/darshan-runtime/share/ld-opts/darshan-stdio-ld-opts
+++ b/darshan-runtime/share/ld-opts/darshan-stdio-ld-opts
@@ -25,3 +25,4 @@
 --wrap=putw
 --wrap=fsetpos
 --wrap=fsetpos64
+--wrap=rewind



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/904b6dbc69b12dcac8a24527a3b8ca8728f5539c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20160523/3cc79a77/attachment.html>