Add and use Qt Releasing swift-nav custom 5.15.2.2 wheels fixing intermittent crashes (#594)

Author: keithel-qt

Makefile.toml

@@ -297,11 +297,11 @@ exec --fail-on-error tar -xvf py39.tar
 [tasks.install-pyside-wheels]
 env = { USE_PYTHON = { value = "${PYTHON}", condition = { env_not_set = [
   "USE_PYTHON",
-] } }, OS_WHEEL_LABEL = { source = "${OS}", default_value = "unknown", mapping = { "linux" = "linux_x86_64", "mac" = "macosx_10_13_x86_64", "windows" = "win_amd64" } } }
+] } }, OS_WHEEL_LABEL = { source = "${OS}", default_value = "unknown", mapping = { "linux" = "abi3-manylinux1_x86_64", "mac" = "abi3-macosx_10_13_intel", "windows" = "none-win_amd64" } } }
 script_runner = "@duckscript"
 script = '''
-exec --fail-on-error ${USE_PYTHON} -m pip install pyside-wheels/shiboken2-5.15.2.1-5.15.2-cp39-cp39-${OS_WHEEL_LABEL}.whl
-exec --fail-on-error ${USE_PYTHON} -m pip install pyside-wheels/PySide2-5.15.2.1-5.15.2-cp39-cp39-${OS_WHEEL_LABEL}.whl
+exec --fail-on-error ${USE_PYTHON} -m pip install pyside-wheels/shiboken2-5.15.2.2-5.15.2-cp35.cp36.cp37.cp38.cp39.cp310-${OS_WHEEL_LABEL}.whl
+exec --fail-on-error ${USE_PYTHON} -m pip install pyside-wheels/PySide2-5.15.2.2-5.15.2-cp35.cp36.cp37.cp38.cp39.cp310-${OS_WHEEL_LABEL}.whl
 '''
 
 [tasks.setup-builder]

console_backend/src/cli_options.rs

@@ -209,7 +209,6 @@ impl CliOptions {
     /// - `filtered_args`: The filtered args parsed via CliOptions.
     pub fn from_filtered_cli() -> CliOptions {
         let args = std::env::args();
-        eprintln!("args {:?}", args);
         let mut next_args = std::env::args().skip(1);
         let mut filtered_args: Vec<String> = vec![];
         for arg in args.filter(|a| !matches!(a.as_str(), "swiftnav_console.main" | "-m" | "--")) {

pyside-wheels/PySide2-5.15.2.2-5.15.2-cp35.cp36.cp37.cp38.cp39.cp310-abi3-macosx_10_13_intel.whl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e11bb61fa23b4f4f9c21409fca79669381264b960f2a43fecde3c83aa6b2e4d
+size 145955050

pyside-wheels/PySide2-5.15.2.2-5.15.2-cp35.cp36.cp37.cp38.cp39.cp310-abi3-manylinux1_x86_64.whl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4fb2f77efd4bd6b8e5709b9745956b4c3b11af099e1f7c82c2e7294e88a1efd
+size 161070860

pyside-wheels/PySide2-5.15.2.2-5.15.2-cp35.cp36.cp37.cp38.cp39.cp310-none-win_amd64.whl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2dbd9bb3a33426d5c28ebf1b1dce701890ad9aa9502b72696480d02389fc668
+size 135391994

pyside-wheels/shiboken2-5.15.2.2-5.15.2-cp35.cp36.cp37.cp38.cp39.cp310-abi3-macosx_10_13_intel.whl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af77ace317dea48fb205991b0f07318c050f9fb0b9e2b0bd6207b3bd4bf53579
+size 960499

pyside-wheels/shiboken2-5.15.2.2-5.15.2-cp35.cp36.cp37.cp38.cp39.cp310-abi3-manylinux1_x86_64.whl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbf975ff992fa0c9e648e475806befa47c1be72b83bb01a3b30ebe90a8a53e9c
+size 977382

pyside-wheels/shiboken2-5.15.2.2-5.15.2-cp35.cp36.cp37.cp38.cp39.cp310-none-win_amd64.whl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:636e9fd8cd9bfc95b4c7cd9789c1427431eba2e202d41c87900cb659656f1f92
+size 2323150

swiftnav_console/main.py

@@ -272,7 +272,13 @@ def join(self):
     @Slot()  # type: ignore
     def receive_messages(self):
         if not self._receive_messages():
-            self._thread.exit()
+            ## FIXME: HACK ALERT:  # pylint: disable=fixme
+            ##   We should be able call `self._thread.exit()` and the app will
+            ##   cleanly shutdown after the threads exit... but there's apparently
+            ##   a deadlock during shutdown so we just tear everything down for now.
+            ##
+            ##   See https://swift-nav.atlassian.net/browse/CPP-772
+            os._exit(0)  # pylint: disable=protected-access
         else:
             QTimer.singleShot(0, self.receive_messages)
 
@@ -304,7 +310,7 @@ def _receive_messages_prod(self):
 
     def _process_message_buffer(self, buffer):
         if not buffer:
-            print("terminating GUI loop", file=sys.stderr)
+            print("Terminating GUI loop", file=sys.stderr, flush=True)
             return False
         Message = self._messages.Message
         m = Message.from_bytes(buffer)
@@ -840,11 +846,11 @@ def handle_qml_load_errors(obj, _url):
     app.exec_()
 
     endpoint_main.shutdown()
-
     backend_msg_receiver.join()
 
     return 0
 
 
 if __name__ == "__main__":
-    sys.exit(main())
+    exit_code = main()
+    sys.exit(exit_code)

utils/bench_runner.py

@@ -116,7 +116,7 @@
 DEFAULT_JSON_FILEPATH = "fileout.json"
 BENCHMARK_COMMAND_ARGS = lambda file_path: f" --exit-after-close --file {file_path}"
 HYPERFINE_COMMAND = (
-    lambda file_out: f'hyperfine --warmup 1 --runs 5 --cleanup "sleep 1" --show-output --export-json {file_out} '
+    lambda file_out: f'hyperfine --warmup 1 --runs 5 --cleanup "sleep 1" --show-output --export-json {file_out}'
 )
 
 FRONTEND_CPU_BENCHMARKS = {
@@ -272,6 +272,7 @@ def run_frontend_cpu_benchmark(executable: str):
             f'{HYPERFINE_COMMAND(DEFAULT_JSON_FILEPATH)} "{prepped_command} '
             f'{BENCHMARK_COMMAND_ARGS(bench[FILE_PATH])}"'
         )
+        print(bench_command)
         subprocess.call(bench_command, shell=True)
         with open(DEFAULT_JSON_FILEPATH, "r", encoding="utf-8") as fileo:
             bench_result = json.load(fileo)