Skip to content

Commit 514b105

Browse files
keithel-qtJason Mobarak
andauthored
Add Qt releasing swift-nav 5.15.2.2 wheels with recursive mutex locking (#603)
* Add Qt releasing swift-nav 5.15.2.2 wheels with recursive mutex locking Qt Releasing was able to cut a special build of PySide2 5.15.2.1 with the final-2 patch that should address the occasional crashes in PySide2 signalmanager, as well as the hangs on shutdown that Jason was experiencing at the end of last week. The fixes (targetting the dev branch) can be seen here (these are publicly viewable): https://codereview.qt-project.org/c/pyside/pyside-setup/+/413917 https://codereview.qt-project.org/c/pyside/pyside-setup/+/415523 The fixes ported to the 5.15 branch are not public, but if one has a commercial license assigned to their Qt account, you can see them. They are here: https://codereview.qt-project.org/c/pyside/tqtc-pyside-setup/+/414778 https://codereview.qt-project.org/c/pyside/tqtc-pyside-setup/+/415707 The change has been cherry-picked to 5.15 LTS, 6.2 LTS, and 6.3 branches, so the next (from today, 20220613) official Qt releases of each of these Qt versions will include the fix. For now, please use these wheels. They can be used by performing the following with pip: pip install PySide2-x.y.z.wheel Ultimately, Qt will make them available at https://download.qt.io such that they can be installed with: pip install PySide2 --index-url=https://download.qt.io/..... However, first, Qt Releasing would like them to be tested. To discover all of the various cherry-picks of these two patches, log into gerrit (https://codereview.qt.io/) and search for the Change-Ids: I374ada7fc207d86a062f950751503764a5e5dddf I2dee3da70fe855859b3917e6ac775b8c5cdf5da7 There are also shiboken2-generator wheels, as well as wheels for Python 2.7 and win32 if those are needed. I did not include them here, as I did not think they were needed. * remove shutdown hack Co-authored-by: Jason Mobarak <[email protected]>
1 parent c60d207 commit 514b105

7 files changed

+13
-19
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:2e11bb61fa23b4f4f9c21409fca79669381264b960f2a43fecde3c83aa6b2e4d
3-
size 145955050
2+
oid sha256:5143de8b036a4b69458987cf81f1656e5e86659bf2f4928f2480445f685edb82
3+
size 145955111
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c4fb2f77efd4bd6b8e5709b9745956b4c3b11af099e1f7c82c2e7294e88a1efd
3-
size 161070860
2+
oid sha256:a3625bae94c5b19b16104e9af54bf936ed27121c328b2e18287dda095c8a7676
3+
size 161070855
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d2dbd9bb3a33426d5c28ebf1b1dce701890ad9aa9502b72696480d02389fc668
3-
size 135391994
2+
oid sha256:2cc12a0d46f98a08609cf278ac02efe94e0a58b1b817bca093c20769e242e097
3+
size 135391863
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:af77ace317dea48fb205991b0f07318c050f9fb0b9e2b0bd6207b3bd4bf53579
3-
size 960499
2+
oid sha256:81c6313013f8f2fa034c0c3d0d4c2f94167d76f68f009ee62bc7056c10db604b
3+
size 960639
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:dbf975ff992fa0c9e648e475806befa47c1be72b83bb01a3b30ebe90a8a53e9c
3-
size 977382
2+
oid sha256:c58e8ccbfe7bef50878930632cc89aa598de9687228a44465e488d47b8b8c724
3+
size 977354
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:636e9fd8cd9bfc95b4c7cd9789c1427431eba2e202d41c87900cb659656f1f92
3-
size 2323150
2+
oid sha256:02f5cc49413f0bf0a095d2e16efa01393d659074c826e7556f65c073747dc17d
3+
size 2323171

swiftnav_console/main.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,7 @@ def join(self):
272272
@Slot() # type: ignore
273273
def receive_messages(self):
274274
if not self._receive_messages():
275-
## FIXME: HACK ALERT: # pylint: disable=fixme
276-
## We should be able call `self._thread.exit()` and the app will
277-
## cleanly shutdown after the threads exit... but there's apparently
278-
## a deadlock during shutdown so we just tear everything down for now.
279-
##
280-
## See https://swift-nav.atlassian.net/browse/CPP-772
281-
os._exit(0) # pylint: disable=protected-access
275+
self._thread.exit()
282276
else:
283277
QTimer.singleShot(0, self.receive_messages)
284278

0 commit comments

Comments
 (0)