This commit was generated by cvs2git to create tag 'V1_4_0'.

author admin <salome-admin@opencascade.com>

Mon, 22 Mar 2004 07:28:15 +0000 (07:28 +0000)

committer admin <salome-admin@opencascade.com>

Mon, 22 Mar 2004 07:28:15 +0000 (07:28 +0000)
author admin <salome-admin@opencascade.com>
Mon, 22 Mar 2004 07:28:15 +0000 (07:28 +0000)
committer admin <salome-admin@opencascade.com>
Mon, 22 Mar 2004 07:28:15 +0000 (07:28 +0000)
diff --git a/src/MPILifeCycleCORBA/MPILifeCycleCORBA.py b/src/MPILifeCycleCORBA/MPILifeCycleCORBA.py

deleted file mode 100644 (file)

index eb255d8..0000000
--- a/src/MPILifeCycleCORBA/MPILifeCycleCORBA.py
+++ /dev/null
@@ -1,142 +0,0 @@
-#==============================================================================
-#  File      : MPILifeCycleCORBA.py
-#  Created   : ven may 30 08:42:01 CEST 2003
-#  Author    : Bernard SECHER, CEA
-#  Project   : SALOME
-#  Copyright : CEA 2003
-#  $Header$
-#==============================================================================
-
-from LifeCycleCORBA import *
-
-class MPILifeCycleCORBA(LifeCycleCORBA):
-    #-------------------------------------------------------------------------
-
-    def __init__(self, orb):
-        MESSAGE( "MPILifeCycleCORBA::__init__" )
-        LifeCycleCORBA.__init__(self, orb)
-
-    #-------------------------------------------------------------------------
-
-    def FindOrStartMPIContainer(self, theComputer , theMPIContainerRoot, nbproc ):
-        theMPIContainer = theMPIContainerRoot + "_" + str(nbproc)
-        MESSAGE( "FindOrStartMPIContainer" + theComputer + theMPIContainer )
-        aMPIContainer = self.FindContainer( theComputer + "/" + theMPIContainer )
-        if aMPIContainer is None :
-            if (theMPIContainerRoot == "MPIFactoryServer") | (theMPIContainerRoot == "MPIFactoryServerPy") :
-                if theComputer == os.getenv("HOSTNAME") :
-                    rshstr = ""
-                else :
-                    rshstr = "rsh -n " + theComputer + " "
-                path = self.ComputerPath( theComputer )
-##                if path != "" :
-##                    rshstr = rshstr + path + "/../bin/salome/"
-##                else :
-##                    rshstr = rshstr + os.getenv( "KERNEL_ROOT_DIR" ) + "/bin/"
-#                    rshstr = rshstr + os.getenv( "PWD" ) + "/"
-                if theMPIContainerRoot == "MPIFactoryServer" :
-                    rshstr = rshstr + "mpirun -np " + str(nbproc) + " " + path + "SALOME_MPIContainer "
-                else :
-                    rshstr = rshstr + path + "SALOME_MPIContainerPy.py '"
-                rshstr = rshstr + theMPIContainer + " -"
-                omniORBcfg = os.getenv( "OMNIORB_CONFIG" )
-#                omniORBcfg = os.getenv( "HOME" ) + "/.omniORB.cfg"
-                file = os.open( omniORBcfg , os.O_RDONLY )
-                ORBInitRef = os.read(file,132)
-                if ORBInitRef[len(ORBInitRef)-1] == '\n' :
-                    ORBInitRef,bsn = ORBInitRef.split('\n')
-                os.close( file )
-                rshstr = rshstr + ORBInitRef
-                if theMPIContainerRoot == "MPIFactoryServerPy" :
-                    rshstr = rshstr + "'"
-                rshstr = rshstr + " > /tmp/" + theMPIContainer + "_"
-                rshstr = rshstr + theComputer
-                rshstr = rshstr + ".log 2>&1 &"
-                os.system( rshstr )
-                MESSAGE( "FindOrStartMPIContainer" + rshstr + " done" )
-            else :
-                if theMPIContainer.find('Py') == -1 :
-                    aMPIContainer = self.FindContainer( theComputer + "/" + "MPIFactoryServer_" + str(nbproc) )
-                else :
-                    aMPIContainer = self.FindContainer( theComputer + "/" + "MPIFactoryServerPy_" + str(nbproc) )
-                aMPIContainer = aMPIContainer.start_impl( theMPIContainer )
-
-            count = 21
-            while aMPIContainer is None :
-                time.sleep(1)
-                count = count - 1
-                MESSAGE( str(count) + ". Waiting for " + theComputer + "/" + theMPIContainer )
-                aMPIContainer = self.FindContainer( theComputer + "/" + theMPIContainer )
-                if count == 0 :
-                    return aMPIContainer
-            
-        return  aMPIContainer       
-        #os.system("rsh -n dm2s0017 /export/home/SALOME_ROOT/bin/runSession SALOME_Container -ORBInitRef NameService=corbaname::dm2s0017:1515")
-
-    #-------------------------------------------------------------------------
-
-    def FindOrLoadMPIComponent(self, MPIcontainerName, MPIcomponentName, nbproc):
-
-        theComputer,theMPIContainerRoot = self.ContainerName( MPIcontainerName )
-        theMPIContainer = theMPIContainerRoot + "_" + str(nbproc)
-        name = [CosNaming.NameComponent(theComputer,"dir"),
-                CosNaming.NameComponent(theMPIContainer,"dir"),
-                CosNaming.NameComponent(MPIcomponentName,"object")]
-        try:
-            obj = self._containerRootContext.resolve(name)
-        except CosNaming.NamingContext.NotFound, ex:
-            MESSAGE( "component " + MPIcomponentName + " not found, trying to load" )
-            MPIcontainer = self.FindContainer(theComputer + "/" + theMPIContainer)
-            if MPIcontainer is None:
-                MESSAGE( "MPIcontainer " + theComputer + "/" + theMPIContainer + " not found in Naming Service, trying to start" )
-                if (theMPIContainerRoot != "MPIFactoryServer") & (theMPIContainerRoot != "MPIFactoryServerPy") :
-                    if theMPIContainer.find('Py') == -1 :
-                        theMPIFactorycontainerRoot = "MPIFactoryServer"
-                        theMPIFactorycontainer = theMPIFactorycontainerRoot + "_" + str(nbproc)
-                    else :
-                        theMPIFactorycontainerRoot = "MPIFactoryServerPy"
-                        theMPIFactorycontainer = theMPIFactorycontainerRoot + "_" + str(nbproc)
-                    MPIFactorycontainer = self.FindContainer(theComputer + "/" + theMPIFactorycontainer)
-                    if MPIFactorycontainer is None:
-                        MESSAGE( "MPIcontainer " + theComputer + "/" + theMPIFactorycontainer + " not found in Naming Service, trying to start" )
-                        MPIFactorycontainer = self.FindOrStartMPIContainer(theComputer,theMPIFactorycontainerRoot,nbproc)
-                else:
-                    MPIFactorycontainer = self.FindOrStartMPIContainer(theComputer,theMPIContainerRoot,nbproc)
-                if MPIFactorycontainer != None :
-                    MPIcontainer = self.FindOrStartMPIContainer(theComputer,theMPIContainerRoot,nbproc)
-
-            if MPIcontainer != None:
-                compoinfo = self._catalog.GetComponent(MPIcomponentName)
-                if compoinfo is None:
-                    MESSAGE( "MPIcomponent " + MPIcomponentName + " not found in Module Catalog" )
-                else:
-                    try:
-                        machineName = theComputer
-                        path = compoinfo.GetPathPrefix(machineName) + "/"
-                    except SALOME_ModuleCatalog.NotFound, ex:
-                        MESSAGE( "machine " + machineName + " not found in Module Catalog" )
-                        MESSAGE( "trying localhost" )
-                        try:
-                            path = compoinfo.GetPathPrefix("localhost") + "/"
-                        except SALOME_ModuleCatalog.NotFound, ex:
-                            path = ""
-                    implementation = path + "lib" + MPIcomponentName + "Engine.so"
-                    MESSAGE( "Trying to load " + implementation )
-                    try:
-                        MPIcomponent = MPIcontainer.load_impl(MPIcomponentName, implementation)
-                        MESSAGE( "component " + MPIcomponent._get_instanceName() + " launched !" )
-                        return MPIcomponent
-                    except:
-                        MESSAGE( "component " + MPIcomponentName + " NOT launched !" )
-
-        else:
-            try:
-                MPIcomponent = obj._narrow(Engines.Component)
-                if MPIcomponent is None:
-                    MESSAGE( MPIcomponentName + " is not a component !" )
-                else:
-                    MESSAGE( "MPIcomponent " + MPIcomponent._get_instanceName() + " found !" )
-                return MPIcomponent
-            except:
-                MESSAGE( MPIcomponentName + " failure" )
-                return None
diff --git a/src/MPILifeCycleCORBA/MPIsalome.py b/src/MPILifeCycleCORBA/MPIsalome.py

