Commit c39cc45
committed
fix: prevent segfault when using MuJoCo viewer Reload button
Two race conditions crash the simulator on Reload:
1. PhysicsLoop calls mj_deleteData/mj_deleteModel while the bridge
threads are still reading from those pointers. Fix: add two
std::atomic<bool> globals (g_bridge_pause_request / g_bridge_paused)
as a pause/resume handshake. PhysicsLoop waits for the bridge to stop
before freeing memory. UnitreeSdk2BridgeThread destroys and recreates
the bridge on each reload instead of holding stale pointers forever.
2. RecurrentThread::~RecurrentThread() destroys mFunc (the run() lambda)
before sending pthread_cancel, and never sets mQuit. If the thread
wakes between those two steps it calls the destroyed std::function and
hits std::terminate(). Fix: replace RecurrentThread with a std::thread
owned by RobotBridge, controlled by a std::atomic<bool> stop_flag_.
pre_destroy() sets the flag and joins the thread — guaranteed clean
exit before any destructor runs.1 parent c598f10 commit c39cc45
2 files changed
Lines changed: 58 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
105 | 110 | | |
106 | 111 | | |
107 | 112 | | |
| |||
350 | 355 | | |
351 | 356 | | |
352 | 357 | | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
353 | 362 | | |
354 | 363 | | |
355 | 364 | | |
356 | 365 | | |
357 | 366 | | |
358 | 367 | | |
359 | 368 | | |
| 369 | + | |
| 370 | + | |
360 | 371 | | |
361 | 372 | | |
362 | 373 | | |
| |||
587 | 598 | | |
588 | 599 | | |
589 | 600 | | |
590 | | - | |
591 | | - | |
592 | | - | |
593 | | - | |
594 | | - | |
595 | | - | |
596 | | - | |
597 | | - | |
598 | | - | |
599 | | - | |
600 | | - | |
601 | | - | |
602 | | - | |
603 | | - | |
604 | 601 | | |
605 | 602 | | |
606 | | - | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
607 | 627 | | |
608 | 628 | | |
609 | 629 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
13 | 16 | | |
14 | 17 | | |
15 | 18 | | |
| |||
40 | 43 | | |
41 | 44 | | |
42 | 45 | | |
| 46 | + | |
43 | 47 | | |
44 | 48 | | |
45 | 49 | | |
| |||
165 | 169 | | |
166 | 170 | | |
167 | 171 | | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
168 | 177 | | |
169 | 178 | | |
170 | | - | |
171 | | - | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
172 | 193 | | |
173 | 194 | | |
174 | 195 | | |
| |||
0 commit comments