Issue 0020349: compatibility python 2.6 in import_hook

[modules/kernel.git] / src / TestMPIContainer / TestMPIContainer.cxx

diff --git a/src/TestMPIContainer/TestMPIContainer.cxx b/src/TestMPIContainer/TestMPIContainer.cxx
index 3f753af5dfeaa10a04336837486d5b4870a148bb..e3e8c27e43a5d6727439ab2bd7e66e19ecb379a7 100644 (file)
--- a/src/TestMPIContainer/TestMPIContainer.cxx
+++ b/src/TestMPIContainer/TestMPIContainer.cxx
@@ -1,13 +1,33 @@
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 // using namespace std;
 //=============================================================================
 // File      : TestMPIContainer.cxx
 // Created   : mer jui 4 13:11:27 CEST 2003
 // Author    : Bernard SECHER, 2003
 // Project   : SALOME
-// Copyright : CEA 2003
 // $Header$
 //=============================================================================
-
+//
 #include "utilities.h"
 #include <iostream>
 #include <unistd.h>
@@ -16,27 +36,31 @@
 #include CORBA_CLIENT_HEADER(SALOME_MPIContainer)
 #include CORBA_CLIENT_HEADER(SALOME_TestMPIComponent)
 
+#include "Basics_Utils.hxx"
 # include "Utils_ORB_INIT.hxx"
 # include "Utils_SINGLETON.hxx"
 #include "SALOME_NamingService.hxx"
 #include "OpUtil.hxx"
+using namespace std;
 
 int main (int argc, char * argv[])
 {
 
+  // Initializing omniORB
+  ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
+  CORBA::ORB_var &orb = init( argc , argv ) ;
+  //  SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb);
+    
+  BEGIN_OF(argv[0])
   try{
 
     int status;
 
-    MESSAGE("COUCOU");
     if( argc != 3 || strcmp(argv[1],"-np") ){
       cout << "Usage: TestMPIContainer -np nbproc" << endl;
       exit(0);
     }
 
-    // Initializing omniORB
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
-    
     // Obtain a reference to the root POA
     CORBA::Object_var obj = orb->resolve_initial_references("RootPOA") ;
     PortableServer::POA_var poa = PortableServer::POA::_narrow(obj) ;
@@ -44,18 +68,15 @@ int main (int argc, char * argv[])
     // Use Name Service to find container
     SALOME_NamingService NS(orb) ;
     string containerName = "/Containers/" ;
-    string hostName = GetHostname();
+    string hostName = Kernel_Utils::GetHostname();
     containerName += hostName + "/MPIFactoryServer_" + argv[2];
 
-    MESSAGE(containerName);
-
     string dirn(getenv("KERNEL_ROOT_DIR"));
     dirn += "/lib/salome/libSalomeTestMPIComponentEngine.so";
-    MESSAGE(dirn.c_str());
     
     // Try to resolve MPI Container
     obj = NS.Resolve(containerName.c_str()) ;
-    Engines::Container_var iGenFact = Engines::Container::_narrow(obj);
+    Engines::MPIContainer_var iGenFact = Engines::MPIContainer::_narrow(obj);
 
     if(CORBA::is_nil(iGenFact)){
 
@@ -81,41 +102,42 @@ int main (int argc, char * argv[])
       do{
        sleep(1);
        obj = NS.Resolve(containerName.c_str()) ;
-       iGenFact = Engines::Container::_narrow(obj);
+       iGenFact = Engines::MPIContainer::_narrow(obj);
        MESSAGE("Waiting for MPI Container " << containerName << " : it = " << it );
       }while( CORBA::is_nil(iGenFact) && (it++<15) );
 
     }
 
     if(CORBA::is_nil(iGenFact)){
-      MESSAGE("echec recuperation poignee container");
+      MESSAGE("launching container failed");
       exit(1);
     }
 
+
     Engines::TestMPIComponent_var m1;
 
-    for (int iter = 0; iter < 1 ; iter++){
-      MESSAGE("----------------------------------------------------" << iter);   
-      obj = iGenFact->load_impl("TestMPIComponent",dirn.c_str());
+//     for (int iter = 0; iter < 1 ; iter++){
+//       MESSAGE("----------------------------------------------------" << iter);   
+    obj = iGenFact->load_impl("TestMPIComponent",dirn.c_str());
 
-      m1 = Engines::TestMPIComponent::_narrow(obj);
-      if(CORBA::is_nil(m1)){
-       INFOS("echec recuperation poignee composant");
-      }
-      else{
-      
-       INFOS("recup m1");
-       SCRUTE(m1->instanceName());
-       INFOS("Lancement de coucou");
-       m1->Coucou(1L);
-       INFOS("On remove le composant");
-       iGenFact->remove_impl(m1) ;
-       sleep(5);
-      }
+    INFOS("Get Handle on MPI Component");
+    m1 = Engines::TestMPIComponent::_narrow(obj);
+    if(CORBA::is_nil(m1)){
+      INFOS("getting handle on MPI component failed");
+    }
+    else{ 
+      m1->Coucou(1L);
+// //  sleep(5);
+      INFOS("Unload MPI Component");
+      iGenFact->remove_impl(m1) ;
     }
-    // Clean-up.
-    iGenFact->finalize_removal() ;
-    orb->destroy();
+//     }
+//     // Clean-up.
+// //     iGenFact->finalize_removal() ;
+// //     sleep(5);
+    iGenFact->Shutdown();
+//     INFOS("shut down corba server for Test MPI Container");
+//     orb->destroy();
   }
   catch(CORBA::COMM_FAILURE& ex) {
     INFOS("Caught system exception COMM_FAILURE -- unable to contact the object.");
@@ -130,5 +152,7 @@ int main (int argc, char * argv[])
     INFOS("Caught unknown exception.");
   }
 
-  return 0;
+  END_OF(argv[0]);
+  //  delete myThreadTrace;
+  return 0 ;
 }