deleted file mode 100644 (file)

index 789641f..0000000
--- a/src/MPILifeCycleCORBA/MPIsalome.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import salome
-from MPILifeCycleCORBA import *
-
-# create an LifeCycleCORBA instance
-lcc = MPILifeCycleCORBA(salome.orb)
diff --git a/src/MPILifeCycleCORBA/Makefile.in b/src/MPILifeCycleCORBA/Makefile.in

deleted file mode 100644 (file)

index ab76b03..0000000
--- a/src/MPILifeCycleCORBA/Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#==============================================================================
-#  File      : Makefile.in
-#  Created   : lun jui  2 20:32:24 CEST 2001
-#  Author    : Paul RASCLE, EDF - Marc Tajchman, CEA
-#  Project   : SALOME
-#  Copyright : EDF 2001
-#  $Header$
-#==============================================================================
-
-# source path
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
-
-
-@COMMENCE@
-
-EXPORT_HEADERS = SALOME_MPILifeCycleCORBA.hxx
-
-EXPORT_PYSCRIPTS = MPIsalome.py MPILifeCycleCORBA.py
-
-# Libraries targets
-
-LIB = libSalomeMPILifeCycleCORBA.la
-LIB_SRC = SALOME_MPILifeCycleCORBA.cxx
-LIB_CLIENT_IDL = SALOME_MPIObject.idl SALOME_MPIContainer.idl \
-                 SALOME_Component.idl SALOME_ModuleCatalog.idl
-
-# Executables targets
-BIN = TestMPILifeCycleCORBA
-BIN_SRC =
-BIN_CLIENT_IDL = Logger.idl SALOME_MPIObject.idl SALOME_MPIContainer.idl SALOME_TestMPIComponent.idl
-
-LDFLAGS += -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace
-
-@CONCLUDE@
-
diff --git a/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx b/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx

