Commit 80cc919
fix: Call timer->call() from the execution context, not the timer manager
This code was copied straight from the executor and seems to be a
workaround for the multithreaded executor, that breaks in this use case.
The correct solution for us is to do the timer->call() from within the
worker thread. This fixes a deadlock due to double acquisition of an
internal lock within the timer manager.
Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com>1 parent 11d733c commit 80cc919
File tree
1 file changed
+8
-7
lines changed- rclcpp/src/rclcpp/executors/events_cbg_executor
1 file changed
+8
-7
lines changedLines changed: 8 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | 77 | | |
83 | | - | |
| 78 | + | |
84 | 79 | | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
85 | 86 | | |
86 | 87 | | |
87 | | - | |
| 88 | + | |
88 | 89 | | |
89 | 90 | | |
90 | 91 | | |
| |||
0 commit comments