Commit bf7f010
committed
Fix QtVideoOutput destructor hang and complete OPERATION_ABORTED handling
CRITICAL: The primary shutdown hang was caused by QtVideoOutput cleanup never
completing. Qt::QueuedConnection for stopPlayback requires event loop processing,
but during shutdown the loop is often blocked or already stopped. Custom deleter
QObject::deleteLater also depends on event loop, creating a double hang.
Changes:
1. QtVideoOutput destructor + synchronous stop:
- Add explicit ~QtVideoOutput() to ensure cleanup even if deleteLater never fires
- Change stopPlayback to Qt::BlockingQueuedConnection for reliable synchronous stop
- Extract cleanupPlayer() helper for reuse in both onStopPlayback() and destructor
- Ensures mediaPlayer_->stop() completes before object destruction
2. Complete OPERATION_ABORTED handling:
- BluetoothService: Demote to debug (was: error)
- MediaSourceService: Demote to debug (was: error)
- Ensures clean logs on normal AA exit without spurious errors
Root cause: QueuedConnection + deleteLater both depend on Qt event loop, which is
often blocked or stopped during app teardown, causing ~90s timeout and SIGKILL.
Impact: Clean, immediate shutdown; no more 90-second timeout on AA exit.1 parent 3cb4125 commit bf7f010
4 files changed
Lines changed: 40 additions & 14 deletions
File tree
- include/f1x/openauto/autoapp/Projection
- src/autoapp
- Projection
- Service
- Bluetooth
- MediaSource
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
43 | 44 | | |
44 | 45 | | |
45 | 46 | | |
| |||
58 | 59 | | |
59 | 60 | | |
60 | 61 | | |
| 62 | + | |
61 | 63 | | |
62 | 64 | | |
63 | 65 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
42 | | - | |
| 41 | + | |
43 | 42 | | |
44 | 43 | | |
45 | 44 | | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
46 | 54 | | |
47 | 55 | | |
48 | 56 | | |
| |||
122 | 130 | | |
123 | 131 | | |
124 | 132 | | |
125 | | - | |
| 133 | + | |
126 | 134 | | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
| 135 | + | |
135 | 136 | | |
| 137 | + | |
136 | 138 | | |
137 | 139 | | |
138 | 140 | | |
139 | 141 | | |
140 | | - | |
| 142 | + | |
141 | 143 | | |
142 | 144 | | |
143 | 145 | | |
144 | 146 | | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
145 | 159 | | |
146 | 160 | | |
147 | 161 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
156 | 156 | | |
157 | 157 | | |
158 | 158 | | |
159 | | - | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
160 | 165 | | |
161 | 166 | | |
162 | 167 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
121 | | - | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
122 | 127 | | |
123 | 128 | | |
124 | 129 | | |
| |||
0 commit comments