Changeset 489 for XIOS/trunk/src/node

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

Location:

XIOS/trunk/src/node

Files:

• variable.cpp (modified) (4 diffs)
• variable.hpp (modified) (6 diffs)

XIOS/trunk/src/node/variable.cpp

@@ -7 +7 @@
 #include "xmlioserver_spl.hpp"
 #include "type.hpp"
+#include "context.hpp"
+#include "context_client.hpp"
 #include <boost/algorithm/string.hpp>
 
@@ -48 +50 @@
    {
       return (this->content);
+   }
+
+   void CVariable::setContent(const StdString& contentStr)
+   {
+     this->content = contentStr;
    }
 
@@ -61 +68 @@
       oss << "</" << CVariable::GetName() << " >";
       return (oss.str());
-   } 
-   
+   }
+
    CVariable::EVarType CVariable::getVarType(void) const
    {
      EVarType ret ;
-     
+
      if (type.isEmpty()) ret=t_undefined ;
      else
@@ -83 +90 @@
      return ret ;
    }
-       
+
+   /*
+   *\brief Sending value of a variable with its id from client to server
+   *
+   */
+   void CVariable::sendValue()
+   {
+     CContext* context=CContext::getCurrent() ;
+     if (!context->hasServer)
+     {
+       CContextClient* client=context->client ;
+
+       CEventClient event(this->getType(),EVENT_ID_VARIABLE_VALUE) ;
+       if (client->isServerLeader())
+       {
+         CMessage msg ;
+         msg<<this->getId() ;
+         msg<<content ;
+         event.push(client->getServerLeader(),1,msg) ;
+         client->sendEvent(event) ;
+       }
+       else client->sendEvent(event) ;
+    }
+   }
+
+   /*
+   *\brief Receive value of a variable with its id from client to server
+   *
+   */
+   void CVariable::recvValue(CEventServer& event)
+   {
+      CBufferIn* buffer=event.subEvents.begin()->buffer;
+      string id;
+      *buffer>>id ;
+      get(id)->recvValue(*buffer);
+   }
+
+
+   /*
+   *\brief Receive value of a variable with its id from client to server
+   *
+   */
+   void CVariable::recvValue(CBufferIn& buffer)
+   {
+      string str ;
+      buffer>>str;
+      setContent(str);
+   }
+
+   bool CVariable::dispatchEvent(CEventServer& event)
+   {
+    if (SuperClass::dispatchEvent(event)) return true ;
+    else
+    {
+      switch(event.type)
+      {
+        case EVENT_ID_VARIABLE_VALUE :
+          recvValue(event) ;
+          return true ;
+          break ;
+
+        default :
+          ERROR("bool CVariable::dispatchEvent(CEventServer& event)",<<"Unknown Event") ;
+          return false ;
+      }
+    }
+   }
+
 /*
    void CVariable::toBinary(StdOStream & os) const

XIOS/trunk/src/node/variable.hpp

@@ -15 +15 @@
       class CVariableAttributes;
       class CVariable;
-
+      class CContext;
       ///--------------------------------------------------------------
 
@@ -29 +29 @@
          , public CVariableAttributes
       {
+            enum EEventId
+            {
+             EVENT_ID_VARIABLE_VALUE
+            };
+
             /// typedef ///
             typedef CObjectTemplate<CVariable>   SuperClass;
@@ -52 +57 @@
             enum EVarType
             {  t_int, t_short_int, t_long_int, t_float, t_double, t_long_double, t_bool, t_string, t_undefined } ;
-              
-                     
+
+
             /// Autres ///
             virtual void parse(xml::CXMLNode & node);
@@ -60 +65 @@
             /// Accesseur ///
             const StdString & getContent (void) const;
-            
-            
+
+            void setContent(const StdString& content);
+
+
             template <typename T> inline T getData(void) const;
-            
+            template <typename T> inline void setData(T data);
+
             template <typename T, StdSize N>
             inline void getData(CArray<T, N>& _data_array) const;
-            
+
             EVarType getVarType(void) const ;
-            
+
+            static bool dispatchEvent(CEventServer& event) ;
+
+            //! Sending a request to set up variable data
+            void sendValue();
+
+            static void recvValue(CEventServer& event) ;
+            void recvValue(CBufferIn& buffer) ;
+
          public :
-         
+
             /// Accesseurs statiques ///
             static StdString GetName(void);
@@ -85 +101 @@
       inline bool CVariable::getData(void) const
       {
-         if (content.compare("true")==0 || content.compare(".true.")==0 || content.compare(".TRUE.")==0) return true ; 
-         else if (content.compare("false")==0 || content.compare(".false.")==0 || content.compare(".FALSE.")==0) return false ; 
+         if (content.compare("true")==0 || content.compare(".true.")==0 || content.compare(".TRUE.")==0) return true ;
+         else if (content.compare("false")==0 || content.compare(".false.")==0 || content.compare(".FALSE.")==0) return false ;
          else ERROR("CVariable::getdata()",
                << "Cannot convert string <" << content << "> into type required" );
          return false ;
-      } 
-      
+      }
+
       template <typename T>
       inline T CVariable::getData(void) const
       {
          T retval ;
-         std::stringstream sstr(std::stringstream::in | std::stringstream::out); 
+         std::stringstream sstr(std::stringstream::in | std::stringstream::out);
          sstr<<content ;
          sstr>>retval ;
@@ -102 +118 @@
                << "Cannot convert string <" << content << "> into type required" );
          return retval ;
-      } 
+      }
 
+      template<>
+      inline void CVariable::setData(bool data)
+      {
+        if (true == data) content.assign("true");
+        else content.assign("false");
+      }
+
+      template <typename T>
+      inline void CVariable::setData(T data)
+      {
+        std::stringstream sstr;
+        sstr<<data;
+        content = sstr.str();
+      }
 
       ///--------------------------------------------------------------