deleted file mode 100644 (file)

index cfa9f4c..0000000
--- a/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx
+++ /dev/null
@@ -1,357 +0,0 @@
-//=============================================================================
-// File      : SALOME_MPILifeCycleCORBA.cxx
-// Created   : mar jui 03 14:55:50 CEST 2003
-// Author    : Bernard SECHER CEA
-// Project   : SALOME
-// Copyright : CEA 2003
-// $Header$
-//=============================================================================
-
-#include <iostream>
-#include <fstream>
-#include <strstream>
-#include <iomanip>
-#include <stdio.h>
-#include <string.h>
-
-#include "OpUtil.hxx"
-#include "utilities.h"
-
-#include <ServiceUnreachable.hxx>
-
-#include "SALOME_MPILifeCycleCORBA.hxx"
-#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
-#include "SALOME_NamingService.hxx"
-using namespace std;
-
-SALOME_MPILifeCycleCORBA::SALOME_MPILifeCycleCORBA() : 
-  SALOME_LifeCycleCORBA()
-{
-  _MPIFactoryServer = NULL;
-}
-
-SALOME_MPILifeCycleCORBA::SALOME_MPILifeCycleCORBA(SALOME_NamingService *ns) :
-  SALOME_LifeCycleCORBA(ns)
-{
-  _MPIFactoryServer = NULL;
-}
-
-SALOME_MPILifeCycleCORBA::~SALOME_MPILifeCycleCORBA()
-{
-}
-
-Engines::MPIContainer_var SALOME_MPILifeCycleCORBA::FindOrStartMPIContainer(
-                                              const string theComputer ,
-                                              const string theMPIContainerRoot,
-                                             const int nbproc)
-{
-  char nbp[1024];
-
-  sprintf(nbp,"_%d",nbproc);
-  string theMPIContainer = theMPIContainerRoot + nbp; 
-  string aComputerContainer = theComputer + "/" + theMPIContainer;
-
-  SCRUTE( aComputerContainer ) ;
-  SCRUTE( theComputer ) ;
-  SCRUTE( theMPIContainer ) ;
-
-  // On recherche si le containe rest deja lance
-  Engines::MPIContainer_var aMPIContainer = Engines::MPIContainer::_narrow(FindContainer(aComputerContainer.c_str()));
-
-  //On a trouve le container: on renvoie une poigne dessus
-  if ( !CORBA::is_nil( aMPIContainer ) ) {
-    MESSAGE("MPIContainer " << aComputerContainer << " found!!!");
-    return aMPIContainer ;
-  }
-  // On a pas trouve le container
-  else {
-    MESSAGE("MPIContainer " << aComputerContainer << " not found!!!");
-    // On recherche un container generique
-    bool pyCont = false ;
-    int len = theMPIContainer.length() ;
-    if ( !strcmp( &theMPIContainerRoot.c_str()[len-2] , "Py" ) ) {
-      pyCont = true ;
-    }
-    string MPIFactoryServer = theComputer ;
-    if ( pyCont ) {
-      MPIFactoryServer += "/MPIFactoryServerPy" ;
-    }
-    else {
-      MPIFactoryServer += "/MPIFactoryServer" ;
-    }
-    MPIFactoryServer += nbp;
-    Engines::MPIContainer_var aMPIFactoryServer = Engines::MPIContainer::_narrow(FindContainer( MPIFactoryServer.c_str()));
-
-    // On n'a pas trouve le container generique: on lance le container demande
-    if ( CORBA::is_nil( aMPIFactoryServer ) ) {
-// rsh -n ikkyo /export/home/rahuel/SALOME_ROOT/bin/runSession SALOME_Container -ORBInitRef NameService=corbaname::dm2s0017:1515 &
-      string rsh( "" ) ;
-      if ( theComputer!= GetHostname() ) {
-        rsh += "rsh -n " ;
-        rsh += theComputer ;
-        rsh += " " ;
-      }
-      string path = ComputerPath( theComputer.c_str() ) ;
-      SCRUTE( path ) ;
-      //      rsh += "runSession " ;
-      if ( pyCont ) {
-       MESSAGE("MPI python container not implemented");
-       return Engines::MPIContainer::_nil();
-//         rsh += "SALOME_MPIContainerPy.py " ;
-//         rsh += "MPIFactoryServerPy -" ;
-      }
-      else {
-       sprintf(nbp,"mpirun -np %d %sSALOME_MPIContainer ",nbproc,path.c_str());
-        rsh += nbp;
-        rsh += theMPIContainer +" -" ;
-      }
-      string omniORBcfg( getenv( "OMNIORB_CONFIG" ) ) ;
-      ifstream omniORBfile( omniORBcfg.c_str() ) ;
-      char ORBInitRef[12] ;
-      char nameservice[132] ;
-      omniORBfile >> ORBInitRef ;
-      rsh += ORBInitRef ;
-      rsh += " " ;
-      omniORBfile >> nameservice ;
-      omniORBfile.close() ;
-      char * bsn = strchr( nameservice , '\n' ) ;
-      if ( bsn ) {
-        bsn[ 0 ] = '\0' ;
-      }
-      rsh += nameservice ;
-      if ( pyCont ) {
-        rsh += " > /tmp/MPIFactoryServerPy_" ;
-      }
-      else {
-        rsh += " > /tmp/MPIFactoryServer_" ;
-      }
-      sprintf(nbp,"%d_",nbproc);
-      rsh += nbp;
-      rsh += theComputer ;
-      rsh += ".log 2>&1 &" ;
-      SCRUTE( rsh );
-      int status = system( rsh.c_str() ) ;
-      if (status == -1) {
-        INFOS("SALOME_MPILifeCycleCORBA::FindOrStartMPIContainer rsh failed (system command status -1)") ;
-      }
-      else if (status == 217) {
-        INFOS("SALOME_MPILifeCycleCORBA::FindOrStartContainer rsh failed (system command status 217)") ;
-      }
-      else {
-        int count = 21 ;
-        while ( CORBA::is_nil( aMPIFactoryServer ) && count ) {
-          sleep( 1 ) ;
-          count-- ;
-          if ( count != 10 )
-            MESSAGE( count << ". Waiting for FactoryServer on " << theComputer)
-          aMPIFactoryServer = Engines::MPIContainer::_narrow(FindContainer( MPIFactoryServer.c_str()));
-       }
-        if ( CORBA::is_nil( aMPIFactoryServer ) ) {
-          INFOS("SALOME_MPILifeCycleCORBA::FindOrStartMPIContainer rsh failed") ;
-       }
-        else if ( strcmp( theComputer.c_str() , GetHostname().c_str() ) ) {
-          _MPIFactoryServer = aMPIFactoryServer ;
-       }
-      }
-    }
-    // On a trouve le container generique distant: on se sert de lui
-    // pour lancer un nouveau container MPI
-    // a revoir...
-    if ( !CORBA::is_nil( aMPIFactoryServer ) ) {
-      if ( strcmp( theMPIContainer.c_str() , "MPIFactoryServer" ) ||
-           strcmp( theMPIContainer.c_str() , "MPIFactoryServerPy" ) ) {
-        MESSAGE("MPI Container not found ! trying to start " << aComputerContainer);
-        Engines::MPIContainer_var myMPIContainer = aMPIFactoryServer->start_MPIimpl( theMPIContainer.c_str(), nbproc ) ;
-        if ( !CORBA::is_nil( myMPIContainer ) ) {
-          MESSAGE("MPIContainer " << aComputerContainer << " started");
-          return myMPIContainer ;
-        }
-        else {
-          MESSAGE("MPIContainer " << aComputerContainer << " NOT started");
-        }
-      }
-      else {
-        MESSAGE("MPIContainer " << aComputerContainer << " started");
-        return aMPIFactoryServer ;
-      }
-    }
-  }
-  return Engines::MPIContainer::_nil();
-}
-
-// Engines::Component_var SALOME_MPILifeCycleCORBA::FindOrLoad_MPIComponent
-//                                    (const char *MPIcontainerName,
-//                                 const char *MPIcomponentName,
-//                                 const char *implementation,
-//                                 const int nbproc)
-// {
-//   BEGIN_OF("FindOrLoad_MPIComponent(1)");
-//   ASSERT(_NS != NULL);
-//   string theComputer ;
-//   string theMPIContainer ;
-//   string theComputerContainer = ContainerName( MPIcontainerName ,
-//                                                &theComputer ,
-//                                                &theMPIContainer ) ;
-//   Engines::MPIContainer_var cont = FindOrStartMPIContainer( theComputerContainer ,
-//                                                         theComputer ,
-//                                                         theMPIContainer,
-//                                                         nbproc) ;
-// //  ASSERT(!CORBA::is_nil(cont));
-
-//   string path( theComputerContainer );
-//   path = path + "/";
-//   path = path + MPIcomponentName;
-//   SCRUTE(path);
-//   try
-//     {
-//       CORBA::Object_var obj = _NS->Resolve(path.c_str());
-//       if (CORBA::is_nil(obj))
-//     {
-//       MESSAGE("MPIComponent not found ! trying to load " << path);
-//       Engines::Component_var compo 
-//         = cont->load_impl(MPIcomponentName, implementation);
-// //    ASSERT(!CORBA::is_nil(compo));
-//       MESSAGE("MPIComponent launched !" << path);
-//       return compo;
-//     }
-//       else
-//     {
-//       MESSAGE("MPIComponent found !" << path);
-//       Engines::Component_var compo = Engines::Component::_narrow(obj);
-// //    ASSERT(!CORBA::is_nil(compo));
-//       try
-//         {
-//           compo->ping(); 
-//         }
-//       catch (CORBA::COMM_FAILURE&)
-//         {
-//           INFOS("Caught CORBA::SystemException CommFailure. Engine "
-//                 << path << "does not respond" );
-//         }
-//       return compo;
-//     }
-//     }
-//   catch (ServiceUnreachable&)
-//     {
-//       INFOS("Caught exception: Naming Service Unreachable");
-//     }
-//   catch (...)
-//     {
-//       INFOS("Caught unknown exception.");
-//     }
-//   return Engines::Component::_nil();
-// }
-
-Engines::Component_var SALOME_MPILifeCycleCORBA::FindOrLoad_MPIComponent
-                                  (const char *MPIcontainerName,
-                                  const char *MPIcomponentName,
-                                  const int nbproc)
-{
-
-  char nbp[1024];
-
-  sprintf(nbp,"_%d",nbproc);
-//  BEGIN_OF("FindOrLoad_Component(2)");
-  ASSERT(_NS != NULL);
-  string theComputer ;
-  string theMPIContainerRoot ;
-  string theMPIContainer;
-  string theComputerContainer = ContainerName( MPIcontainerName ,
-                                               &theComputer ,
-                                               &theMPIContainerRoot ) ;
-  theMPIContainer = theMPIContainerRoot + nbp;
-  Engines::MPIContainer_var cont = FindOrStartMPIContainer( theComputer ,
-                                                           theMPIContainerRoot,
-                                                           nbproc ) ;
-
-  if ( CORBA::is_nil( cont ) ) {
-    MESSAGE("MPIContainer not found ! " << theComputerContainer );
-    return Engines::Component::_nil();
-  }
-
-//  char * machine = cont->machineName() ;
-  const char * machine = theComputer.c_str() ;
-
-  string path( theComputerContainer );
-  path += nbp;
-  path += "/";
-  path += MPIcomponentName;
-  SCRUTE(path);
-
-  try {
-    CORBA::Object_var obj = _NS->Resolve(path.c_str());
-    if ( CORBA::is_nil( obj ) ) {
-      MESSAGE("MPIComponent not found ! trying to load " << path);
-      CORBA::Object_var obj2 = _NS->Resolve("/Kernel/ModulCatalog");
-      SALOME_ModuleCatalog::ModuleCatalog_var Catalog = 
-       SALOME_ModuleCatalog::ModuleCatalog::_narrow(obj2);
-
-      SALOME_ModuleCatalog::Acomponent_ptr compoInfo = 
-       Catalog->GetComponent(MPIcomponentName);
-      if (CORBA::is_nil (compoInfo)) 
-       {
-         INFOS("Catalog Error : Component not found in the catalog")
-           return Engines::Component::_nil();
-//             exit (-1);
-       }
-      
-      string  path;
-      try
-       {
-         path = compoInfo->GetPathPrefix( machine ) ;
-         path += "/" ;
-       }
-      catch (SALOME_ModuleCatalog::NotFound&)
-       {
-         MESSAGE("GetPathPrefix(" << machine << ") not found!"
-                 << "trying localhost");
-         try {
-           path = compoInfo->GetPathPrefix("localhost") ;
-           path += "/" ;
-         }
-         catch (SALOME_ModuleCatalog::NotFound&) {
-           MESSAGE("GetPathPrefix(localhost) not found!") ;
-           path = "" ;
-         }
-       }
-      
-      SCRUTE(path); 
-      string implementation(path);
-      implementation += "lib";
-      implementation += MPIcomponentName;
-      implementation += "Engine.so";
-      
-      Engines::Component_var compo 
-       = cont->load_impl(MPIcomponentName, implementation.c_str());
-      
-//       ASSERT(!CORBA::is_nil(compo));
-//       MESSAGE("Component launched !" << path);
-      return compo;
-    }
-    else
-      {
-       MESSAGE("MPIComponent found !" << path);
-       Engines::Component_var compo = Engines::Component::_narrow(obj);
-       //        ASSERT(!CORBA::is_nil(compo));
-       try
-         {
-           string instanceName = compo->instanceName(); 
-         }
-       catch (CORBA::COMM_FAILURE&)
-         {
-           INFOS("Caught CORBA::SystemException CommFailure. Engine "
-                 << path << "does not respond" );
-         }
-       return compo;
-      }
-  }
-  catch (ServiceUnreachable&)
-    {
-      INFOS("Caught exception: Naming Service Unreachable");
-    }
-  catch (...)
-    {
-      INFOS("Caught unknown exception.");
-    }
-  return Engines::Component::_nil();
-}
diff --git a/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.hxx b/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.hxx

