Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Python] Fix threading model #20465

Merged
merged 1 commit into from
Jul 7, 2022
Merged

[Python] Fix threading model #20465

merged 1 commit into from
Jul 7, 2022
+148 −209

Conversation

woody-apple
Copy link
Contributor

Problem

Fixes the threading issues identified in #20233.

Solution

  1. Removed the implicit creation of the Matter thread when attempting to get a library handle in GetLibraryHandle.
  2. Deleted the completely broken code in StackInit.cpp, and consolidated all stack initialization logic in a single place: pychip_DeviceController_StackInit. This now correctly orchestrates memory initialization, platform init, controller factory initialization and finally, starting up the Matter thread.
  3. The latter now correctly uses PlatformMgr().StartEventLoopTask() to start up the Matter thread.
  4. Fix pychip_DeviceController_StackShutdown to now actually be the symmetric mirror of init, AND, co-locate that next to Init to make it easy to read.

Tests

Ran the patch in #20178 and ensured it passed.

@mrjerryjohns @web-flow
[Python] Fix threading model (#20234)
959b2a1 
* Fix Python Threading Model

This fixes a number of issues with the Python REPL's threading model,
namely:

- Multiple, duplicated methods for stack initialization.
- Stack initialization split across really odd places
- Incorrect thread initialization
- Incorrect order of initialization

* Review feedback

* Brought back the auto-stack init in native, albeit, a minimal version
only.

Updated ChipStack to now use native to implicitly achieve this auto init
(which sets up MemoryInit) before continuining onwards with
controller-style initialization.

* Fix build
@woody-apple woody-apple merged commit b39e947 into sve Jul 7, 2022
@woody-apple woody-apple deleted the cherry-pick-a7a70ae4cabaece900ed9ea95d29f3e00b9d2dd3 branch July 7, 2022 22:36
@github-actions
Copy link

github-actions bot commented Jul 7, 2022 •
edited
Loading

PR #20465: Size comparison from afadb1c to 959b2a1

Increases (1 build for telink)
platform target config section afadb1c 959b2a1 change % change
telink lighting-app tlsr9518adk80d text 581454 581456 2 0.0
Decreases (3 builds for cc13x2_26x2, cyw30739, telink)
platform target config section afadb1c 959b2a1 change % change
cc13x2_26x2 lock-mtd LP_CC2652R7 (read only) 617959 617951 -8 -0.0
.text 541384 541376 -8 -0.0
cyw30739 ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 582206 582198 -8 -0.0
.app_xip_area 461824 461816 -8 -0.0
telink light-switch-app tlsr9518adk80d text 565132 565130 -2 -0.0
Full report (30 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section afadb1c 959b2a1 change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 665651 665651 0 0.0
(read/write) 185572 185572 0 0.0
.bss 74116 74116 0 0.0
.data 3356 3356 0 0.0
.rodata 88067 88067 0 0.0
.text 577268 577268 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 631443 631443 0 0.0
(read/write) 157684 157684 0 0.0
.bss 73412 73412 0 0.0
.data 3356 3356 0 0.0
.rodata 77307 77307 0 0.0
.text 553812 553812 0 0.0
lock-ftd LP_CC2652R7 (read only) 668551 668551 0 0.0
(read/write) 172816 172816 0 0.0
.bss 71148 71148 0 0.0
.data 3280 3280 0 0.0
.rodata 76207 76207 0 0.0
.text 591864 591864 0 0.0
lock-mtd LP_CC2652R7 (read only) 617959 617951 -8 -0.0
(read/write) 144264 144264 0 0.0
.bss 66868 66868 0 0.0
.data 3280 3280 0 0.0
.rodata 76087 76087 0 0.0
.text 541384 541376 -8 -0.0
pump-app LP_CC2652R7 (read only) 677703 677703 0 0.0
(read/write) 164512 164512 0 0.0
.bss 71228 71228 0 0.0
.data 3280 3280 0 0.0
.rodata 88431 88431 0 0.0
.text 588788 588788 0 0.0
pump-controller-app LP_CC2652R7 (read only) 663527 663527 0 0.0
(read/write) 178808 178808 0 0.0
.bss 71348 71348 0 0.0
.data 3276 3276 0 0.0
.rodata 84295 84295 0 0.0
.text 578752 578752 0 0.0
shell LP_CC2652R7 (read only) 658150 658150 0 0.0
(read/write) 188576 188576 0 0.0
.bss 76420 76420 0 0.0
.data 3360 3360 0 0.0
.rodata 84846 84846 0 0.0
.text 572988 572988 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 579134 579134 0 0.0
.app_xip_area 457904 457904 0 0.0
.bss 64184 64184 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 585070 585070 0 0.0
.app_xip_area 459104 459104 0 0.0
.bss 68912 68912 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 582206 582198 -8 -0.0
.app_xip_area 461824 461816 -8 -0.0
.bss 63392 63392 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1080652 1080652 0 0.0
.bss 132996 132996 0 0.0
.data 2048 2048 0 0.0
.text 945588 945588 0 0.0
BRD4161A+rpc (read only) 983040 983040 0 0.0
(read/write) 151948 151948 0 0.0
.bss 149676 149676 0 0.0
.data 2260 2260 0 0.0
.text 983032 983032 0 0.0
BRD4161A+rs911x (read/write) 946756 946756 0 0.0
.bss 140768 140768 0 0.0
.data 2048 2048 0 0.0
.text 803920 803920 0 0.0
lock-app BRD4161A+wf200 (read/write) 1127960 1127960 0 0.0
.bss 144184 144184 0 0.0
.data 2060 2060 0 0.0
.text 981692 981692 0 0.0
window-app BRD4161A (read/write) 1074436 1074436 0 0.0
.bss 134468 134468 0 0.0
.data 2076 2076 0 0.0
.text 937868 937868 0 0.0
esp32 all-clusters-app c3devkit (read only) 1019474 1019474 0 0.0
(read/write) 1485458 1485458 0 0.0
.dram0.bss 70080 70080 0 0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 215344 215344 0 0.0
.flash.text 1019474 1019474 0 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1073383 1073383 0 0.0
(read/write) 487536 487536 0 0.0
.dram0.bss 75600 75600 0 0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 245796 245796 0 0.0
.flash.text 1067999 1067999 0 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 658192 658192 0 0.0
.bss 69516 69516 0 0.0
.data 1992 1992 0 0.0
.text 580884 580884 0 0.0
lock k32w061+release (read/write) 684964 684964 0 0.0
.bss 69980 69980 0 0.0
.data 2004 2004 0 0.0
.text 607180 607180 0 0.0
linux chip-tool-no-interactive-ipv6only arm64 (read only) 9986740 9986740 0 0.0
(read/write) 683569 683569 0 0.0
.bss 42609 42609 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 622480 622480 0 0.0
.dynamic 528 528 0 0.0
.got 13512 13512 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 475828 475828 0 0.0
.text 7952564 7952564 0 0.0
thermostat-no-ble arm64 (read only) 2592644 2592644 0 0.0
(read/write) 158289 158289 0 0.0
.bss 65249 65249 0 0.0
.data 1704 1704 0 0.0
.data.rel.ro 83240 83240 0 0.0
.dynamic 528 528 0 0.0
.got 5072 5072 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 165348 165348 0 0.0
.text 2187520 2187520 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2447488 2447488 0 0.0
.bss 213940 213940 0 0.0
.data 5872 5872 0 0.0
.text 1410132 1410132 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1174495 1174495 0 0.0
bss 142900 142900 0 0.0
rodata 141776 141776 0 0.0
text 810916 810916 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1154691 1154691 0 0.0
bss 142136 142136 0 0.0
rodata 133308 133308 0 0.0
text 800360 800360 0 0.0
p6 all-clusters-app default (read/write) 2563896 2563896 0 0.0
.bss 149120 149120 0 0.0
.data 2776 2776 0 0.0
.text 1522160 1522160 0 0.0
all-clusters-minimal-app default (read/write) 2508952 2508952 0 0.0
.bss 148400 148400 0 0.0
.data 2776 2776 0 0.0
.text 1467216 1467216 0 0.0
light-app default (read/write) 2439240 2439240 0 0.0
.bss 140456 140456 0 0.0
.data 2592 2592 0 0.0
.text 1397504 1397504 0 0.0
lock-app default (read/write) 2466496 2466496 0 0.0
.bss 140304 140304 0 0.0
.data 2600 2600 0 0.0
.text 1424760 1424760 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 796636 796636 0 0.0
bss 70576 70576 0 0.0
noinit 40416 40416 0 0.0
text 565132 565130 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 816464 816464 0 0.0
bss 71420 71420 0 0.0
noinit 40416 40416 0 0.0
text 581454 581456 2 0.0

@turon turon mentioned this pull request Jul 20, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
controller sve cherry pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@woody-apple @mrjerryjohns