Changeset 489 for XIOS/trunk/src/context_server.cpp

Timestamp:

09/22/14 14:17:33 (10 years ago)

Author:

mhnguyen

Message:

Ticket 50: Implementing the getting/setting methods for Fortran interface

+) Add some C and Fortran functions to set and get data to/from CVariable with an id
+) Add method to send, receive and dispatch in CVariable
+) Add dispatch method in server class

Test
-) On Curie
-) Test data: integer, float, double, boolean, string
-) File: one and multiple, using_server: ON and OFF
+) All test cases passed and had correct results

File:

• XIOS/trunk/src/context_server.cpp (modified) (12 diffs)

XIOS/trunk/src/context_server.cpp

@@ -38 +38 @@
     pendingEvent=true ;
   }
-  
+
   bool CContextServer::hasPendingEvent(void)
   {
     return pendingEvent ;
   }
-  
+
   bool CContextServer::eventLoop(void)
   {
@@ -58 +58 @@
     int count ;
     char * addr ;
-    MPI_Status status; 
+    MPI_Status status;
     map<int,CServerBuffer*>::iterator it;
-    
+
     for(rank=0;rank<commSize;rank++)
     {
@@ -66 +66 @@
       {
         traceOff() ;
-        MPI_Iprobe(rank,20,interComm,&flag,&status);     
+        MPI_Iprobe(rank,20,interComm,&flag,&status);
         traceOn() ;
         if (flag==true)
         {
           it=buffers.find(rank) ;
-          if (it==buffers.end()) 
+          if (it==buffers.end())
             it=(buffers.insert(pair<int,CServerBuffer*>(rank,new CServerBuffer))).first ;
           MPI_Get_count(&status,MPI_CHAR,&count) ;
@@ -84 +84 @@
     }
   }
-  
+
   void CContextServer::checkPendingRequest(void)
   {
@@ -94 +94 @@
     int count ;
     MPI_Status status ;
-    
+
     for(it=pendingRequest.begin();it!=pendingRequest.end();it++)
     {
@@ -108 +108 @@
       }
     }
-    
-    for(itRecv=recvRequest.begin();itRecv!=recvRequest.end();itRecv++) 
+
+    for(itRecv=recvRequest.begin();itRecv!=recvRequest.end();itRecv++)
     {
       pendingRequest.erase(*itRecv) ;
@@ -115 +115 @@
     }
   }
-  
+
   void CContextServer::processRequest(int rank, char* buff,int count)
   {
-    
+
     CBufferIn buffer(buff,count) ;
     char* startBuffer,endBuffer ;
@@ -124 +124 @@
     size_t timeLine ;
     map<size_t,CEventServer*>::iterator it ;
-       
+
     while(count>0)
     {
@@ -136 +136 @@
 
       buffer.advance(size) ;
-      count=buffer.remain() ;           
-    } 
-  
-  }
-    
+      count=buffer.remain() ;
+    }
+
+  }
+
   void CContextServer::processEvents(void)
   {
     map<size_t,CEventServer*>::iterator it ;
     CEventServer* event ;
-    
+
     it=events.find(currentTimeLine) ;
-    if (it!=events.end()) 
+    if (it!=events.end())
     {
       event=it->second ;
@@ -162 +162 @@
      }
    }
-       
+
   CContextServer::~CContextServer()
   {
     map<int,CServerBuffer*>::iterator it ;
-    for(it=buffers.begin();it!=buffers.end();++it) delete it->second ; 
-  } 
+    for(it=buffers.begin();it!=buffers.end();++it) delete it->second ;
+  }
 
 
@@ -178 +178 @@
     list<CEventServer::SSubEvent>::iterator it ;
     CContext::setCurrent(context->getId()) ;
-        
+
     if (event.classId==CContext::GetType() && event.type==CContext::EVENT_ID_CONTEXT_FINALIZE)
     {
@@ -198 +198 @@
     else if (event.classId==CFile::GetType()) CFile::dispatchEvent(event) ;
     else if (event.classId==CFileGroup::GetType()) CFileGroup::dispatchEvent(event) ;
+    else if (event.classId==CVariable::GetType()) CVariable::dispatchEvent(event) ;
     else
     {