deleted file mode 100644 (file)

index dfac110..0000000
--- a/src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-//=============================================================================
-// File      : SALOME_MPILifeCycleCORBA.hxx
-// Created   : mar jui 03 14:55:45 CEST 2003
-// Author    : Bernard SECHER, CEA
-// Project   : SALOME
-// Copyright : CEA 2003
-// $Header$
-//=============================================================================
-
-#ifndef _SALOME_MPILIFECYCLECORBA_HXX_
-#define _SALOME_MPILIFECYCLECORBA_HXX_
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string>
-
-#include <SALOMEconfig.h>
-#include CORBA_CLIENT_HEADER(SALOME_MPIContainer)
-#include "SALOME_LifeCycleCORBA.hxx"
-
-class SALOME_MPILifeCycleCORBA : public SALOME_LifeCycleCORBA
-{
-public:
-  SALOME_MPILifeCycleCORBA();
-  SALOME_MPILifeCycleCORBA(SALOME_NamingService *ns);
-  virtual ~SALOME_MPILifeCycleCORBA();
-
-//   Engines::Component_var FindOrLoad_MPIComponent(const char *MPIcontainerName,
-//                                              const char *MPIcomponentName,
-//                                              const char *implementationPath,
-//                                              const int nbproc);
-  Engines::Component_var FindOrLoad_MPIComponent(const char *MPIcontainerName,
-                                                const char *MPIcomponentName,
-                                                const int nbproc);
-protected:
-  Engines::MPIContainer_var _MPIFactoryServer ;
-
-private:
-  Engines::MPIContainer_var FindOrStartMPIContainer(const string theComputer ,
-                                                   const string theMPIContainerRoot,
-                                                   const int nbproc) ;
-
-} ;
-
-#endif
diff --git a/src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx b/src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx

