Changeset 490 for XIOS/trunk/src/client.cpp

Timestamp:

09/26/14 14:52:04 (10 years ago)

Author:

mhnguyen

Message:

Implementing print output in seperate files

+) Add an option to write information into standard output or into files,
each of which is created by a process
+) Add a new file for global data (constant, value macro, etc)
+) Do a minor change in how to generate doxygen

Test
+) On Curie, with two modes: only client (connected) and client-server
+) All tests passed, each client prints out its info in a seperate file

File:

• XIOS/trunk/src/client.cpp (modified) (15 diffs)

XIOS/trunk/src/client.cpp

@@ +1 @@
+#include "globalScopeData.hpp"
 #include "xmlioserver_spl.hpp"
 #include "cxios.hpp"
@@ -12 +13 @@
 
 namespace xios
-{                      
+{
 
     MPI_Comm CClient::intraComm ;
@@ -18 +19 @@
     int CClient::serverLeader ;
     bool CClient::is_MPI_Initialized ;
-    
-    
+    int CClient::rank = INVALID_RANK;
+    StdOFStream CClient::m_infoStream;
+
     void CClient::initialize(const string& codeId,MPI_Comm& localComm,MPI_Comm& returnComm)
     {
@@ -26 +28 @@
       if (initialized) is_MPI_Initialized=true ;
       else is_MPI_Initialized=false ;
-      
+
 // don't use OASIS
       if (!CXios::usingOasis)
@@ -33 +35 @@
         if (localComm == MPI_COMM_NULL)
         {
-          if (!is_MPI_Initialized) 
+          if (!is_MPI_Initialized)
           {
             int argc=0;
@@ -41 +43 @@
           CTimer::get("XIOS").resume() ;
           CTimer::get("XIOS init").resume() ;
-          boost::hash<string> hashString ;    
-    
+          boost::hash<string> hashString ;
+
           unsigned long hashClient=hashString(codeId) ;
           unsigned long hashServer=hashString(CXios::xiosCodeId) ;
           unsigned long* hashAll ;
-          int rank ;
           int size ;
           int myColor ;
           int i,c ;
           MPI_Comm newComm ;
-      
+
           MPI_Comm_size(CXios::globalComm,&size) ;
           MPI_Comm_rank(CXios::globalComm,&rank);
+
           hashAll=new unsigned long[size] ;
-     
+
           MPI_Allgather(&hashClient,1,MPI_LONG,hashAll,1,MPI_LONG,CXios::globalComm) ;
 
           map<unsigned long, int> colors ;
           map<unsigned long, int> leaders ;
-      
+
           for(i=0,c=0;i<size;i++)
           {
@@ -70 +72 @@
             }
           }
-     
+
           myColor=colors[hashClient] ;
-      
+
           MPI_Comm_split(CXios::globalComm,myColor,rank,&intraComm) ;
 
           if (CXios::usingServer)
-          {     
+          {
             int clientLeader=leaders[hashClient] ;
             serverLeader=leaders[hashServer] ;
@@ -88 +90 @@
         }
         // localComm argument is given
-        else 
+        else
         {
           if (CXios::usingServer)
-          {          
+          {
             //ERROR("void CClient::initialize(const string& codeId,MPI_Comm& localComm,MPI_Comm& returnComm)", << " giving a local communictor is not compatible with using server mode") ;
           }
@@ -113 +115 @@
         CTimer::get("XIOS").resume() ;
         CTimer::get("XIOS init").resume() ;
-  
-        if (CXios::usingServer) 
+
+        if (CXios::usingServer)
         {
           MPI_Status status ;
-          int rank ;
-          MPI_Comm_rank(intraComm,&rank) ;
-
+            MPI_Comm_rank(intraComm,&rank) ;
           oasis_get_intercomm(interComm,CXios::xiosCodeId) ;
           if (rank==0) MPI_Recv(&serverLeader,1, MPI_INT, 0, 0, interComm, &status) ;
           MPI_Bcast(&serverLeader,1,MPI_INT,0,intraComm) ;
-           
+
         }
         else MPI_Comm_dup(intraComm,&interComm) ;
       }
-          
+
       MPI_Comm_dup(intraComm,&returnComm) ;
     }
-    
-    
+
+
     void CClient::registerContext(const string& id,MPI_Comm contextComm)
     {
       CContext::setCurrent(id) ;
       CContext* context=CContext::create(id) ;
-        
+
       if (!CXios::isServer)
       {
@@ -143 +143 @@
         int leaderRank ;
         MPI_Comm contextInterComm ;
-      
+
         MPI_Comm_size(contextComm,&size) ;
         MPI_Comm_rank(contextComm,&rank) ;
         MPI_Comm_rank(CXios::globalComm,&globalRank) ;
         if (rank!=0) globalRank=0 ;
-      
-    
+
+
         CMessage msg ;
         msg<<id<<size<<globalRank ;
@@ -157 +157 @@
         CBufferOut buffer(buff,messageSize) ;
         buffer<<msg ;
-      
+
         MPI_Send(buff,buffer.count(),MPI_CHAR,serverLeader,1,CXios::globalComm) ;
         delete [] buff ;
-      
+
         MPI_Intercomm_create(contextComm,0,CXios::globalComm,serverLeader,10+globalRank,&contextInterComm) ;
         info(10)<<"Register new Context : "<<id<<endl ;
- 
+
         MPI_Comm inter ;
         MPI_Intercomm_merge(contextInterComm,0,&inter) ;
@@ -178 +178 @@
       }
     }
-    
+
     void CClient::finalize(void)
     {
@@ -185 +185 @@
       if (!CXios::isServer)
       {
-        MPI_Comm_rank(intraComm,&rank) ;  
-        if (rank==0) 
+        MPI_Comm_rank(intraComm,&rank) ;
+        if (rank==0)
         {
           MPI_Send(&msg,1,MPI_INT,0,0,interComm) ;
         }
       }
-      
+
      CTimer::get("XIOS finalize").suspend() ;
      CTimer::get("XIOS").suspend() ;
@@ -201 +201 @@
       }
       info(20) << "Client side context is finalized"<<endl ;
-      report(0) <<" Performance report : total time spent for XIOS : "<< CTimer::get("XIOS").getCumulatedTime()<<" s"<<endl ; 
+      report(0) <<" Performance report : total time spent for XIOS : "<< CTimer::get("XIOS").getCumulatedTime()<<" s"<<endl ;
       report(0)<< " Performance report : time spent for waiting free buffer : "<< CTimer::get("Blocking time").getCumulatedTime()<<" s"<<endl ;
       report(0)<< " Performance report : Ratio : "<< CTimer::get("Blocking time").getCumulatedTime()/CTimer::get("XIOS").getCumulatedTime()*100.<<" %"<<endl ;
@@ -209 +209 @@
       report(0)<< " Memory report : increasing it by a factor will increase performance, depending of the volume of data wrote in file at each time step of the file"<<endl ;
    }
+
+   int CClient::getRank()
+   {
+     return rank;
+   }
+
+     /*!
+      * \brief Open file stream to write in
+      *   Opening a file stream with a specific file name suffix-client+rank
+      * \param [in] protype file name
+     */
+     void CClient::openInfoStream(const StdString& fileName)
+     {
+       std::filebuf* fb = m_infoStream.rdbuf();
+       StdStringStream fileNameClient;
+       fileNameClient << fileName <<"_client_" << getRank() << ".txt";
+       fb->open(fileNameClient.str().c_str(), std::ios::out);
+       if (!fb->is_open())
+       ERROR("void CClient::openInfoStream(const StdString& fileName)",
+            <<endl<< "Can not open <"<<fileNameClient<<"> file to write" );
+
+       info.write2File(fb);
+     }
+
+     //! Write out to standard output
+     void CClient::openInfoStream()
+     {
+       info.write2StdOut();
+     }
+
+     //! Close file if it opens
+     void CClient::closeInfoStream()
+     {
+       if (m_infoStream.is_open()) m_infoStream.close();
+     }
+
+
 }