Changeset 1158 for XIOS/dev/dev_olga/src/server.cpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/server.cpp (modified) (9 diffs)

XIOS/dev/dev_olga/src/server.cpp

@@ -298 +298 @@
     void CServer::finalize(void)
     {
-
       CTimer::get("XIOS").suspend() ;
      
@@ -328 +327 @@
       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  ;
+      report(100)<<CTimer::getAllCumulatedTime()<<endl ;
     }
 
@@ -352 +352 @@
          if (finished && contextList.empty()) stop=true ;
          eventScheduler->checkEvent() ;
-
        }
        CTimer::get("XIOS server").suspend() ;
@@ -422 +421 @@
        MPI_Status status ;
        int flag ;
-       static void* buffer ;
+       static char* buffer ;
        static MPI_Request request ;
        static bool recept=false ;
@@ -438 +437 @@
            MPI_Get_count(&status,MPI_CHAR,&count) ;
            buffer=new char[count] ;
-           MPI_Irecv(buffer,count,MPI_CHAR,rank,1,CXios::globalComm,&request) ;
+           MPI_Irecv((void*)buffer,count,MPI_CHAR,rank,1,CXios::globalComm,&request) ;
            recept=true ;
          }
@@ -451 +450 @@
            rank=status.MPI_SOURCE ;
            MPI_Get_count(&status,MPI_CHAR,&count) ;
-           recvContextMessage(buffer,count) ;
-           delete [] buffer;
+           recvContextMessage((void*)buffer,count) ;
+           delete [] buffer ;
            recept=false ;
          }
@@ -540 +539 @@
            MPI_Get_count(&status,MPI_CHAR,&count) ;
            buffer=new char[count] ;
-           MPI_Irecv(buffer,count,MPI_CHAR,root,2,intraComm,&request) ;
+           MPI_Irecv((void*)buffer,count,MPI_CHAR,root,2,intraComm,&request) ;
            recept=true ;
          }
@@ -552 +551 @@
            MPI_Get_count(&status,MPI_CHAR,&count) ;
            eventScheduler->registerEvent(nbContexts,hashId);
-//           registerContext(buffer,count) ;
+//           registerContext((void*)buffer,count) ;
 //           delete [] buffer ;
            recept=false ;
@@ -685 +684 @@
       id = getRank();
 
-//      if (!CXios::usingServer2)
-//        id = getRank();
-//      else
-//      {
-//        if (serverLevel == 1)
-//          id = rank_;
-//        else
-//          id = poolId;
-//      }
       fileNameClient << fileName << "_" << std::setfill('0') << std::setw(numDigit) << id << ext;
       fb->open(fileNameClient.str().c_str(), std::ios::out);