deleted file mode 100644 (file)

index 9e2c5c1..0000000
--- a/src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx
+++ /dev/null
@@ -1,69 +0,0 @@
-// using namespace std;
-//=============================================================================
-// File      : TestMPILifeCycleCORBA.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>
-#include <string>
-#include <SALOMEconfig.h>
-#include CORBA_CLIENT_HEADER(SALOME_MPIContainer)
-#include CORBA_CLIENT_HEADER(SALOME_TestMPIComponent)
-
-# include "Utils_ORB_INIT.hxx"
-# include "Utils_SINGLETON.hxx"
-#include "SALOME_NamingService.hxx"
-#include "SALOME_MPILifeCycleCORBA.hxx"
-#include "OpUtil.hxx"
-
-int main (int argc, char * argv[])
-{
-
-  try{
-    // 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) ;
-    
-    // Use Name Service to find container
-    SALOME_NamingService NS(orb);
-    
-    SALOME_MPILifeCycleCORBA LCC(&NS);
-    
-    Engines::Component_var comp = LCC.FindOrLoad_MPIComponent("MPIFactoryServer","TestMPIComponent",2);
-    
-    Engines::TestMPIComponent_var m1 = Engines::TestMPIComponent::_narrow(comp);
-    if(CORBA::is_nil(m1)){
-      INFOS("echec recuperation poignee composant");
-    }
-    else{
-      
-      INFOS("Lancement de coucou");
-      m1->Coucou(1L);
-    }
-
-    orb->destroy();
-  }
-  catch(CORBA::COMM_FAILURE& ex) {
-    INFOS("Caught system exception COMM_FAILURE -- unable to contact the object.");
-  }
-  catch(CORBA::SystemException&) {
-    INFOS("Caught a CORBA::SystemException.");
-  }
-  catch(CORBA::Exception&) {
-    INFOS("Caught CORBA::Exception.");
-  }
-  catch(...) {
-    INFOS("Caught unknown exception.");
-  }
-
-  return 0;
-}
diff --git a/src/TestMPIContainer/Makefile.in b/src/TestMPIContainer/Makefile.in

