Changeset 179 for XMLIO_V2/dev/dev_rv/src/xmlio/iface

Timestamp:

04/18/11 17:02:22 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/xmlio/iface/interface.cpp.in (modified) (3 diffs)

XMLIO_V2/dev/dev_rv/src/xmlio/iface/interface.cpp.in

@@ -117 +117 @@
       MAKE_STRING(__filename, _filename, _filename_len)
       CTreeManager::ParseFile(__filename);
-      StdOStringStream oss;
-      oss << StdString("data/def/def_client_pre.")
-          << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
-      CTreeManager::PrintTreeToFile(oss.str());
+      //~ StdOStringStream oss;
+      //~ oss << StdString("data/def/def_client_pre.")
+      //~     << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
+      //~ CTreeManager::PrintTreeToFile(oss.str());
    }
    catch (CException & exc)
@@ -135 +135 @@
       MAKE_STRING(__xmlcontent, _xmlcontent, _xmlcontent_len)
       CTreeManager::ParseString(__xmlcontent);
-      StdOStringStream oss;
-      oss << StdString("data/def/def_client_pre.")
-          << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
-      CTreeManager::PrintTreeToFile(oss.str());
+      //~ StdOStringStream oss;
+      //~ oss << StdString("data/def/def_client_pre.")
+      //~     << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
+      //~ CTreeManager::PrintTreeToFile(oss.str());
    }
    catch (CException & exc)
@@ -245 +245 @@
 }
 
-void xios_dtreatment_start(XPtr const _context, XFileType filetype)
+void xios_dtreatment_start(XPtr const _context, XFileType filetype, MPIComm comm_client_server)
 {
    try
    {
       StdOStringStream oss;
-      oss << StdString("data/def/def_client_next.")
-          << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
-      CTreeManager::PrintTreeToFile(oss.str());
-
-      CDataTreatment dt;
-      dt.createDataOutput<CNc4DataOutput>();
-
-      oss.str("");
+      //~ oss << StdString("data/def/def_client_next.")
+      //~     << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
+      //~ CTreeManager::PrintTreeToFile(oss.str());
+      //~ oss.str("");
+
+      CDataTreatment dt;   
       oss << StdString("data/def/def_client_end.")
           << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
       CTreeManager::PrintTreeToFile(oss.str());
+      
+      if ((comm_client_server != -1))
+      {
+         MPIRequest request = 0;
+         StdOStringStream ostrs;
+         if (CMPIManager::GetCommRank(comm_client_server) == 1)
+         {
+            CTreeManager::ToBinary(ostrs);      
+            CLinearBuffer lbuffer(ostrs.str().size()+13);           
+            lbuffer.appendString(ostrs.str()); 
+            CMPIManager::SendLinearBuffer(comm_client_server, 0, lbuffer, request);
+            CMPIManager::Wait(request);  // Pas encore en mode RPC
+         }
+         else
+         {
+            CTreeManager::DomainsToBinary(ostrs);
+            CLinearBuffer lbuffer(ostrs.str().size()+13);
+            lbuffer.appendString(ostrs.str());
+            CMPIManager::SendLinearBuffer(comm_client_server, 0, lbuffer, request);
+            CMPIManager::Wait(request);  // Pas encore en mode RPC
+         }
+      }
+      else
+      {
+         dt.createDataOutput<CNc4DataOutput>();
+      }      
    }
    catch (CException & exc)