Make thread based periodic tasks restartable

christiansandberg · christiansandberg · commit 3eb1c7ba0246 · 2017-02-12T21:00:39.000+01:00
diff --git a/can/broadcastmanager.py b/can/broadcastmanager.py
@@ -122,17 +122,26 @@ def _transmit(self, task):
 
 
 class ThreadBasedCyclicSendTask(ModifiableCyclicTaskABC,
-                                LimitedDurationCyclicSendTaskABC):
+                                LimitedDurationCyclicSendTaskABC,
+                                RestartableCyclicTaskABC):
     """Fallback cyclic send task using thread."""
 
-    def __init__(self, message, period, duration=None):
+    def __init__(self, bus, message, period, duration=None):
         super(ThreadBasedCyclicSendTask, self).__init__(message, period, duration)
+        if not hasattr(bus, "cyclic_manager"):
+            bus.cyclic_manager = ThreadBasedCyclicSendManager(bus.send)
+        self.bus = bus
         self.stopped = False
         self.end_time = time.time() + duration if duration else None
+        self.start()
 
     def stop(self):
         self.stopped = True
 
+    def start(self):
+        self.stopped = False
+        self.bus.cyclic_manager.add_task(self)
+
 
 def send_periodic(bus, message, period):
     """
diff --git a/can/bus.py b/can/bus.py
@@ -67,18 +67,16 @@ def send_periodic(self, msg, period, duration=None):
         """Start sending a message at a given period on this bus.
 
         :param can.Message msg:
+            Message to transmit
         :param float period:
+            Period in seconds between each message
         :param float duration:
             The duration to keep sending this message at given rate. If
             no duration is provided, the task will continue indefinitely.
         :return: A started task instance
         :rtype: can.CyclicSendTaskABC
         """
-        if not hasattr(self, "cyclic_manager"):
-            self.cyclic_manager = ThreadBasedCyclicSendManager(self.send)
-        task = ThreadBasedCyclicSendTask(msg, period, duration)
-        self.cyclic_manager.add_task(task)
-        return task
+        return ThreadBasedCyclicSendTask(self, msg, period, duration)
 
     def __iter__(self):
         """Allow iteration on messages as they are received.
diff --git a/can/interfaces/interface.py b/can/interfaces/interface.py
@@ -104,14 +104,12 @@ def __new__(cls, other, bus, *args, **kwargs):
         elif can.rc['interface'] == 'socketcan_native':
             from can.interfaces.socketcan.socketcan_native import CyclicSendTask as _nativeCyclicSendTask
             cls = _nativeCyclicSendTask
-        # CyclicSendTask has not been fully implemented on remote interface yet.
-        # Waiting for issue #80 which will change the API to make it easier for
-        # interfaces other than socketcan to implement it
-        #elif can.rc['interface'] == 'remote':
-        #    from can.interfaces.remote import CyclicSendTask as _remoteCyclicSendTask
-        #    cls = _remoteCyclicSendTask
+        elif can.rc['interface'] == 'remote':
+            from can.interfaces.remote import CyclicSendTask as _remoteCyclicSendTask
+            cls = _remoteCyclicSendTask
         else:
-            can.log.info("Current CAN interface doesn't support CyclicSendTask")
+            from can.broadcastmanager import ThreadBasedCyclicSendTask
+            cls = ThreadBasedCyclicSendTask
 
         return cls(bus, *args, **kwargs)
 