deleted file mode 100644 (file)

index 59ba1ab..0000000
--- a/src/TestMPIContainer/Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#==============================================================================
-#  File      : Makefile.in
-#  Created   : mer jui 04 12:58:13 CEST 2003
-#  Author    : Bernard SECHER, CEA
-#  Project   : SALOME
-#  Copyright : CEA 2003
-#  $Header$
-#==============================================================================
-
-# source path
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl
-
-@COMMENCE@
-
-EXPORT_PYSCRIPTS = 
-
-EXPORT_HEADERS = TestMPIComponentEngine.hxx
-
-# Libraries targets
-
-LIB = libSalomeTestMPIComponentEngine.la 
-LIB_SRC = TestMPIComponentEngine.cxx
-LIB_CLIENT_IDL = Logger.idl SALOME_MPIObject.idl SALOME_TestMPIComponent.idl
-
-# Executables targets
-BIN = TestMPIContainer
-BIN_SRC = 
-BIN_CLIENT_IDL = Logger.idl SALOME_MPIObject.idl SALOME_MPIContainer.idl SALOME_TestMPIComponent.idl
-BIN_SERVER_IDL = 
-
-LDFLAGS+= -lSalomeNotification -lSalomeNS -lSalomeMPILifeCycleCORBA -lSalomeLifeCycleCORBA -lSalomeMPIContainer -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace
-
-
-@CONCLUDE@
diff --git a/src/TestMPIContainer/TestMPIComponentEngine.cxx b/src/TestMPIContainer/TestMPIComponentEngine.cxx

