X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FSALOME_ComponentPy.py;h=3959ab4c84317afb8fdc5e11945921fd9bca04b1;hb=20c132438f5b8f7337bf35272989b10eb003d71c;hp=53899ba56313805e9c1ac6f95ed10bc73bb6582d;hpb=49d7ff1f37af9eeac672bf53e137f360a75dedec;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 53899ba56..3959ab4c8 --- a/src/Container/SALOME_ComponentPy.py +++ b/src/Container/SALOME_ComponentPy.py @@ -1,6 +1,5 @@ -#! /usr/bin/env python # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -8,7 +7,7 @@ # 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. +# 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 @@ -42,11 +41,12 @@ 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 * #============================================================================= @@ -54,17 +54,19 @@ _Sleeping = 0 ## define an implementation of the component interface Engines::Component # -# -class SALOME_ComponentPy_i (Engines__POA.EngineComponent): +# +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) ) @@ -84,49 +86,20 @@ class SALOME_ComponentPy_i (Engines__POA.EngineComponent): 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) + self._compo_o = poa.id_to_reference(id_o) + self._notifSupplier = NOTIFICATION_Supplier_Swig(instanceName, self._notif) - res = regist.add(infos) - - 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): @@ -137,12 +110,12 @@ class SALOME_ComponentPy_i (Engines__POA.EngineComponent): def ping(self): MESSAGE( "SALOME_ComponentPy_i::ping() pid " + str(os.getpid()) ) - + #------------------------------------------------------------------------- def setProperties(self, dico): self._fieldsDict = dico - + #------------------------------------------------------------------------- def getProperties(self): @@ -155,13 +128,13 @@ class SALOME_ComponentPy_i (Engines__POA.EngineComponent): id = self._poa.servant_to_id(self) self._poa.deactivate_object(id) return - + #------------------------------------------------------------------------- def GetContainerRef(self): MESSAGE( "SALOME_ComponentPy_i::GetContainerRef" ) return self._contId._narrow(Engines.Container) - + #------------------------------------------------------------------------- def beginService(self , serviceName ): @@ -173,21 +146,21 @@ class SALOME_ComponentPy_i (Engines__POA.EngineComponent): self._StartUsed = self.CpuUsed_impl() self._ThreadCpuUsed = 0 self._Executed = 1 - print "beginService for ",serviceName," Component instance : ",self._instanceName + 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) " + print("endService for",serviceName,"Component instance :",self._instanceName,"Cpu Used:",self.CpuUsed_impl()," (s) ") #------------------------------------------------------------------------- @@ -201,7 +174,7 @@ class SALOME_ComponentPy_i (Engines__POA.EngineComponent): MESSAGE( "SALOME_ComponentPy_i::Names" + str(GraphName) + str(NodeName) ) self._graphName = GraphName self._nodeName = NodeName - + #------------------------------------------------------------------------- def graphName(self): @@ -226,8 +199,8 @@ class SALOME_ComponentPy_i (Engines__POA.EngineComponent): # return 0 #else: # MESSAGE() - return 1 - + return 1 + #------------------------------------------------------------------------- def Kill_impl(self): @@ -282,7 +255,7 @@ class SALOME_ComponentPy_i (Engines__POA.EngineComponent): def CpuUsed_impl(self): if ( self._ThreadId | self._Executed ) : if self._ThreadId == get_ident() : - cpu = time.clock() + 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 @@ -292,41 +265,71 @@ class SALOME_ComponentPy_i (Engines__POA.EngineComponent): return 0 #------------------------------------------------------------------------- - - def DumpPython(self, theStudy, isPublished, isMultiFile): + + def DumpPython(self, isPublished, isMultiFile): aBuffer = "\0" if isMultiFile : - aBuffer = "def RebuildData(theStudy): pass\n\0" - return (aBuffer, 1) - - #------------------------------------------------------------------------- + aBuffer = "def RebuildData(): pass\n\0" + return (aBuffer.encode(), 1) - def getStudyId(self): - return self._studyId - - #------------------------------------------------------------------------- + #------------------------------------------------------------------------- def hasObjectInfo(self): return 0 - #------------------------------------------------------------------------- + #------------------------------------------------------------------------- - def getObjectInfo(self, studyId, entry): + def getObjectInfo(self, entry): return "" - #------------------------------------------------------------------------- + #------------------------------------------------------------------------- def getVersion(self): return "" # empty string means "unknown" version - #------------------------------------------------------------------------- + #------------------------------------------------------------------------- + + pass # end of SALOME_ComponentPy_i - def importData(self, studyId, dataContainer, options): - return [] # no implmenetation by default +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) - def getModifiedData(self, studyId): - return [] # no implmenetation by default + res = regist.add(infos) - pass # end of SALOME_ComponentPy_i + pass