X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FSALOME_ComponentPy.py;h=3959ab4c84317afb8fdc5e11945921fd9bca04b1;hb=refs%2Ftags%2FV9_11_0;hp=81633b032ce1517b5b820f7826e0ffb877c63eb2;hpb=e83c49c22e04a5719890de53f54160295864f900;p=modules%2Fkernel.git

diff --git a/src/Container/SALOME_ComponentPy.py b/src/Container/SALOME_ComponentPy.py
index 81633b032..3959ab4c8 100644
--- a/src/Container/SALOME_ComponentPy.py
+++ b/src/Container/SALOME_ComponentPy.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2020  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
@@ -41,6 +41,7 @@ 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 *
@@ -54,7 +55,10 @@ _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 = []
@@ -82,42 +86,13 @@ 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
 
     #-------------------------------------------------------------------------
 
@@ -280,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
@@ -315,3 +290,46 @@ class SALOME_ComponentPy_i (Engines__POA.EngineComponent):
     #-------------------------------------------------------------------------
 
     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)
+
+    pass