deleted file mode 100644 (file)

index b0bf10b..0000000
--- a/src/TestMPIContainer/TestMPIComponentEngine.cxx
+++ /dev/null
@@ -1,77 +0,0 @@
-//=============================================================================
-// File      : TestMPIComponentEngine.cxx
-// Created   : mer jui 4 12:28:26 CEST 2003
-// Author    : Bernard SECHER, 2003
-// Project   : SALOME
-// Copyright : CEA 2003
-// $Header$
-//=============================================================================
-
-#include "utilities.h"
-#include "TestMPIComponentEngine.hxx"
-using namespace std;
-
-TestMPIComponentEngine::TestMPIComponentEngine(int nbproc, int numproc,
-                                              CORBA::ORB_ptr orb,
-                                              PortableServer::POA_ptr poa,
-                                              PortableServer::ObjectId * contId, 
-                                              const char *instanceName, 
-                                              const char *interfaceName,
-                                              bool regist) :
-  Engines_Component_i(orb, poa, contId, instanceName, interfaceName,true,regist), MPIObject_i(nbproc,numproc)
-{
-  MESSAGE("activate object")
-  _thisObj = this ;
-  _id = _poa->activate_object(_thisObj);
-}
-
-TestMPIComponentEngine::TestMPIComponentEngine(): Engines_Component_i(), MPIObject_i()
-{
-}
-
-TestMPIComponentEngine::~TestMPIComponentEngine()
-{
-}
-
-void TestMPIComponentEngine::Coucou(CORBA::Long L)
-{
-  BEGIN_OF("[" << _numproc << "] TestMPIComponentEngine::Coucou()");
-  if(_numproc==0)
-    for(int ip=1;ip<_nbproc;ip++)
-      Engines::TestMPIComponent::_narrow((*_tior)[ip])->SPCoucou(L);
-  MESSAGE("[" << _numproc << "] TestMPIComponentEngine : L = " << L);
-  END_OF("[" << _numproc << "] TestMPIComponentEngine::Coucou()");
-}
-
-void TestMPIComponentEngine::SPCoucou(CORBA::Long L)
-{
-  BEGIN_OF("[" << _numproc << "] TestMPIComponentEngine::SPCoucou()");
-  MESSAGE("[" << _numproc << "] TestMPIComponentEngine : L = " << L);
-  END_OF("[" << _numproc << "] TestMPIComponentEngine::SPCoucou()");
-}
-
-extern "C"
-{
-  PortableServer::ObjectId * TestMPIComponentEngine_factory(
-                                int nbproc, int numproc,
-                                CORBA::ORB_ptr orb,
-                                PortableServer::POA_ptr poa, 
-                                PortableServer::ObjectId * contId,
-                                const char *instanceName, 
-                                const char *interfaceName)
-  {
-    bool regist;
-    TestMPIComponentEngine * myTestMPIComponent;
-    MESSAGE("[" << numproc << "] PortableServer::ObjectId * TestMPIComponentEngine_factory()");
-    SCRUTE(interfaceName);
-    if(numproc==0)
-      regist = true;
-    else
-      regist = false;
-
-    myTestMPIComponent 
-      = new TestMPIComponentEngine(nbproc,numproc,orb, poa, contId, instanceName, interfaceName,regist);
-    return myTestMPIComponent->getId() ;
-  }
-}
-
diff --git a/src/TestMPIContainer/TestMPIComponentEngine.hxx b/src/TestMPIContainer/TestMPIComponentEngine.hxx

deleted file mode 100644 (file)

