Move printf and fprintf mpi wrappers to log module

Jackdepac · Oct 15, 2020 · 47c2550 · 47c2550
1 parent e2ec5fc
commit 47c2550
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 58 deletions.
diff --git a/log.cpp b/log.cpp
@@ -8,6 +8,10 @@
 
 #include <cstdarg>
 
+struct SINGLE_FILE {
+    FILE *fp;
+};
+
 static bool started = 0;
 static long start_time;
 static int rank;
@@ -64,3 +68,53 @@ void LOG(const char *fmt, ...) {
     printf("%s", buf);
 }
 
+SINGLE_FILE *single_fopen(const char *path, const char *mode) {
+#ifdef BUILDMPI
+    int rank;
+    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+    if(rank != 0)
+        return nullptr;
+#endif
+    FILE *fp = fopen(path, mode);
+    return new SINGLE_FILE{fp};
+}
+
+int fclose(SINGLE_FILE *stream) {
+#ifdef BUILDMPI
+    int rank;
+    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+    if(rank != 0)
+        return 0;
+#endif
+    int ret = fclose(stream->fp);
+    delete stream;
+    return ret;
+}
+
+int fprintf(SINGLE_FILE *stream, const char *format, ...) {
+#ifdef BUILDMPI
+    int rank;
+    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+    if(rank != 0)
+        return 0;
+#endif
+    va_list ap;
+    va_start(ap, format);
+    int ret = vfprintf(stream->fp, format, ap);
+    va_end(ap);
+    return ret;
+}
+
+int single_printf(const char *fmt, ...) {
+#ifdef BUILDMPI
+    int rank;
+    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+    if(rank != 0)
+        return 0;
+#endif
+    va_list ap;
+    va_start(ap, fmt);
+    int ret = printf(fmt, ap);
+    va_end(ap);
+    return ret;
+}
diff --git a/log.hpp b/log.hpp
@@ -41,3 +41,11 @@ class StopWatch
 int init_logging();
 void LOG(const char *fmt, ...);
 #endif
+
+struct SINGLE_FILE;
+SINGLE_FILE *single_fopen(const char *path, const char *mode);
+int fclose(SINGLE_FILE *stream);
+int fprintf(SINGLE_FILE *stream, const char *format, ...);
+int single_printf(const char *fmt, ...);
+
+
diff --git a/setsm_code.cpp b/setsm_code.cpp
@@ -16,7 +16,6 @@
 
 #include <atomic>
 #include <memory>
-#include <cstdarg>
 
 #include "setsm_code.hpp"
 #include "log.hpp"
@@ -12090,57 +12089,23 @@ double FindNebPts_F_M_IDW(const float *input, const unsigned char *matching_flag
     return result;
 }
 
+
 // Find the interpolated value of a patch given the nominal position and the X and Y offsets 
 // along with the image itself
 
-SINGLE_FILE *single_fopen(const char *path, const char *mode) {
-#ifdef BUILDMPI
-    int rank;
-    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-    if(rank != 0)
-        return nullptr;
-#endif
-    FILE *fp = fopen(path, mode);
-    return new SINGLE_FILE{fp};
-}
 
-int fclose(SINGLE_FILE *stream) {
-#ifdef BUILDMPI
-    int rank;
-    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-    if(rank != 0)
-        return 0;
-#endif
-    int ret = fclose(stream->fp);
-    delete stream;
-    return ret;
-}
 
-int fprintf(SINGLE_FILE *stream, const char *format, ...) {
-#ifdef BUILDMPI
-    int rank;
-    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-    if(rank != 0)
-        return 0;
-#endif
-    va_list ap;
-    va_start(ap, format);
-    int ret = vfprintf(stream->fp, format, ap);
-    va_end(ap);
-    return ret;
-}
 
-int single_printf(const char *fmt, ...) {
-#ifdef BUILDMPI
-    int rank;
-    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-    if(rank != 0)
-        return 0;
-#endif
-    va_list ap;
-    va_start(ap, fmt);
-    int ret = printf(fmt, ap);
-    va_end(ap);
-    return ret;
-}
+
+
+
+
+
+
+
+
+
+
+
+
 
diff --git a/setsm_code.hpp b/setsm_code.hpp
@@ -155,14 +155,4 @@ class TileIndexer {
     virtual ~TileIndexer() {};
 };
 
-struct SINGLE_FILE {
-    FILE *fp;
-};
-
-SINGLE_FILE *single_fopen(const char *path, const char *mode);
-int fclose(SINGLE_FILE *stream);
-int fprintf(SINGLE_FILE *stream, const char *format, ...);
-int single_printf(const char *fmt, ...);
-
-
 #endif // SETSM_CODE_H