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

Timestamp:

04/01/15 17:52:53 (9 years ago)

Author:

mhnguyen

Message:

Implementing new hash algorithm and fixing bug related to zoom

+) Replace boost hash with hash algorithm of Jenkins
+) Domain, if an attribute is non-empty for one client, it should also be non-empty for others inspite of zoom
+) Replace the way to find the number of client connecting to a server to make sure every server receive a message

Test
+) On Curie
+) test_client: passed and results are same like before
+) test_complete: passed, results are partially the same, the different part comes from added working operation

File:

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

XIOS/trunk/src/node/context.cpp

@@ -220 +220 @@
 }
 
-//   //----------------------------------------------------------------
-//
-//   void CContext::solveFieldRefInheritance(bool apply)
-//   {
-//      if (!this->hasId()) return;
-//      vector<CField*> allField = CField::getAll();
-////              = CObjectTemplate<CField>::GetAllVectobject(this->getId());
-//      std::vector<CField*>::iterator
-//         it = allField.begin(), end = allField.end();
-//
-//      for (; it != end; it++)
-//      {
-//         CField* field = *it;
-//         field->solveRefInheritance(apply);
-//      }
-//   }
-
    //----------------------------------------------------------------
 
@@ -258 +241 @@
      if (hasClient)
      {
-       size_t bufferSizeMin = 1;
+       size_t bufferSizeMin = 10*sizeof(size_t)*1024;
 #define DECLARE_NODE(Name_, name_)    \
    bufferSizeMin = (bufferSizeMin < sizeof(C##Name_##Definition)) ?  sizeof(C##Name_##Definition) : bufferSizeMin;
@@ -264 +247 @@
 #include "node_type.conf"
        std::map<int, StdSize> bufferSize = getDataSize();
+       if (bufferSize.empty())
+       {
+         if (client->isServerLeader())
+         {
+           bufferSize[client->getServerLeader()] = bufferSizeMin;
+         }
+         else
+          return;
+       }
+
        std::map<int, StdSize>::iterator  it = bufferSize.begin(),
                                         ite = bufferSize.end();
@@ -315 +308 @@
    void CContext::closeDefinition(void)
    {
-
+     // There is nothing client need to send to server
      if (hasClient)
      {
        // After xml is parsed, there are some more works with post processing
        postProcessing();
-//
+
        setClientServerBuffer();
      }
@@ -353 +346 @@
 
     // There are some processings that should be done after all of above. For example: check mask or index
-//    if (hasClient && !hasServer)
     if (hasClient)
     {
@@ -361 +353 @@
 
 
-
-//      if (hasClient)
-//      {
-//        //solveCalendar();
-//
-//        // Résolution des héritages pour le context actuel.
-////        this->solveAllInheritance();
-//
-//
-////        //Initialisation du vecteur 'enabledFiles' contenant la liste des fichiers à sortir.
-////        this->findEnabledFiles();
-//
-//        this->processEnabledFiles();
-//
-//        this->solveAllGridRef();
-//      }
-
-
-
-
-//      solveCalendar();
-//
-//      // Résolution des héritages pour le context actuel.
-//      this->solveAllInheritance();
-//
-//      //Initialisation du vecteur 'enabledFiles' contenant la liste des fichiers à sortir.
-//      this->findEnabledFiles();
-//
-//
-//      this->processEnabledFiles();
-
-/*
-      //Recherche des champs à sortir (enable à true + niveau de sortie correct)
-      // pour chaque fichier précédemment listé.
-      this->findAllEnabledFields();
-
-      // Résolution des références de grilles pour chacun des champs.
-      this->solveAllGridRef();
-
-      // Traitement des opérations.
-      this->solveAllOperation();
-
-      // Traitement des expressions.
-      this->solveAllExpression();
-*/
-      // Nettoyage de l'arborescence
-      if (hasClient && !hasServer) CleanTree(); // Only on client side??
-//      if (hasClient) CleanTree();
-      if (hasClient) sendCreateFileHeader();
+    // Nettoyage de l'arborescence
+    if (hasClient && !hasServer) CleanTree(); // Only on client side??
+
+    if (hasClient) sendCreateFileHeader();
    }
 
@@ -509 +456 @@
              return true;
              break;
-           case EVENT_ID_UPDATE_CALENDAR :
+           case EVENT_ID_UPDATE_CALENDAR:
              recvUpdateCalendar(event);
              return true;
@@ -521 +468 @@
              return true;
              break;
+
            default :
              ERROR("bool CContext::dispatchEvent(CEventServer& event)",