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

[Android] Prevent ByteArray and UtfString from being prematurely cleaned up #12346

Merged
merged 1 commit into from
Nov 30, 2021
Merged

[Android] Prevent ByteArray and UtfString from being prematurely cleaned up #12346

merged 1 commit into from
Nov 30, 2021

Conversation

austinh0
Copy link
Contributor

@austinh0 austinh0 commented Nov 30, 2021 •
edited
Loading

Problem

  • In the decode_value template, chip::ByteArray and chip::UtfString are used inline, which causes their destructors to be called too soon.

Change overview

  • Give chip::ByteArray and chip::UtfString instances names so they are only cleaned up after the method returns.

Testing

  • Commissioned m5stack

@github-actions
Copy link

github-actions bot commented Nov 30, 2021 •
edited
Loading

PR #12346: Size comparison from f50307a to 3b587e5

Full report (38 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section f50307a 3b587e5 change % change
efr32 lighting-app BRD4161A (read only) 762200 762200 0 0.0
(read/write) 119836 119836 0 0.0
.bss 118012 118012 0 0.0
.data 1820 1820 0 0.0
.text 762192 762192 0 0.0
BRD4161A+rpc (read only) 790712 790712 0 0.0
(read/write) 138132 138132 0 0.0
.bss 136212 136212 0 0.0
.data 1920 1920 0 0.0
.text 790704 790704 0 0.0
lock-app BRD4161A (read only) 736144 736144 0 0.0
(read/write) 117540 117540 0 0.0
.bss 115764 115764 0 0.0
.data 1776 1776 0 0.0
.text 736136 736136 0 0.0
window-app BRD4161A (read only) 739208 739208 0 0.0
(read/write) 117972 117972 0 0.0
.bss 116188 116188 0 0.0
.data 1784 1784 0 0.0
.text 739200 739200 0 0.0
esp32 all-clusters-app c3devkit (read only) 836020 836020 0 0.0
(read/write) 1224474 1224474 0 0.0
.dram0.bss 59144 59144 0 0.0
.dram0.data 13988 13988 0 0.0
.flash.rodata 166080 166080 0 0.0
.flash.text 836020 836020 0 0.0
.iram0.text 61390 61390 0 0.0
m5stack (read only) 907959 907959 0 0.0
(read/write) 423692 423692 0 0.0
.dram0.bss 64536 64536 0 0.0
.dram0.data 33960 33960 0 0.0
.flash.rodata 193916 193916 0 0.0
.flash.text 902575 902575 0 0.0
.iram0.text 122943 122943 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 723316 723316 0 0.0
.bss 78292 78292 0 0.0
.data 1844 1844 0 0.0
.text 637380 637380 0 0.0
lock-app k32w061+debug (read/write) 612388 612388 0 0.0
.bss 68740 68740 0 0.0
.data 1808 1808 0 0.0
.text 536040 536040 0 0.0
shell k32w061+debug (read/write) 677712 677712 0 0.0
.bss 79892 79892 0 0.0
.data 1780 1780 0 0.0
.text 590240 590240 0 0.0
linux all-clusters-app debug (read only) 1775225 1775225 0 0.0
(read/write) 131416 131416 0 0.0
.bss 60144 60144 0 0.0
.data 1040 1040 0 0.0
.data.rel.ro 64928 64928 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 576 576 0 0.0
.rodata 139093 139093 0 0.0
.text 1497762 1497762 0 0.0
bridge-app debug+rpc (read only) 1349405 1349405 0 0.0
(read/write) 77856 77856 0 0.0
.bss 41744 41744 0 0.0
.data 1680 1680 0 0.0
.data.rel.ro 29384 29384 0 0.0
.dynamic 592 592 0 0.0
.got 3984 3984 0 0.0
.init 27 27 0 0.0
.init_array 424 424 0 0.0
.rodata 113596 113596 0 0.0
.text 1135717 1135717 0 0.0
chip-tool debug (read only) 6124325 6124325 0 0.0
(read/write) 199128 199128 0 0.0
.bss 40096 40096 0 0.0
.data 1008 1008 0 0.0
.data.rel.ro 152432 152432 0 0.0
.dynamic 592 592 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 496 496 0 0.0
.rodata 294504 294504 0 0.0
.text 5439525 5439525 0 0.0
lighting-app debug+rpc (read only) 1629353 1629353 0 0.0
(read/write) 110976 110976 0 0.0
.bss 47440 47440 0 0.0
.data 1232 1232 0 0.0
.data.rel.ro 56976 56976 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 552 552 0 0.0
.rodata 132017 132017 0 0.0
.text 1359618 1359618 0 0.0
ota-provider-app debug (read only) 1310401 1310401 0 0.0
(read/write) 76312 76312 0 0.0
.bss 44320 44320 0 0.0
.data 912 912 0 0.0
.data.rel.ro 25944 25944 0 0.0
.dynamic 592 592 0 0.0
.got 4048 4048 0 0.0
.init 27 27 0 0.0
.init_array 464 464 0 0.0
.rodata 114896 114896 0 0.0
.text 1095154 1095154 0 0.0
ota-requestor-app debug (read only) 1406889 1406889 0 0.0
(read/write) 80144 80144 0 0.0
.bss 46752 46752 0 0.0
.data 976 976 0 0.0
.data.rel.ro 27272 27272 0 0.0
.dynamic 592 592 0 0.0
.got 4032 4032 0 0.0
.init 27 27 0 0.0
.init_array 488 488 0 0.0
.rodata 126400 126400 0 0.0
.text 1177346 1177346 0 0.0
shell debug (read only) 820449 820449 0 0.0
(read/write) 66808 66808 0 0.0
.bss 23496 23496 0 0.0
.data 224 224 0 0.0
.data.rel.ro 38560 38560 0 0.0
.dynamic 592 592 0 0.0
.got 3560 3560 0 0.0
.init 27 27 0 0.0
.init_array 360 360 0 0.0
.rodata 79154 79154 0 0.0
.text 634610 634610 0 0.0
tv-app debug (read only) 1921361 1921361 0 0.0
(read/write) 318944 318944 0 0.0
.bss 250264 250264 0 0.0
.data 1504 1504 0 0.0
.data.rel.ro 61480 61480 0 0.0
.dynamic 592 592 0 0.0
.got 4432 4432 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 161032 161032 0 0.0
.text 1611986 1611986 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2295088 2295088 0 0.0
.bss 181884 181884 0 0.0
.data 5128 5128 0 0.0
.heap 849432 849432 0 0.0
.text 1257688 1257688 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2280368 2280368 0 0.0
.bss 172492 172492 0 0.0
.data 5488 5488 0 0.0
.heap 858464 858464 0 0.0
.text 1242968 1242968 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2253448 2253448 0 0.0
.bss 171308 171308 0 0.0
.data 5472 5472 0 0.0
.heap 859664 859664 0 0.0
.text 1216048 1216048 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139744 1139744 0 0.0
.bss 11752 11752 0 0.0
.data 4368 4368 0 0.0
.heap 1020328 1020328 0 0.0
.text 103128 103128 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2051040 2051040 0 0.0
.bss 156496 156496 0 0.0
.data 4872 4872 0 0.0
.heap 875080 875080 0 0.0
.text 1013640 1013640 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 875615 875615 0 0.0
bss 112660 112660 0 0.0
rodata 97296 97296 0 0.0
text 590116 590116 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 838063 838063 0 0.0
bss 109012 109012 0 0.0
rodata 88560 88560 0 0.0
text 564284 564284 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 800650 800650 0 0.0
bss 114036 114036 0 0.0
rodata 92556 92556 0 0.0
text 519580 519580 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 846539 846539 0 0.0
bss 109700 109700 0 0.0
rodata 93084 93084 0 0.0
text 568388 568388 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 771810 771810 0 0.0
bss 111108 111108 0 0.0
rodata 88372 88372 0 0.0
text 497940 497940 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497327 497327 0 0.0
bss 51824 51824 0 0.0
rodata 45780 45780 0 0.0
text 339436 339436 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 852511 852511 0 0.0
bss 109836 109836 0 0.0
rodata 94792 94792 0 0.0
text 572432 572432 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 845615 845615 0 0.0
bss 109712 109712 0 0.0
rodata 92952 92952 0 0.0
text 567512 567512 0 0.0
shell nrf52840dk_nrf52840 (read/write) 778451 778451 0 0.0
bss 109180 109180 0 0.0
rodata 73192 73192 0 0.0
text 521576 521576 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 693482 693482 0 0.0
bss 110164 110164 0 0.0
rodata 67836 67836 0 0.0
text 442184 442184 0 0.0
p6 all-clusters-app default (read/write) 2311416 2311416 0 0.0
.bss 114688 114688 0 0.0
.data 2432 2432 0 0.0
.heap 916224 916224 0 0.0
.text 1269680 1269680 0 0.0
lock-app default (read/write) 2223232 2223232 0 0.0
.bss 100976 100976 0 0.0
.data 2304 2304 0 0.0
.heap 930064 930064 0 0.0
.text 1181496 1181496 0 0.0
qpg lighting-app qpg6100+debug (read only) 493652 493652 0 0.0
(read/write) 114144 114144 0 0.0
.bss 77464 77464 0 0.0
.data 920 920 0 0.0
.text 488332 488332 0 0.0
lock-app qpg6100+debug (read only) 466328 466328 0 0.0
(read/write) 114144 114144 0 0.0
.bss 76376 76376 0 0.0
.data 872 872 0 0.0
.text 461008 461008 0 0.0
persistent-storage-app qpg6100+debug (read only) 105612 105612 0 0.0
(read/write) 114138 114138 0 0.0
.bss 35218 35218 0 0.0
.data 276 276 0 0.0
.text 100292 100292 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 777398 777398 0 0.0
bss 79236 79236 0 0.0
noinit 37160 37160 0 0.0
text 540724 540724 0 0.0

woody-apple
woody-apple approved these changes Nov 30, 2021
View reviewed changes
Copy link
Contributor

@woody-apple woody-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fast tracking, given this is a platform maintainer updating platform code.

@Damian-Nordic Damian-Nordic merged commit a9ffa78 into project-chip:master Nov 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@woody-apple woody-apple woody-apple approved these changes

@Damian-Nordic Damian-Nordic Damian-Nordic approved these changes

@andy31415 andy31415 Awaiting requested review from andy31415

@anush-apple anush-apple Awaiting requested review from anush-apple

@balducci-apple balducci-apple Awaiting requested review from balducci-apple

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@carol-apple carol-apple Awaiting requested review from carol-apple

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chulspro chulspro Awaiting requested review from chulspro

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@franck-apple franck-apple Awaiting requested review from franck-apple

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@hawk248 hawk248 Awaiting requested review from hawk248

@holbrookt holbrookt Awaiting requested review from holbrookt

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@LuDuda LuDuda Awaiting requested review from LuDuda

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@pan-apple pan-apple Awaiting requested review from pan-apple

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

Assignees
No one assigned
Labels
controller fast track review - pending
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@austinh0 @woody-apple @Damian-Nordic