index 4e52001..0000000
--- a/src/TestMPIContainer/TestMPIComponentEngine.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-//=============================================================================
-// File      : TestMPIComponentEngine.hxx
-// Created   : mer jui 4 12:28:30 CEST 2003
-// Author    : Bernard SECHER, CEA
-// Project   : SALOME
-// Copyright : CEA 2003
-// $Header$
-//=============================================================================
-
-#ifndef _SALOME_TESTCOMPONENT_I_HXX_
-#define _SALOME_TESTCOMPONENT_I_HXX_
-
-#include <iostream.h>
-#include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(SALOME_TestMPIComponent)
-#include "SALOME_Component_i.hxx"
-#include "MPIObject_i.hxx"
-
-class TestMPIComponentEngine: 
-  public POA_Engines::TestMPIComponent,
-  public Engines_Component_i, public MPIObject_i
-{
-public:
-  TestMPIComponentEngine();
-  TestMPIComponentEngine(int nbproc, int numproc,
-                        CORBA::ORB_ptr orb,
-                        PortableServer::POA_ptr poa,
-                        PortableServer::ObjectId * contId, 
-                        const char *instanceName, 
-                        const char *interfaceName,
-                        bool regist);
-
-  virtual ~TestMPIComponentEngine();
-
-  void Coucou(CORBA::Long L);
-  void SPCoucou(CORBA::Long L);
-  
-};
-
-#endif
diff --git a/src/TestMPIContainer/TestMPIContainer.cxx b/src/TestMPIContainer/TestMPIContainer.cxx

deleted file mode 100644 (file)

index 3f753af..0000000
--- a/src/TestMPIContainer/TestMPIContainer.cxx
+++ /dev/null
@@ -1,134 +0,0 @@
-// 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>
-#include <string>
-#include <SALOMEconfig.h>
-#include CORBA_CLIENT_HEADER(SALOME_MPIContainer)
-#include CORBA_CLIENT_HEADER(SALOME_TestMPIComponent)
-
-# include "Utils_ORB_INIT.hxx"
-# include "Utils_SINGLETON.hxx"
-#include "SALOME_NamingService.hxx"
-#include "OpUtil.hxx"
-
-int main (int argc, char * argv[])
-{
-
-  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) ;
-
-    // Use Name Service to find container
-    SALOME_NamingService NS(orb) ;
-    string containerName = "/Containers/" ;
-    string hostName = 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);
-
-    if(CORBA::is_nil(iGenFact)){
-
-      // Launch MPI Container
-      string cmd("mpirun -np ");
-      cmd += argv[2];
-      cmd += " ";
-      cmd += getenv("KERNEL_ROOT_DIR");
-      cmd += "/bin/salome/SALOME_MPIContainer MPIFactoryServer_";
-      cmd += argv[2];
-      cmd += " &";
-      MESSAGE(cmd);
-      status = system(cmd.c_str());
-      if (status == -1) {
-       INFOS("TestMPIContainer launch MPI Container failed (system command status -1)") ;
-      }
-      else if (status == 217) {
-       INFOS("TestMPIContainer launch MPI Container failed (system command status 217)") ;
-      }
-    
-      // Try to resolve MPI Container
-      int it = 0;
-      do{
-       sleep(1);
-       obj = NS.Resolve(containerName.c_str()) ;
-       iGenFact = Engines::Container::_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");
-      exit(1);
-    }
-
-    Engines::TestMPIComponent_var m1;
-
-    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);
-      }
-    }
-    // Clean-up.
-    iGenFact->finalize_removal() ;
-    orb->destroy();
-  }
-  catch(CORBA::COMM_FAILURE& ex) {
-    INFOS("Caught system exception COMM_FAILURE -- unable to contact the object.");
-  }
-  catch(CORBA::SystemException&) {
-    INFOS("Caught a CORBA::SystemException.");
-  }
-  catch(CORBA::Exception&) {
-    INFOS("Caught CORBA::Exception.");
-  }
-  catch(...) {
-    INFOS("Caught unknown exception.");
-  }
-
-  return 0;
-}
author	admin <salome-admin@opencascade.com>
	Mon, 22 Mar 2004 07:28:15 +0000 (07:28 +0000)
committer	admin <salome-admin@opencascade.com>
	Mon, 22 Mar 2004 07:28:15 +0000 (07:28 +0000)
src/MPILifeCycleCORBA/MPILifeCycleCORBA.py	[deleted file]	patch \| blob \| history
src/MPILifeCycleCORBA/MPIsalome.py	[deleted file]	patch \| blob \| history
src/MPILifeCycleCORBA/Makefile.in	[deleted file]	patch \| blob \| history
src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.cxx	[deleted file]	patch \| blob \| history
src/MPILifeCycleCORBA/SALOME_MPILifeCycleCORBA.hxx	[deleted file]	patch \| blob \| history
src/MPILifeCycleCORBA/TestMPILifeCycleCORBA.cxx	[deleted file]	patch \| blob \| history
src/TestMPIContainer/Makefile.in	[deleted file]	patch \| blob \| history
src/TestMPIContainer/TestMPIComponentEngine.cxx	[deleted file]	patch \| blob \| history
src/TestMPIContainer/TestMPIComponentEngine.hxx	[deleted file]	patch \| blob \| history
src/TestMPIContainer/TestMPIContainer.cxx	[deleted file]	patch \| blob \| history