Use pipe for communication with soapy_power process, to avoid reading…

… garbage from stdout (some SoapySDR drivers like LimeSDR always outputs something to stdout)

PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Michal Krenek (Mikos) <[email protected]>
 pkgname=qspectrumanalyzer
-pkgver=1.5.0
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="Spectrum analyzer for multiple SDR platforms (PyQtGraph based GUI for soapy_power, rx_power, rtl_power, hackrf_sweep and other backends)"
 arch=('any')

qspectrumanalyzer/backends/__init__.py

@@ -1,4 +1,4 @@
-import os, glob, subprocess
+import os, glob, subprocess, threading
 
 from PyQt4 import QtCore
 
@@ -53,6 +53,7 @@ def __init__(self, data_storage, parent=None):
         self.data_storage = data_storage
         self.alive = False
         self.process = None
+        self._shutdown_lock = threading.Lock()
 
     def stop(self):
         """Stop power process thread"""
@@ -71,13 +72,14 @@ def process_start(self):
 
     def process_stop(self):
         """Terminate power process"""
-        if self.process:
-            try:
-                self.process.terminate()
-            except ProcessLookupError:
-                pass
-            self.process.wait()
-            self.process = None
+        with self._shutdown_lock:
+            if self.process:
+                try:
+                    self.process.terminate()
+                except ProcessLookupError:
+                    pass
+                self.process.wait()
+                self.process = None
 
     def parse_output(self, line):
         """Parse one line of output from power process"""

qspectrumanalyzer/backends/soapy_power.py

@@ -1,11 +1,25 @@
-import subprocess, pprint, sys, shlex
+import os, subprocess, pprint, sys, shlex
 
 import numpy as np
 from PyQt4 import QtCore
 
 from qspectrumanalyzer.backends import BaseInfo, BasePowerThread
 from soapypower.writer import SoapyPowerBinFormat
 
+if sys.platform == 'win32':
+    import msvcrt
+    import _winapi
+
+    def _make_inheritable_handle(fd):
+        """Return a duplicate of handle, which is inheritable"""
+        h = _winapi.DuplicateHandle(
+            _winapi.GetCurrentProcess(),
+            msvcrt.get_osfhandle(fd),
+            _winapi.GetCurrentProcess(), 0, 1,
+            _winapi.DUPLICATE_SAME_ACCESS
+        )
+        return subprocess.Handle(h)
+
 formatter = SoapyPowerBinFormat()
 
 
@@ -41,13 +55,28 @@ def setup(self, start_freq, stop_freq, bin_size, interval=10.0, gain=-1,
         self.databuffer = {"timestamp": [], "x": [], "y": []}
         self.min_freq = 0
 
+        self.pipe_read = None
+        self.pipe_read_fd = None
+        self.pipe_write_fd = None
+        self.pipe_write_handle = None
+
         print("soapy_power params:")
         pprint.pprint(self.params)
         print()
 
     def process_start(self):
         """Start soapy_power process"""
         if not self.process and self.params:
+            # Create pipe used for communication with soapy_power process
+            self.pipe_read_fd, self.pipe_write_fd = os.pipe()
+            self.pipe_read = open(self.pipe_read_fd, 'rb')
+            os.set_inheritable(self.pipe_write_fd, True)
+
+            if sys.platform == 'win32':
+                self.pipe_write_handle = _make_inheritable_handle(self.pipe_write_fd)
+                self.pipe_write_fd = int(self.pipe_write_handle)
+
+            # Prepare soapy_power cmdline parameters
             settings = QtCore.QSettings()
             cmdline = [
                 settings.value("executable", "soapy_power"),
@@ -59,6 +88,7 @@ def process_start(self):
                 "-r", "{}".format(self.params["sample_rate"]),
                 "-p", "{}".format(self.params["ppm"]),
                 "-F", "soapy_power_bin",
+                "--output-fd", "{}".format(self.pipe_write_fd),
             ]
 
             if self.params["gain"] >= 0:
@@ -72,8 +102,30 @@ def process_start(self):
             if additional_params:
                 cmdline.extend(shlex.split(additional_params))
 
-            self.process = subprocess.Popen(cmdline, stdout=subprocess.PIPE,
-                                            universal_newlines=False)
+            # Start soapy_power process and close write part of pipe
+            self.process = subprocess.Popen(cmdline, close_fds=False, universal_newlines=False)
+            os.close(self.pipe_write_fd)
+
+    def process_stop(self):
+        """Stop soapy_power process"""
+        with self._shutdown_lock:
+            if self.process:
+                try:
+                    self.process.terminate()
+                except ProcessLookupError:
+                    pass
+                self.process.wait()
+                self.process = None
+
+                # Close pipe used for communication with soapy_power process
+                self.pipe_read.close()
+                if sys.platform == 'win32':
+                    self.pipe_write_handle.Close()
+
+                self.pipe_read = None
+                self.pipe_read_fd = None
+                self.pipe_write_fd = None
+                self.pipe_write_handle = None
 
     def parse_output(self, data):
         """Parse data from soapy_power"""
@@ -111,10 +163,10 @@ def run(self):
 
         while self.alive:
             try:
-                data = formatter.read(self.process.stdout)
+                data = formatter.read(self.pipe_read)
             except ValueError as e:
                 print(e, file=sys.stderr)
-                break
+                continue
 
             if data:
                 self.parse_output(data)

qspectrumanalyzer/version.py

@@ -1 +1 @@
-__version__ = "1.5.0"
+__version__ = "1.6.0"