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

[Philip Carns]

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


Commits:
09926b48 by Phil Carns at 2016-05-23T22:51:39-04:00
fputc 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
@@ -49,7 +49,7 @@
  * --------------
  * int      fprintf(FILE *, const char *, ...);             DONE
  * int      vfprintf(FILE *, const char *, va_list);        DONE
- * int      fputc(int, FILE *);
+ * int      fputc(int, FILE *);                             DONE
  * int      fputs(const char *, FILE *);
  * size_t   fwrite(const void *, size_t, size_t, FILE *);   DONE
  * int      putc(int, FILE *);
@@ -102,6 +102,7 @@ DARSHAN_FORWARD_DECL(freopen, FILE*, (const char *path, const char *mode, FILE *
 DARSHAN_FORWARD_DECL(fclose, int, (FILE *fp));
 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(fputc, int, (int c, FILE *stream));
 DARSHAN_FORWARD_DECL(fprintf, int, (FILE *stream, const char *format, ...));
 DARSHAN_FORWARD_DECL(vfprintf, int, (FILE *stream, const char *format, va_list));
 DARSHAN_FORWARD_DECL(fread, size_t, (void *ptr, size_t size, size_t nmemb, FILE *stream));
@@ -419,6 +420,27 @@ size_t DARSHAN_DECL(fwrite)(const void *ptr, size_t size, size_t nmemb, FILE *st
     return(ret);
 }
 
+
+int DARSHAN_DECL(fputc)(int c, FILE *stream)
+{
+    int ret;
+    double tm1, tm2;
+
+    MAP_OR_FAIL(fputc);
+
+    tm1 = darshan_core_wtime();
+    ret = __real_fputc(c, stream);
+    tm2 = darshan_core_wtime();
+
+    STDIO_LOCK();
+    stdio_runtime_initialize();
+    if(ret != EOF)
+        STDIO_RECORD_WRITE(stream, 1, tm1, tm2, 0);
+    STDIO_UNLOCK();
+
+    return(ret);
+}
+
 int DARSHAN_DECL(vfprintf)(FILE *stream, const char *format, va_list ap)
 {
     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
@@ -16,3 +16,4 @@
 --wrap=fseek
 --wrap=fprintf
 --wrap=vfprintf
+--wrap=fputc



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/09926b489c0948895dfb91b7e02b47e016d73a75
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20160523/702d14a3/attachment-0001.html>