Changeset 1642 for XIOS/dev/branch_openmp/src/log.hpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/src/log.hpp (modified) (4 diffs)

XIOS/dev/branch_openmp/src/log.hpp

@@ -5 +5 @@
 #include <iostream>
 #include <string>
-#include <stdio.h>
-#include <omp.h>
 
 namespace xios
@@ -16 +14 @@
     public :
     CLog(const string& name_, std::streambuf* sBuff = cout.rdbuf())
-      : ostream(sBuff), level(0), name(name_), strBuf_(sBuff) 
+      : ostream(sBuff), level(0), name(name_), strBuf_(sBuff) {}
+    CLog& operator()(int l)
     {
-      omp_init_lock( &mutex );
-      for(int i=0; i<16; i++)
-        strBuf_array[i] = sBuff;
+      if (l<=level)
+      {
+        rdbuf(strBuf_);
+        *this<<"-> "<<name<<" : " ;
+      }
+      else rdbuf(NULL) ;
+      return *this;
     }
-
-    ~CLog()
-    {
-      omp_destroy_lock( &mutex );
-    }
-
-    CLog& operator()(int l);
     void setLevel(int l) {level=l; }
     int getLevel() {return level ;}
@@ -50 +46 @@
      * \param [in] pointer to new streambuf
     */
-    void changeStreamBuff(std::streambuf* sBuff) 
-    { 
-      strBuf_ = sBuff; 
-      strBuf_array[omp_get_thread_num()] = sBuff;
-      rdbuf(sBuff);
-    }
+    void changeStreamBuff(std::streambuf* sBuff) { strBuf_ = sBuff; rdbuf(sBuff); }
 
     int level ;
     string name ;
     std::streambuf* strBuf_;
-    std::streambuf* strBuf_array[16];
-    omp_lock_t mutex;
   };
 
@@ -67 +56 @@
   extern CLog report;
   extern CLog error;
-
-  extern std::filebuf* info_FB[16];
 }
 #endif