Udef checks dependencies

src/sardana/macroserver/macros/test/test_scanct.py

@@ -24,6 +24,7 @@
 ##############################################################################
 
 """Tests for continuous scans (ct-like)"""
+import json
 import time
 import PyTango
 import unittest
@@ -333,6 +334,8 @@ def macro_stops(self, meas_config, macro_params, wait_timeout=None,
         ScanctTest.check_stopped(self)
 
     def tearDown(self):
+        for mg in self.pool.MotorGroupList:
+            self.pool.DeleteElement(json.loads(mg)['name'])
         ScanctTest.tearDown(self)
         unittest.TestCase.tearDown(self)
 
@@ -388,5 +391,7 @@ def macro_stops(self, meas_config, macro_params, wait_timeout=None,
         ScanctTest.check_stopped(self)
 
     def tearDown(self):
+        for mg in self.pool.MotorGroupList:
+            self.pool.DeleteElement(json.loads(mg)['name'])
         ScanctTest.tearDown(self)
         unittest.TestCase.tearDown(self)

src/sardana/pool/pool.py

@@ -32,6 +32,7 @@
 
 __docformat__ = 'restructuredtext'
 
+import gc
 import os.path
 import logging.handlers
 
@@ -557,6 +558,19 @@ def delete_element(self, name):
                 raise Exception("There is no element with name '%s'" % name)
 
         elem_type = elem.get_type()
+        dependent_elements = elem.get_dependent_elements()
+        if len(dependent_elements) > 0:
+            gc.collect()
+        dependent_elements = elem.get_dependent_elements()
+        if len(dependent_elements) > 0:
+            raise Exception(
+                "The element {} can't be deleted because {} depend on it."
+                "\n\nIf the name of the dependent element starts with " 
+                "'_mg_ms_*' it means that are motor groups, execute "
+                "DeleteElement(<motor_group_name>) command on the Pool e.g. "
+                "Pool_demo1_1.DeleteElement('_mg_ms_20671_1') in Spock."
+                .format(name, ", ".join(dependent_elements)))
+
         if elem_type == ElementType.Controller:
             if len(elem.get_elements()) > 0:
                 raise Exception("Cannot delete controller with elements. "

src/sardana/pool/poolacquisition.py

@@ -561,7 +561,7 @@ def run(self, *args, **kwargs):
             # clean also the pseudo counters, even the ones that do not
             # participate directly in the acquisition
             for pseudo_elem in elem.get_pseudo_elements():
-                pseudo_elem.clear_value_buffer()
+                pseudo_elem().clear_value_buffer()
 
         if self._hw_acq_args is not None:
             self._hw_acq._wait()

src/sardana/pool/poolbasechannel.py

@@ -30,6 +30,8 @@
 
 __docformat__ = 'restructuredtext'
 
+import weakref
+
 from sardana.sardanadefs import AttrQuality, ElementType
 from sardana.sardanaattribute import SardanaAttribute
 from sardana.sardanabuffer import SardanaBuffer
@@ -41,6 +43,7 @@
 from sardana.sardanaevent import EventType
 from sardana.pool import AcqSynch, AcqMode
 
+
 class ValueBuffer(SardanaBuffer):
 
     def is_value_required(self, idx):
@@ -53,7 +56,7 @@ def is_value_required(self, idx):
         :rtype: bool
         """
         for element in self.obj.get_pseudo_elements():
-            if element.get_value_buffer().next_idx <= idx:
+            if element().get_value_buffer().next_idx <= idx:
                 return True
         return False
 
@@ -135,8 +138,8 @@ def get_pseudo_elements(self):
         """Returns list of pseudo elements e.g. pseudo counters that this
         channel belongs to.
 
-        :return: pseudo elements
-        :rtype: seq<:class:`~sardana.pool.poolpseudocounter.PoolPseudoCounter`>
+        :return: weak references to pseudo elements
+        :rtype: seq<:class:`weakref.ref`>
         """
         return self._pseudo_elements
 
@@ -150,7 +153,7 @@ def add_pseudo_element(self, element):
         """
         if not self.has_pseudo_elements():
             self.get_value_buffer().persistent = True
-        self._pseudo_elements.append(element)
+        self._pseudo_elements.append(weakref.ref(element))
 
     def remove_pseudo_element(self, element):
         """Removes pseudo element e.g. pseudo counters that this channel
@@ -160,10 +163,17 @@ def remove_pseudo_element(self, element):
         :type element:
             :class:`~sardana.pool.poolpseudocounter.PoolPseudoCounter`
         """
-
-        self._pseudo_elements.remove(element)
-        if not self.has_pseudo_elements():
-            self.get_value_buffer().persistent = False
+        for pseudo_element in self._pseudo_elements:
+            if pseudo_element() == element:
+                self._pseudo_elements.remove(pseudo_element)
+                if not self.has_pseudo_elements():
+                    self.get_value_buffer().persistent = False
+                break
+        else:
+            raise ValueError(
+                "{} is not a pseudo element of {}".format(
+                    element.name, self.name)
+            )
 
     def get_value_attribute(self):
         """Returns the value attribute object for this experiment channel

src/sardana/pool/poolbaseelement.py

@@ -100,6 +100,9 @@ def serialize(self, *args, **kwargs):
         ret = PoolObject.serialize(self, *args, **kwargs)
         return ret
 
+    def get_dependent_elements(self):
+        return []
+
     # --------------------------------------------------------------------------
     # simulation mode
     # --------------------------------------------------------------------------

src/sardana/pool/poolcontroller.py

@@ -442,10 +442,10 @@ def set_operator(self, operator):
 
            :param operator: the new operator object
            :type operator: object"""
-        self._operator = operator
+        self._operator = weakref.ref(operator)
 
     def get_operator(self):
-        return self._operator
+        return self._operator()
 
     operator = property(fget=get_operator, fset=set_operator,
                         doc="current controller operator")

src/sardana/pool/poolelement.py

@@ -88,6 +88,21 @@ def set_action_cache(self, action_cache):
     def get_source(self):
         return "{0}/{1}".format(self.full_name, self.get_default_acquisition_channel())
 
+    def get_dependent_elements(self):
+        dependent_elements = []
+        for listener in self.get_listeners():
+            try:
+                elem = listener().__self__
+            except AttributeError:
+                continue
+            if isinstance(elem, PoolBaseElement):
+                dependent_elements.append(elem.name)
+
+        return dependent_elements
+
+    def has_dependent_elements(self):
+        return len(self.get_dependent_elements()) > 0
+
     # --------------------------------------------------------------------------
     # instrument
     # --------------------------------------------------------------------------

src/sardana/pool/poolmeasurementgroup.py

@@ -1345,16 +1345,13 @@ def prepare(self):
         value = self._get_value()
         self._pending_starts = self.nb_starts
 
-        kwargs = {'head': self}
-
         self.acquisition.prepare(self.configuration,
                                  self.acquisition_mode,
                                  value,
                                  self._synch_description,
                                  self._moveable_obj,
                                  self.sw_synch_initial_domain,
-                                 self.nb_starts,
-                                 **kwargs)
+                                 self.nb_starts)
 
     def start_acquisition(self, value=None):
         """Start measurement.

src/sardana/sardanaevent.py

@@ -105,6 +105,9 @@ def has_listeners(self):
             return False
         return len(self._listeners) > 0
 
+    def get_listeners(self):
+        return self._listeners
+
     def fire_event(self, event_type, event_value, listeners=None):
         self.flush_queue()
         self._fire_event(event_type, event_value, listeners=listeners)

src/sardana/tango/pool/Controller.py

@@ -72,6 +72,7 @@ def set_ctrl(self, ctrl):
     @DebugIt()
     def delete_device(self):
         PoolDevice.delete_device(self)
+        self.ctrl = None
 
     @DebugIt()
     def init_device(self):

src/sardana/tango/pool/MeasurementGroup.py

@@ -68,6 +68,7 @@ def delete_device(self):
         mg = self.measurement_group
         if mg is not None:
             mg.remove_listener(self.on_measurement_group_changed)
+        self.measurement_group = None
 
     @DebugIt()
     def init_device(self):

src/sardana/tango/pool/MotorGroup.py

@@ -70,6 +70,7 @@ def delete_device(self):
         motor_group = self.motor_group
         if motor_group is not None:
             motor_group.remove_listener(self.on_motor_group_changed)
+        self.motor_group = None
 
     @DebugIt()
     def init_device(self):

src/sardana/tango/pool/PseudoCounter.py

@@ -71,6 +71,7 @@ def delete_device(self):
         pseudo_counter = self.pseudo_counter
         if pseudo_counter is not None:
             pseudo_counter.remove_listener(self.on_pseudo_counter_changed)
+        self.pseudo_counter = None
 
     @DebugIt()
     def init_device(self):

src/sardana/tango/pool/PseudoMotor.py

@@ -73,6 +73,7 @@ def delete_device(self):
         pseudo_motor = self.pseudo_motor
         if pseudo_motor is not None:
             pseudo_motor.remove_listener(self.on_pseudo_motor_changed)
+        self.pseudo_motor = None
 
     @DebugIt()
     def init_device(self):

src/sardana/tango/pool/test/base_sartest.py

@@ -102,6 +102,8 @@ def setUp(self, pool_properties=None):
 
         self.ctrl_list = []
         self.elem_list = []
+        self.pseudo_ctrl_list = []
+        self.pseudo_elem_list = []
         try:
             # physical controllers and elements
             for sar_type, lib, cls, prefix, postfix, nelem in self.cls_list:
@@ -145,58 +147,68 @@ def setUp(self, pool_properties=None):
                     print(e)
                     msg = 'Impossible to create ctrl: "%s"' % (ctrl_name)
                     raise Exception('Aborting SartestTestCase: %s' % (msg))
-                self.ctrl_list.append(ctrl_name)
+                self.pseudo_ctrl_list.append(ctrl_name)
                 for role in roles:
                     elem = role.split("=")[1]
                     if elem not in self.elem_list:
-                        self.elem_list.append(elem)
+                        self.pseudo_elem_list.append(elem)
         except Exception as e:
             # force tearDown in order to eliminate the Pool
             BasePoolTestCase.tearDown(self)
             print(e)
 
+    def _delete_elem(self, elem_name):
+        # Cleanup eventual taurus devices. This is especially important
+        # if the sardana-taurus extensions are in use since this
+        # devices are created and destroyed within the testsuite.
+        # Persisting taurus device may react on API_EventTimeouts, enabled
+        # polling, etc.
+        if elem_name in self.f.tango_alias_devs:
+            _cleanup_device(elem_name)
+        try:
+            if os.name != "nt":
+                self.pool.DeleteElement(elem_name)
+                print(elem_name)
+        except Exception as e:
+            print(e)
+            self.dirty_elems.append(elem_name)
+
+    def _delete_ctrl(self, ctrl_name):
+        # Cleanup eventual taurus devices. This is especially important
+        # if the sardana-taurus extensions are in use since this
+        # devices are created and destroyed within the testsuite.
+        # Persisting taurus device may react on API_EventTimeouts, enabled
+        # polling, etc.
+        if ctrl_name in self.f.tango_alias_devs:
+            _cleanup_device(ctrl_name)
+        try:
+            if os.name != "nt":
+                self.pool.DeleteElement(ctrl_name)
+                print(ctrl_name)
+        except:
+            self.dirty_ctrls.append(ctrl_name)
+
     def tearDown(self):
         """Remove the elements and the controllers
         """
-        dirty_elems = []
-        dirty_ctrls = []
-        f = taurus.Factory()
+        self.dirty_elems = []
+        self.dirty_ctrls = []
+        self.f = taurus.Factory()
+        for elem_name in self.pseudo_elem_list:
+            self._delete_elem(elem_name)
+        for ctrl_name in self.pseudo_ctrl_list:
+            self._delete_ctrl(ctrl_name)
         for elem_name in self.elem_list:
-            # Cleanup eventual taurus devices. This is especially important
-            # if the sardana-taurus extensions are in use since this
-            # devices are created and destroyed within the testsuite.
-            # Persisting taurus device may react on API_EventTimeouts, enabled
-            # polling, etc.
-            if elem_name in f.tango_alias_devs:
-                _cleanup_device(elem_name)
-            try:
-                if os.name != "nt":
-                    self.pool.DeleteElement(elem_name)
-            except Exception as e:
-                print(e)
-                dirty_elems.append(elem_name)
-
+            self._delete_elem(elem_name)
         for ctrl_name in self.ctrl_list:
-            # Cleanup eventual taurus devices. This is especially important
-            # if the sardana-taurus extensions are in use since this
-            # devices are created and destroyed within the testsuite.
-            # Persisting taurus device may react on API_EventTimeouts, enabled
-            # polling, etc.
-            if ctrl_name in f.tango_alias_devs:
-                _cleanup_device(ctrl_name)
-            try:
-                if os.name != "nt":
-                    self.pool.DeleteElement(ctrl_name)
-            except:
-                dirty_ctrls.append(ctrl_name)
-
+            self._delete_ctrl(ctrl_name)
         _cleanup_device(self.pool_name)
 
         BasePoolTestCase.tearDown(self)
 
-        if dirty_elems or dirty_ctrls:
+        if self.dirty_elems or self.dirty_ctrls:
             msg = "Cleanup failed. Database may be left dirty." + \
-                "\n\tCtrls : %s\n\tElems : %s" % (dirty_ctrls, dirty_elems)
+                "\n\tCtrls : %s\n\tElems : %s" % (self.dirty_ctrls, self.dirty_elems)
             raise Exception(msg)