Changeset 510 for XIOS/trunk/src/node/context.cpp

Timestamp:

11/13/14 15:09:23 (10 years ago)

Author:

mhnguyen

Message:

Implementing buffer-size automatic detection in mode connected server-client (client is also server)

+) Rearrange some functions to make sure they work in both cases: connected and seperated
+) Make some cleans of code

Test
+) On Curie
+) Both modes, all tests pass

File:

• XIOS/trunk/src/node/context.cpp (modified) (4 diffs)

XIOS/trunk/src/node/context.cpp

@@ -337 +337 @@
    void CContext::closeDefinition(void)
    {
-     if (hasClient && !hasServer)
+     if (hasClient)
      {
        // After xml is parsed, there are some more works with post processing
        postProcessing();
-
+//
        setClientServerBuffer();
+     }
+
+     if (hasClient && !hasServer)
+     {
+       // After xml is parsed, there are some more works with post processing
+//       postProcessing();
+
+//       setClientServerBuffer();
 
       // Send all attributes of current context to server
@@ -368 +376 @@
 
     // There are some processings that should be done after all of above. For example: check mask or index
-    if (hasClient && !hasServer)
+//    if (hasClient && !hasServer)
+    if (hasClient)
     {
       this->solveAllRefOfEnabledFields(true);
       this->buildAllExpressionOfEnabledFields();
     }
+
+
 
 //      if (hasClient)
@@ -482 +493 @@
       const vector<CFile*> allFiles=CFile::getAll() ;
 
-     if (hasClient && !hasServer)
-      for (unsigned int i = 0; i < allFiles.size(); i++)
-         allFiles[i]->solveFieldRefInheritance(apply);
+     //if (hasClient && !hasServer)
+      if (hasClient)
+        for (unsigned int i = 0; i < allFiles.size(); i++)
+          allFiles[i]->solveFieldRefInheritance(apply);
    }
 
@@ -686 +698 @@
      if (isPostProcessed) return;
 
-     this->solveCalendar();
-
      // Solve calendar for both side: client and server
       this->solveCalendar();