X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FSALOME_ComponentPy.py;h=4decad903cc7ff622eba3e9994458dfe8805b8cd;hb=63adcbd0efaf06dbbe685b35644eeaa0e6657ba4;hp=004d6ededc699551b7832e1fe58bc96043c36041;hpb=0c092bf59ee4120ef16d351b3d882ef1165570cd;p=modules%2Fkernel.git diff --git a/src/Container/SALOME_ComponentPy.py b/src/Container/SALOME_ComponentPy.py index 004d6eded..4decad903 100755 --- a/src/Container/SALOME_ComponentPy.py +++ b/src/Container/SALOME_ComponentPy.py @@ -1,37 +1,43 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, 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 +# +# 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. # -# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# 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 -from omniORB import CORBA, PortableServer +import string +import signal +from omniORB import CORBA, PortableServer, any import Engines, Engines__POA import Registry from Utils_Identity import * @@ -40,20 +46,24 @@ from libNOTIFICATION import * from SALOME_utilities import * -from thread import * +from _thread import * #============================================================================= -#define an implementation of the component interface +_Sleeping = 0 -class SALOME_ComponentPy_i (Engines__POA.Component): +## define an implementation of the component interface Engines::Component +# +# +class SALOME_ComponentPy_i (Engines__POA.EngineComponent): _orb = None _poa = None - + _fieldsDict = [] + #------------------------------------------------------------------------- def __init__ (self, orb, poa, contID, containerName, - instanceName, interfaceName, notif): + instanceName, interfaceName, notif=False): # Notif for notification services # NOT YET IMPLEMENTED MESSAGE( "SALOME_ComponentPy_i::__init__" + " " + str (containerName) + " " + str(instanceName) + " " + str(interfaceName) ) @@ -66,15 +76,20 @@ class SALOME_ComponentPy_i (Engines__POA.Component): self._myConnexionToRegistry = 0 self._graphName = '' self._nodeName = '' + self._serviceName = '' self._ThreadId = 0 self._StartUsed = 0 self._ThreadCpuUsed = 0 self._Executed = 0 + self._contId = contID naming_service = SALOME_NamingServicePy_i(self._orb) - Component_path = "/Containers/" + os.getenv( "HOSTNAME" ) + "/" + self._containerName + "/" + self._interfaceName + myMachine=getShortHostName() + Component_path = self._containerName + "/" + self._instanceName MESSAGE( 'SALOME_ComponentPy_i Register' + str( Component_path ) ) - naming_service.Register(self._this(), 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') @@ -110,24 +125,42 @@ class SALOME_ComponentPy_i (Engines__POA.Component): def _get_instanceName(self): MESSAGE( "SALOME_ComponentPy_i::_get_instanceName" ) return self._instanceName - + + #------------------------------------------------------------------------- + + def _get_interfaceName(self): + MESSAGE( "SALOME_ComponentPy_i::_get_interfaceName" ) + return self._interfaceName + #------------------------------------------------------------------------- def ping(self): - MESSAGE( "SALOME_ComponentPy_i::ping" ) - + MESSAGE( "SALOME_ComponentPy_i::ping() pid " + str(os.getpid()) ) + + #------------------------------------------------------------------------- + + def setProperties(self, dico): + self._fieldsDict = dico + + #------------------------------------------------------------------------- + + def getProperties(self): + return self._fieldsDict + #------------------------------------------------------------------------- def destroy(self): MESSAGE( "SALOME_ComponentPy_i::destroy" ) - poa.deactivate_object(self) - CORBA.release(_poa) - + 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 ): @@ -139,14 +172,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) ") + #------------------------------------------------------------------------- @@ -159,7 +200,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): @@ -172,23 +213,68 @@ class SALOME_ComponentPy_i (Engines__POA.Component): #------------------------------------------------------------------------- - def Kill(self): - MESSAGE( "SALOME_ComponentPy_i::Kill not yet implemented" ) + def Killer(self, ThreadId, signum): + #if ThreadId > 0: + #if signum == 0: + #if pthread_cancel(ThreadId): <- from C++ + # return 0 + #else: + # MESSAGE() + #else: + #if pthread_kill(ThreadId): <- from C++ + # return 0 + #else: + # MESSAGE() + return 1 #------------------------------------------------------------------------- - def Stop(self): - MESSAGE( "SALOME_ComponentPy_i::Stop not yet implemented" ) + def Kill_impl(self): + MESSAGE( "SALOME_ComponentPy_i::Kill_impl" ) + RetVal = 0 + if self._ThreadId > 0 & self._ThreadId != get_ident(): + RetVal = Killer(self._ThreadId,0) + self._ThreadId = 0 + return RetVal #------------------------------------------------------------------------- - def Suspend(self): - MESSAGE( "SALOME_ComponentPy_i::Suspend not yet implemented" ) + def Stop_impl(self): + MESSAGE( "SALOME_ComponentPy_i::Stop_impl" ) + RetVal = 0 + if self._ThreadId > 0 & self._ThreadId != get_ident(): + RetVal = Killer(self._ThreadId,0) + self._ThreadId = 0 + return RetVal #------------------------------------------------------------------------- - def Resume(self): - MESSAGE( "SALOME_ComponentPy_i::Resume not yet implemented" ) + def Suspend_impl(self): + MESSAGE( "SALOME_ComponentPy_i::Suspend_impl" ) + global _Sleeping + RetVal = 0 + if self._ThreadId > 0 & self._ThreadId != get_ident(): + if _Sleeping > 0: + return 0 + else: + RetVal = Killer(self._ThreadId, signal.SIGINT) + if RetVal > 0: + _Sleeping = 1 + return RetVal + + #------------------------------------------------------------------------- + + def Resume_impl(self): + MESSAGE( "SALOME_ComponentPy_i::Resume_impl" ) + global _Sleeping + RetVal = 0 + if self._ThreadId > 0 & self._ThreadId != get_ident(): + if _Sleeping > 0: + _Sleeping = 0 + RetVal = 1 + else: + RetVal = 0 + return RetVal #------------------------------------------------------------------------- @@ -196,7 +282,7 @@ class SALOME_ComponentPy_i (Engines__POA.Component): if ( self._ThreadId | self._Executed ) : if self._ThreadId == get_ident() : cpu = time.clock() - self._ThreadCpuUsed = int(cpu) - self._StartUsed + 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 ) ) @@ -206,3 +292,27 @@ class SALOME_ComponentPy_i (Engines__POA.Component): #------------------------------------------------------------------------- + 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