From 0cd0a1085ab4e2e157db61abeb1fd25b94e8c17c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 14 Aug 2020 00:17:09 +0200
Subject: [PATCH] uncouple reading pipes, too, and select makes the threads
 time out

---
 csdr/csdr.py | 50 +++++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 1b16320..a720a2b 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -27,6 +27,7 @@ import signal
 import threading
 import math
 import time
+import select
 from functools import partial
 
 from owrx.kiss import KissClient, DirewolfConfig
@@ -94,7 +95,27 @@ class Pipe(object):
         os.mkfifo(self.path)
 
     def open(self):
-        self.file = open(self.path, self.direction, encoding=self.encoding)
+        retries = 0
+
+        def opener(path, flags):
+            fd = os.open(path, flags | os.O_NONBLOCK)
+            os.set_blocking(fd, True)
+            return fd
+
+        while self.file is None and self.doOpen and retries < 10:
+            try:
+                self.file = open(self.path, self.direction, encoding=self.encoding, opener=opener)
+            except OSError as error:
+                # ENXIO = FIFO has not been opened for reading
+                if error.errno == 6:
+                    time.sleep(.1)
+                    retries += 1
+                else:
+                    raise
+
+        # if doOpen is false, opening has been canceled, so no warning in that case.
+        if self.file is None and self.doOpen:
+            logger.warning("could not open FIFO %s", self.path)
 
     def close(self):
         self.doOpen = False
@@ -120,28 +141,9 @@ class WritingPipe(Pipe):
         self.open()
 
     def open_and_dequeue(self):
-        retries = 0
+        super().open()
 
-        def opener(path, flags):
-            fd = os.open(path, flags | os.O_NONBLOCK)
-            os.set_blocking(fd, True)
-            return fd
-
-        while self.file is None and self.doOpen and retries < 10:
-            try:
-                self.file = open(self.path, self.direction, encoding=self.encoding, opener=opener)
-            except OSError as error:
-                # ENXIO = FIFO has not been opened for reading
-                if error.errno == 6:
-                    time.sleep(.1)
-                    retries += 1
-                else:
-                    raise
-
-        # if doOpen is false, opening has been canceled, so no warning in that case.
         if self.file is None:
-            if self.doOpen:
-                logger.warning("could not open FIFO %s", self.path)
             return
 
         with self.queueLock:
@@ -167,6 +169,12 @@ class ReadingPipe(Pipe):
     def __init__(self, path, encoding=None):
         super().__init__(path, "r", encoding=encoding)
 
+    def open(self):
+        if not self.doOpen:
+            return
+        super().open()
+        select.select([self.file], [], [], 10)
+
     def read(self):
         if self.file is None:
             self.open()