Add support for socketcan send timeout

christiansandberg · christiansandberg · commit 1f8aaa93e43a · 2017-11-22T21:41:56.000+01:00
Related to issue hardbyte#205
diff --git a/can/interfaces/socketcan/socketcan_ctypes.py b/can/interfaces/socketcan/socketcan_ctypes.py
@@ -125,6 +125,9 @@ def recv(self, timeout=None):
 
     def send(self, msg, timeout=None):
         frame = _build_can_frame(msg)
+        if timeout:
+            # Wait for write availability. write will fail below on timeout
+            select.select([], [self.socket], [], timeout)
         bytes_sent = libc.write(self.socket, ctypes.byref(frame), ctypes.sizeof(frame))
         if bytes_sent == -1:
             log.debug("Error sending frame :-/")
diff --git a/can/interfaces/socketcan/socketcan_native.py b/can/interfaces/socketcan/socketcan_native.py
@@ -419,6 +419,9 @@ def send(self, msg, timeout=None):
             arbitration_id |= 0x20000000
         l = log.getChild("tx")
         l.debug("sending: %s", msg)
+        if timeout:
+            # Wait for write availability. send will fail below on timeout
+            select.select([], [self.socket], [], timeout)
         try:
             self.socket.send(build_can_frame(arbitration_id, msg.data))
         except OSError:
