Changeset 1601 for XIOS/dev/dev_trunk_omp/src/log.hpp

Timestamp:

11/19/18 15:52:54 (5 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

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

XIOS/dev/dev_trunk_omp/src/log.hpp

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