X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FSALOME_ComponentPy.py;h=f7e01ae9d4ed729745d9fd842c353d1edecceac4;hb=3ce0546302001755828c8476425a60c6ab61ac92;hp=5d071b8e422c38e44b653047edade3c9f2911ef1;hpb=f14439749926cca959747bb79fda10529520bd0b;p=modules%2Fkernel.git diff --git a/src/Container/SALOME_ComponentPy.py b/src/Container/SALOME_ComponentPy.py old mode 100755 new mode 100644 index 5d071b8e4..f7e01ae9d --- a/src/Container/SALOME_ComponentPy.py +++ b/src/Container/SALOME_ComponentPy.py @@ -1,65 +1,72 @@ -#! /usr/bin/env python +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE # -# SALOME Container : implementation of container and engine for Kernel +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # -# Copyright (C) 2003 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 +# 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, or (at your option) any later version. +# +# 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 # + +# SALOME Container : implementation of container and engine for Kernel # File : SALOME_ComponentPy.py # Author : Paul RASCLE, EDF # Module : SALOME # $Header$ +## @package SALOME_ComponentPy +# \brief python implementation of component interface for Kernel +# + import os import sys import time import string import signal -from omniORB import CORBA, PortableServer +from omniORB import CORBA, PortableServer, any import Engines, Engines__POA import Registry from Utils_Identity import * from SALOME_NamingServicePy import * +from SALOME_Embedded_NamingService_ClientPy import SALOME_Embedded_NamingService_ClientPy from libNOTIFICATION import * from SALOME_utilities import * -from thread import * +from _thread import * #============================================================================= _Sleeping = 0 -#define an implementation of the component interface - -class SALOME_ComponentPy_i (Engines__POA.Component): +## define an implementation of the component interface Engines::Component +# +# +class SALOME_ComponentPy_Gen_i (Engines__POA.EngineComponent): + """ + Implementation Without naming_service server + """ _orb = None _poa = None _fieldsDict = [] - _studyId = -1 - + #------------------------------------------------------------------------- def __init__ (self, orb, poa, contID, containerName, - instanceName, interfaceName, notif=0): + instanceName, interfaceName, notif=False): # Notif for notification services # NOT YET IMPLEMENTED MESSAGE( "SALOME_ComponentPy_i::__init__" + " " + str (containerName) + " " + str(instanceName) + " " + str(interfaceName) ) @@ -79,49 +86,20 @@ class SALOME_ComponentPy_i (Engines__POA.Component): self._Executed = 0 self._contId = contID - naming_service = SALOME_NamingServicePy_i(self._orb) myMachine=getShortHostName() - Component_path = self._containerName + "/" + self._instanceName - MESSAGE( 'SALOME_ComponentPy_i Register' + str( Component_path ) ) id_o = poa.activate_object(self) - compo_o = poa.id_to_reference(id_o) - naming_service.Register(compo_o, Component_path) - - # Add componentinstance to registry - obj = naming_service.Resolve('/Registry') - if obj is None: - MESSAGE( "Registry Reference is invalid" ) - else: - regist = obj._narrow(Registry.Components) - if regist is None: - MESSAGE( "Registry Reference is invalid" ) - else: - ior = orb.object_to_string(contID) - MESSAGE( ior ) - - lesInfos = Identity(self._instanceName) - infos = Registry.Infos(lesInfos._name, - lesInfos._pid, - lesInfos._machine, - lesInfos._adip, - lesInfos._uid, - lesInfos._pwname, - int(lesInfos._tc_start), - 0,0,0, - lesInfos._cdir, - -1, - ior) - - res = regist.add(infos) + self._compo_o = poa.id_to_reference(id_o) + self._notifSupplier = NOTIFICATION_Supplier_Swig(instanceName, self._notif) - self._notifSupplier = NOTIFICATION_Supplier_Swig(instanceName, notif) + def getCorbaRef(self): + return self._compo_o #------------------------------------------------------------------------- def _get_instanceName(self): MESSAGE( "SALOME_ComponentPy_i::_get_instanceName" ) return self._instanceName - + #------------------------------------------------------------------------- def _get_interfaceName(self): @@ -132,12 +110,12 @@ class SALOME_ComponentPy_i (Engines__POA.Component): def ping(self): MESSAGE( "SALOME_ComponentPy_i::ping() pid " + str(os.getpid()) ) - + #------------------------------------------------------------------------- def setProperties(self, dico): self._fieldsDict = dico - + #------------------------------------------------------------------------- def getProperties(self): @@ -149,15 +127,14 @@ class SALOME_ComponentPy_i (Engines__POA.Component): MESSAGE( "SALOME_ComponentPy_i::destroy" ) id = self._poa.servant_to_id(self) self._poa.deactivate_object(id) - + return + #------------------------------------------------------------------------- def GetContainerRef(self): MESSAGE( "SALOME_ComponentPy_i::GetContainerRef" ) - #corbaObj_ptr = self._poa.id_to_reference(self._contId) - #return corbaObj_ptr._narrow(Engines.Container) return self._contId._narrow(Engines.Container) - + #------------------------------------------------------------------------- def beginService(self , serviceName ): @@ -169,14 +146,22 @@ class SALOME_ComponentPy_i (Engines__POA.Component): self._StartUsed = self.CpuUsed_impl() self._ThreadCpuUsed = 0 self._Executed = 1 + print("beginService for ",serviceName," Component instance : ",self._instanceName) MESSAGE( "SALOME_ComponentPy_i::beginService _StartUsed " + str( self._ThreadId ) + " " + str( self._StartUsed ) ) - + for e in self._fieldsDict: + key=e.key + value=any.from_any(e.value) + if isinstance(value,str): + os.environ[key]=value + #------------------------------------------------------------------------- def endService(self , serviceName ): MESSAGE( "Send EndService notification for " + str( self._ThreadId ) + " " + str(serviceName) + " for graph/node " + str(self._graphName) + " " + str(self._nodeName) + " CpuUsed " + str( self.CpuUsed_impl() ) ) MESSAGE( "Component instance : " + str(self._instanceName) ) + print("endService for",serviceName,"Component instance :",self._instanceName,"Cpu Used:",self.CpuUsed_impl()," (s) ") + #------------------------------------------------------------------------- @@ -189,7 +174,7 @@ class SALOME_ComponentPy_i (Engines__POA.Component): MESSAGE( "SALOME_ComponentPy_i::Names" + str(GraphName) + str(NodeName) ) self._graphName = GraphName self._nodeName = NodeName - + #------------------------------------------------------------------------- def graphName(self): @@ -214,8 +199,8 @@ class SALOME_ComponentPy_i (Engines__POA.Component): # return 0 #else: # MESSAGE() - return 1 - + return 1 + #------------------------------------------------------------------------- def Kill_impl(self): @@ -270,8 +255,8 @@ class SALOME_ComponentPy_i (Engines__POA.Component): def CpuUsed_impl(self): if ( self._ThreadId | self._Executed ) : if self._ThreadId == get_ident() : - cpu = time.clock() - self._ThreadCpuUsed = int(cpu) - self._StartUsed + cpu = time.process_time() + self._ThreadCpuUsed = cpu - self._StartUsed MESSAGE( "SALOME_ComponentPy_i::CpuUsed_impl " + self._serviceName + " " + str( int(cpu) ) + " - " + str( self._StartUsed ) + " = " + str( self._ThreadCpuUsed ) ) return self._ThreadCpuUsed MESSAGE( "SALOME_ComponentPy_i::CpuUsed_impl " + self._serviceName + " " + str( self._ThreadCpuUsed ) ) @@ -280,12 +265,71 @@ class SALOME_ComponentPy_i (Engines__POA.Component): return 0 #------------------------------------------------------------------------- - - def DumpPython(self, theStudy, isPublished): - aBuffer = "def RebuildData(theStudy): pass\n\0" - return (aBuffer, 1) - #------------------------------------------------------------------------- + def DumpPython(self, isPublished, isMultiFile): + aBuffer = "\0" + if isMultiFile : + aBuffer = "def RebuildData(): pass\n\0" + return (aBuffer.encode(), 1) + + #------------------------------------------------------------------------- + + def hasObjectInfo(self): + return 0 + + #------------------------------------------------------------------------- + + def getObjectInfo(self, entry): + return "" + + #------------------------------------------------------------------------- + + def getVersion(self): + return "" # empty string means "unknown" version + + #------------------------------------------------------------------------- + + pass # end of SALOME_ComponentPy_i + +class SALOME_ComponentPy_i(SALOME_ComponentPy_Gen_i): + """ + Implementation with naming_service server + """ + def __init__ (self, orb, poa, contID, containerName, instanceName, interfaceName, notif=False): + SALOME_ComponentPy_Gen_i.__init__(self, orb, poa, contID, containerName, instanceName, interfaceName, notif) + emb_ns = self._contId.get_embedded_NS_if_ssl() + if CORBA.is_nil(emb_ns): + self._naming_service = SALOME_NamingServicePy_i(self._orb) + else: + self._naming_service = SALOME_Embedded_NamingService_ClientPy(emb_ns) + Component_path = contID.name + "/" + self._instanceName#self._containerName + MESSAGE( 'SALOME_ComponentPy_i Register' + str( Component_path ) ) + self._naming_service.Register(self._compo_o, Component_path) + # Add componentinstance to registry + obj = self._naming_service.Resolve('/Registry') + if obj is None: + MESSAGE( "Registry Reference is invalid" ) + else: + regist = obj._narrow(Registry.Components) + if regist is None: + MESSAGE( "Registry Reference is invalid" ) + else: + ior = orb.object_to_string(contID) + MESSAGE( ior ) + + lesInfos = Identity(self._instanceName) + infos = Registry.Infos(lesInfos._name, + lesInfos._pid, + lesInfos._machine, + lesInfos._adip, + lesInfos._uid, + lesInfos._pwname, + int(lesInfos._tc_start), + 0,0,0, + lesInfos._cdir, + -1, + ior) + + res = regist.add(infos) - def getStudyId(self): - return self._studyId + pass