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.

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

[Android] Unlock stack in AndroidCallbacks #15335

Merged
merged 1 commit into from
Feb 18, 2022

Conversation

austinh0
Copy link
Contributor

Problem

  • Stack is not unlocked for GetConnectedDeviceCallback and ReportCallback, so re-entrant calls hang.

Change overview

  • Unlock stack before calling Java callback methods.

Testing

  • Commissioning and control/wildcard interactions work as expected.

@github-actions
Copy link

github-actions bot commented Feb 18, 2022

PR #15335: Size comparison from 11a5b14 to f64381d

Full report (43 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 11a5b14 f64381d change % change
cyw30739 light cyw930739m2evb_01 (read/write) 599342 599342 0 0.0
.app_xip_area 503268 503268 0 0.0
.bss 78772 78772 0 0.0
.data 644 644 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 557374 557374 0 0.0
.app_xip_area 462844 462844 0 0.0
.bss 77268 77268 0 0.0
.data 608 608 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 578618 578618 0 0.0
.app_xip_area 474664 474664 0 0.0
.bss 86364 86364 0 0.0
.data 552 552 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 916240 916240 0 0.0
(read/write) 129512 129512 0 0.0
.bss 127472 127472 0 0.0
.data 2036 2036 0 0.0
.text 916232 916232 0 0.0
BRD4161A+rpc (read only) 944964 944964 0 0.0
(read/write) 146424 146424 0 0.0
.bss 144248 144248 0 0.0
.data 2176 2176 0 0.0
.text 944956 944956 0 0.0
window-app BRD4161A (read only) 850080 850080 0 0.0
(read/write) 127424 127424 0 0.0
.bss 125520 125520 0 0.0
.data 1904 1904 0 0.0
.text 850072 850072 0 0.0
esp32 all-clusters-app c3devkit (read only) 950284 950284 0 0.0
(read/write) 1402034 1402034 0 0.0
.dram0.bss 68512 68512 0 0.0
.dram0.data 14156 14156 0 0.0
.flash.rodata 200472 200472 0 0.0
.flash.text 950284 950284 0 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 999851 999851 0 0.0
(read/write) 467304 467304 0 0.0
.dram0.bss 73656 73656 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 227456 227456 0 0.0
.flash.text 994467 994467 0 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 692536 692536 0 0.0
.bss 78392 78392 0 0.0
.data 1912 1912 0 0.0
.text 606432 606432 0 0.0
lock k32w061+release (read/write) 695072 695072 0 0.0
.bss 78608 78608 0 0.0
.data 1952 1952 0 0.0
.text 608712 608712 0 0.0
linux all-clusters-app debug (read only) 2385545 2385545 0 0.0
(read/write) 151456 151456 0 0.0
.bss 65376 65376 0 0.0
.data 1328 1328 0 0.0
.data.rel.ro 79048 79048 0 0.0
.dynamic 592 592 0 0.0
.got 4160 4160 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 207013 207013 0 0.0
.text 2014946 2014946 0 0.0
bridge-app debug+rpc (read only) 1734437 1734437 0 0.0
(read/write) 94856 94856 0 0.0
.bss 49296 49296 0 0.0
.data 2034 2034 0 0.0
.data.rel.ro 38376 38376 0 0.0
.dynamic 592 592 0 0.0
.got 3952 3952 0 0.0
.init 27 27 0 0.0
.init_array 560 560 0 0.0
.rodata 142732 142732 0 0.0
.text 1474869 1474869 0 0.0
chip-tool debug (read only) 8988237 8988237 0 0.0
(read/write) 319568 319568 0 0.0
.bss 40728 40728 0 0.0
.data 1184 1184 0 0.0
.data.rel.ro 271624 271624 0 0.0
.dynamic 608 608 0 0.0
.got 4784 4784 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 474037 474037 0 0.0
.text 7855925 7855925 0 0.0
chip-tool-ipv6only arm64 (read only) 8713636 8713636 0 0.0
(read/write) 431377 431377 0 0.0
.bss 58977 58977 0 0.0
.data 1216 1216 0 0.0
.data.rel.ro 316816 316816 0 0.0
.dynamic 560 560 0 0.0
.got 50568 50568 0 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 450444 450444 0 0.0
.text 7351732 7351732 0 0.0
door-lock-app debug (read only) 1946537 1946537 0 0.0
(read/write) 120952 120952 0 0.0
.bss 52016 52016 0 0.0
.data 1010 1010 0 0.0
.data.rel.ro 62488 62488 0 0.0
.dynamic 592 592 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 174226 174226 0 0.0
.text 1622802 1622802 0 0.0
lighting-app debug+rpc (read only) 2072993 2072993 0 0.0
(read/write) 125944 125944 0 0.0
.bss 53024 53024 0 0.0
.data 1400 1400 0 0.0
.data.rel.ro 65984 65984 0 0.0
.dynamic 608 608 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 720 720 0 0.0
.rodata 166801 166801 0 0.0
.text 1750546 1750546 0 0.0
ota-provider-app debug (read only) 1879961 1879961 0 0.0
(read/write) 116568 116568 0 0.0
.bss 51872 51872 0 0.0
.data 1224 1224 0 0.0
.data.rel.ro 57816 57816 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 159099 159099 0 0.0
.text 1569250 1569250 0 0.0
ota-requestor-app debug (read only) 1893025 1893025 0 0.0
(read/write) 117952 117952 0 0.0
.bss 52288 52288 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 59080 59080 0 0.0
.dynamic 592 592 0 0.0
.got 4192 4192 0 0.0
.init 27 27 0 0.0
.init_array 632 632 0 0.0
.rodata 153516 153516 0 0.0
.text 1589570 1589570 0 0.0
shell debug (read only) 2360449 2360449 0 0.0
(read/write) 153872 153872 0 0.0
.bss 73728 73728 0 0.0
.data 832 832 0 0.0
.data.rel.ro 73632 73632 0 0.0
.dynamic 592 592 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 904 904 0 0.0
.rodata 208082 208082 0 0.0
.text 1994914 1994914 0 0.0
thermostat-no-ble arm64 (read only) 2166764 2166764 0 0.0
(read/write) 151137 151137 0 0.0
.bss 67505 67505 0 0.0
.data 1032 1032 0 0.0
.data.rel.ro 75384 75384 0 0.0
.dynamic 560 560 0 0.0
.got 4224 4224 0 0.0
.init 24 24 0 0.0
.init_array 336 336 0 0.0
.rodata 134060 134060 0 0.0
.text 1813232 1813232 0 0.0
tv-app debug (read only) 2542905 2542905 0 0.0
(read/write) 152064 152064 0 0.0
.bss 69248 69248 0 0.0
.data 3200 3200 0 0.0
.data.rel.ro 73576 73576 0 0.0
.dynamic 592 592 0 0.0
.got 4552 4552 0 0.0
.init 27 27 0 0.0
.init_array 888 888 0 0.0
.rodata 199149 199149 0 0.0
.text 2169410 2169410 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2431028 2431028 0 0.0
.bss 195924 195924 0 0.0
.data 5328 5328 0 0.0
.text 1393600 1393600 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2392804 2392804 0 0.0
.bss 188432 188432 0 0.0
.data 5632 5632 0 0.0
.text 1355376 1355376 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2328312 2328312 0 0.0
.bss 187432 187432 0 0.0
.data 5608 5608 0 0.0
.text 1290912 1290912 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139840 1139840 0 0.0
.bss 11796 11796 0 0.0
.data 4368 4368 0 0.0
.text 103224 103224 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2319204 2319204 0 0.0
.bss 185980 185980 0 0.0
.data 5440 5440 0 0.0
.text 1281776 1281776 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 1023347 1023347 0 0.0
bss 123532 123532 0 0.0
rodata 120960 120960 0 0.0
text 699836 699836 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 992659 992659 0 0.0
bss 120720 120720 0 0.0
rodata 112504 112504 0 0.0
text 679736 679736 0 0.0
nrf52840dongle_nrf52840 (read/write) 1038087 1038087 0 0.0
bss 124752 124752 0 0.0
rodata 119792 119792 0 0.0
text 703644 703644 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 929942 929942 0 0.0
bss 120092 120092 0 0.0
rodata 114216 114216 0 0.0
text 614860 614860 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 952111 952111 0 0.0
bss 121760 121760 0 0.0
rodata 109796 109796 0 0.0
text 641948 641948 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 859574 859574 0 0.0
bss 118352 118352 0 0.0
rodata 102968 102968 0 0.0
text 557748 557748 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 527595 527595 0 0.0
bss 53632 53632 0 0.0
rodata 49976 49976 0 0.0
text 361016 361016 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 950687 950687 0 0.0
bss 121480 121480 0 0.0
rodata 108748 108748 0 0.0
text 641768 641768 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 946635 946635 0 0.0
bss 121484 121484 0 0.0
rodata 108448 108448 0 0.0
text 638008 638008 0 0.0
shell nrf52840dk_nrf52840 (read/write) 811335 811335 0 0.0
bss 113328 113328 0 0.0
rodata 79676 79676 0 0.0
text 540684 540684 0 0.0
p6 all-clusters-app default (read/write) 2489384 2489384 0 0.0
.bss 124240 124240 0 0.0
.data 2672 2672 0 0.0
.text 1447648 1447648 0 0.0
light-app default (read/write) 2394648 2394648 0 0.0
.bss 113896 113896 0 0.0
.data 2528 2528 0 0.0
.text 1352912 1352912 0 0.0
lock-app default (read/write) 2358216 2358216 0 0.0
.bss 113648 113648 0 0.0
.data 2488 2488 0 0.0
.text 1316480 1316480 0 0.0
qpg lighting-app qpg6105+debug (read only) 600172 600172 0 0.0
(read/write) 146940 146940 0 0.0
.bss 90952 90952 0 0.0
.data 1112 1112 0 0.0
.text 594852 594852 0 0.0
lock-app qpg6105+debug (read only) 565936 565936 0 0.0
(read/write) 146940 146940 0 0.0
.bss 90960 90960 0 0.0
.data 1064 1064 0 0.0
.text 560616 560616 0 0.0
persistent-storage-app qpg6105+debug (read only) 99536 99536 0 0.0
(read/write) 146941 146941 0 0.0
.bss 24001 24001 0 0.0
.data 180 180 0 0.0
.text 94216 94216 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 878654 878654 0 0.0
bss 87504 87504 0 0.0
noinit 37160 37160 0 0.0
text 618770 618770 0 0.0

@bzbarsky-apple bzbarsky-apple merged commit 90e379e into project-chip:master Feb 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants