Changeset 347 for XIOS/trunk/src/server.cpp

Timestamp:

05/21/12 17:57:22 (12 years ago)

Author:

ymipsl

Message:

• Supress lot of shared_ptr
• instrument code for vampir-trace and timer diagnostic

YM

File:

• XIOS/trunk/src/server.cpp (modified) (10 diffs)

XIOS/trunk/src/server.cpp

@@ -5 +5 @@
 #include "context.hpp"
 #include "object_template_impl.hpp"
-#include "tree_manager.hpp"
 #include "oasis_cinterface.hpp"
 #include <boost/functional/hash.hpp>
 #include <boost/algorithm/string.hpp>
 #include <mpi.h>
+#include "tracer.hpp"
+#include "timer.hpp"
 
 namespace xios
@@ -132 +133 @@
         else MPI_Finalize() ;
       }
+      report(0)<<"Performance report : Time spent for XIOS : "<<CTimer::get("XIOS server").getCumulatedTime()<<endl  ;
+      report(0)<<"Performance report : Time spent in processing events : "<<CTimer::get("Process events").getCumulatedTime()<<endl  ;
+      report(0)<<"Performance report : Ratio : "<<CTimer::get("Process events").getCumulatedTime()/CTimer::get("XIOS server").getCumulatedTime()*100.<<"%"<<endl  ;
     }
     
@@ -138 +142 @@
        bool stop=false ;
        
+       CTimer::get("XIOS server").resume() ;
        while(!stop)
        {
@@ -154 +159 @@
          if (finished && contextList.empty()) stop=true ;
        }
-     
+       CTimer::get("XIOS server").suspend() ;
      }
      
@@ -166 +171 @@
         {
            MPI_Status status ;
+           traceOff() ;
            MPI_Iprobe(0,0,*it,&flag,&status) ;
+           traceOn() ;
            if (flag==true)
            {
@@ -199 +206 @@
         int msg ;
         
+        traceOff() ;
         MPI_Iprobe(0,4,intraComm, &flag, &status) ;
+        traceOn() ;
         if (flag==true)
         {
@@ -220 +229 @@
        if (recept==false)
        {
+         traceOff() ;
          MPI_Iprobe(MPI_ANY_SOURCE,1,CXios::globalComm, &flag, &status) ;
+         traceOn() ;
          if (flag==true) 
          {
@@ -232 +243 @@
        else
        {
+         traceOff() ;
          MPI_Test(&request,&flag,&status) ;
+         traceOn() ;
          if (flag==true)
          {
@@ -304 +317 @@
        if (recept==false)
        {
+         traceOff() ;
          MPI_Iprobe(root,2,intraComm, &flag, &status) ;
+         traceOn() ;
          if (flag==true) 
          {
@@ -346 +361 @@
               <<"Context has already been registred") ;
       
-      shared_ptr<CContext> context=CContext::create(contextId) ;
-      contextList[contextId]=context.get() ;
+      CContext* context=CContext::create(contextId) ;
+      contextList[contextId]=context ;
       context->initServer(intraComm,contextIntercomm) ;