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

[binding] remove binding when corresponding fabric removed #14487

Merged
merged 2 commits into from
Feb 3, 2022
Merged

[binding] remove binding when corresponding fabric removed #14487

merged 2 commits into from
Feb 3, 2022

Conversation

gjc13
Copy link
Contributor

@gjc13 gjc13 commented Jan 28, 2022

Problem

Binding table entries are not correctly removed when fabric is removed.

Change overview

  • Make FabricTableDelegate a linked list to support multiple handlers.
  • Remove the bindint table entries when corresponding fabric removed.

Testing

chip-tool pairing ethernet 2 20202021 3840 172.17.0.3 5540
chip-tool binding bind 1 0 1 6 2 1
chip-tool operationalcredentials remove-fabric 1 2 0

Can observe binding removed log in the output.

@boring-cyborg boring-cyborg bot added the app label Jan 28, 2022
@github-actions
Copy link

github-actions bot commented Jan 28, 2022 •
edited
Loading

PR #14487: Size comparison from d2fded9 to 1c43f7b

Increases above 0.2%:

platform target config section d2fded9 1c43f7b change % change
cyw30739 light cyw930739m2evb_01 .data 596 600 4 0.7
lock-app CYW30739 .data 560 564 4 0.7
efr32 lighting-app BRD4161A .data 1900 1904 4 0.2
window-app BRD4161A .data 1856 1860 4 0.2
linux thermostat-no-ble arm64 .data 960 984 24 2.5
p6 all-clusters-app default .data 2584 2592 8 0.3
lock-app default .data 2360 2368 8 0.3
qpg lighting-app qpg6105+debug .data 1060 1064 4 0.4
lock-app qpg6105+debug .data 992 996 4 0.4
Increases (15 builds for cyw30739, efr32, k32w, linux, p6, qpg, telink)
platform target config section d2fded9 1c43f7b change % change
cyw30739 light cyw930739m2evb_01 (read/write) 578130 578306 176 0.0
.app_xip_area 484224 484400 176 0.0
.data 596 600 4 0.7
lock-app CYW30739 (read/write) 536142 536330 188 0.0
.app_xip_area 443780 443960 180 0.0
.data 560 564 4 0.7
efr32 lighting-app BRD4161A (read only) 842984 843456 472 0.1
.data 1900 1904 4 0.2
.text 842976 843448 472 0.1
BRD4161A+rpc (read only) 830336 830816 480 0.1
(read/write) 142856 142864 8 0.0
.data 2000 2004 4 0.2
.text 830328 830808 480 0.1
window-app BRD4161A (read only) 815560 816048 488 0.1
(read/write) 124852 124860 8 0.0
.data 1856 1860 4 0.2
.text 815552 816040 488 0.1
k32w light k32w061+release (read/write) 662940 663364 424 0.1
.data 1868 1872 4 0.2
.text 578844 579264 420 0.1
lock k32w061+release (read/write) 663844 664264 420 0.1
.data 1892 1896 4 0.2
.text 579460 579876 416 0.1
linux chip-tool-ipv6only arm64 (read only) 6765620 6766644 1024 0.0
(read/write) 279201 279249 48 0.0
.data.rel.ro 175984 176008 24 0.0
.got 42784 42800 16 0.0
.text 5806628 5807540 912 0.0
thermostat-no-ble arm64 (read only) 2080620 2082508 1888 0.1
.data 960 984 24 2.5
.data.rel.ro 74288 74336 48 0.1
.got 4144 4152 8 0.2
.rodata 129932 130012 80 0.1
.text 1733344 1734960 1616 0.1
p6 all-clusters-app default (read/write) 2441656 2442368 712 0.0
.data 2584 2592 8 0.3
.text 1399920 1400632 712 0.1
light-app default (read/write) 2338568 2338808 240 0.0
.text 1296832 1297072 240 0.0
lock-app default (read/write) 2304080 2304312 232 0.0
.data 2360 2368 8 0.3
.text 1262344 1262576 232 0.0
qpg lighting-app qpg6105+debug (read only) 570884 571296 412 0.1
(read/write) 146936 146940 4 0.0
.data 1060 1064 4 0.4
.text 565564 565976 412 0.1
lock-app qpg6105+debug (read only) 517004 517424 420 0.1
.data 992 996 4 0.4
.text 511684 512104 420 0.1
telink lighting-app tlsr9518adk80d (read/write) 845770 846478 708 0.1
text 592508 593092 584 0.1
Decreases (2 builds for linux, qpg)
platform target config section d2fded9 1c43f7b change % change
linux thermostat-no-ble arm64 .bss 67169 67089 -80 -0.1
qpg lock-app qpg6105+debug (read/write) 146940 146936 -4 -0.0
Full report (16 builds for cyw30739, efr32, k32w, linux, p6, qpg, telink)
platform target config section d2fded9 1c43f7b change % change
cyw30739 light cyw930739m2evb_01 (read/write) 578130 578306 176 0.0
.app_xip_area 484224 484400 176 0.0
.bss 76652 76652 0 0.0
.data 596 600 4 0.7
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock-app CYW30739 (read/write) 536142 536330 188 0.0
.app_xip_area 443780 443960 180 0.0
.bss 75148 75148 0 0.0
.data 560 564 4 0.7
.rodata 0 0 0 0.0
.text 0 0 0 0.0
efr32 lighting-app BRD4161A (read only) 842984 843456 472 0.1
(read/write) 126200 126200 0 0.0
.bss 124296 124296 0 0.0
.data 1900 1904 4 0.2
.text 842976 843448 472 0.1
BRD4161A+rpc (read only) 830336 830816 480 0.1
(read/write) 142856 142864 8 0.0
.bss 140856 140856 0 0.0
.data 2000 2004 4 0.2
.text 830328 830808 480 0.1
window-app BRD4161A (read only) 815560 816048 488 0.1
(read/write) 124852 124860 8 0.0
.bss 122996 122996 0 0.0
.data 1856 1860 4 0.2
.text 815552 816040 488 0.1
k32w light k32w061+release (read/write) 662940 663364 424 0.1
.bss 76428 76428 0 0.0
.data 1868 1872 4 0.2
.text 578844 579264 420 0.1
lock k32w061+release (read/write) 663844 664264 420 0.1
.bss 76692 76692 0 0.0
.data 1892 1896 4 0.2
.text 579460 579876 416 0.1
linux chip-tool-ipv6only arm64 (read only) 6765620 6766644 1024 0.0
(read/write) 279201 279249 48 0.0
.bss 55537 55537 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 175984 176008 24 0.0
.dynamic 560 560 0 0.0
.got 42784 42800 16 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 386892 386892 0 0.0
.text 5806628 5807540 912 0.0
thermostat-no-ble arm64 (read only) 2080620 2082508 1888 0.1
(read/write) 149537 149537 0 0.0
.bss 67169 67089 -80 -0.1
.data 960 984 24 2.5
.data.rel.ro 74288 74336 48 0.1
.dynamic 560 560 0 0.0
.got 4144 4152 8 0.2
.init 24 24 0 0.0
.init_array 336 336 0 0.0
.rodata 129932 130012 80 0.1
.text 1733344 1734960 1616 0.1
p6 all-clusters-app default (read/write) 2441656 2442368 712 0.0
.bss 116740 116740 0 0.0
.data 2584 2592 8 0.3
.text 1399920 1400632 712 0.1
light-app default (read/write) 2338568 2338808 240 0.0
.bss 104484 104484 0 0.0
.data 2408 2408 0 0.0
.text 1296832 1297072 240 0.0
lock-app default (read/write) 2304080 2304312 232 0.0
.bss 104228 104228 0 0.0
.data 2360 2368 8 0.3
.text 1262344 1262576 232 0.0
qpg lighting-app qpg6105+debug (read only) 570884 571296 412 0.1
(read/write) 146936 146940 4 0.0
.bss 88640 88640 0 0.0
.data 1060 1064 4 0.4
.text 565564 565976 412 0.1
lock-app qpg6105+debug (read only) 517004 517424 420 0.1
(read/write) 146940 146936 -4 -0.0
.bss 88112 88112 0 0.0
.data 992 996 4 0.4
.text 511684 512104 420 0.1
persistent-storage-app qpg6105+debug (read only) 107140 107140 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38504 38504 0 0.0
.data 288 288 0 0.0
.text 101820 101820 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 845770 846478 708 0.1
bss 86440 86440 0 0.0
noinit 37160 37160 0 0.0
text 592508 593092 584 0.1

@github-actions
Copy link

github-actions bot commented Jan 28, 2022 •
edited
Loading

PR #14487: Size comparison from d2fded9 to 11b9fe9

Increases above 0.2%:

platform target config section d2fded9 11b9fe9 change % change
cyw30739 light cyw930739m2evb_01 .data 596 600 4 0.7
lock-app CYW30739 .data 560 564 4 0.7
linux thermostat-no-ble arm64 .data 960 984 24 2.5
mbed all-clusters-app CY8CPROTO_062_4343W+release .data 5288 5304 16 0.3
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 981375 984359 2984 0.3
text 668228 671080 2852 0.4
nrf52840dk_nrf52840+rpc (read/write) 966923 969903 2980 0.3
text 664672 667524 2852 0.4
nrf52840dongle_nrf52840 (read/write) 997459 1000439 2980 0.3
text 673656 676508 2852 0.4
lock-app nrf52840dk_nrf52840 (read/write) 913955 916959 3004 0.3
text 614212 617064 2852 0.5
pump-app nrf52840dk_nrf52840 (read/write) 916819 919815 2996 0.3
text 616748 619600 2852 0.5
pump-controller-app nrf52840dk_nrf52840 (read/write) 912003 915007 3004 0.3
text 612788 615640 2852 0.5
p6 all-clusters-app default .data 2584 2592 8 0.3
lock-app default .data 2360 2368 8 0.3
qpg lighting-app qpg6105+debug .data 1060 1064 4 0.4
lock-app qpg6105+debug .data 992 996 4 0.4
Increases (29 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section d2fded9 11b9fe9 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 578130 578322 192 0.0
.app_xip_area 484224 484416 192 0.0
.data 596 600 4 0.7
lock-app CYW30739 (read/write) 536142 536346 204 0.0
.app_xip_area 443780 443976 196 0.0
.data 560 564 4 0.7
efr32 lighting-app BRD4161A (read only) 842984 843488 504 0.1
.data 1900 1904 4 0.2
.text 842976 843480 504 0.1
BRD4161A+rpc (read only) 830336 830848 512 0.1
(read/write) 142856 142864 8 0.0
.data 2000 2004 4 0.2
.text 830328 830840 512 0.1
window-app BRD4161A (read only) 815560 816064 504 0.1
(read/write) 124852 124860 8 0.0
.data 1856 1860 4 0.2
.text 815552 816056 504 0.1
esp32 all-clusters-app c3devkit (read only) 932870 933436 566 0.1
(read/write) 1397322 1397434 112 0.0
.dram0.data 14244 14252 8 0.1
.flash.rodata 194480 194592 112 0.1
.flash.text 932870 933436 566 0.1
m5stack (read only) 980767 981183 416 0.0
(read/write) 461692 461820 128 0.0
.dram0.data 34024 34040 16 0.0
.flash.rodata 221108 221220 112 0.1
.flash.text 975383 975799 416 0.0
k32w light k32w061+release (read/write) 662940 663380 440 0.1
.data 1868 1872 4 0.2
.text 578844 579280 436 0.1
lock k32w061+release (read/write) 663844 664280 436 0.1
.data 1892 1896 4 0.2
.text 579460 579892 432 0.1
linux chip-tool-ipv6only arm64 (read only) 6765620 6766644 1024 0.0
(read/write) 279201 279249 48 0.0
.data.rel.ro 175984 176008 24 0.0
.got 42784 42800 16 0.0
.text 5806628 5807540 912 0.0
thermostat-no-ble arm64 (read only) 2080620 2082604 1984 0.1
.data 960 984 24 2.5
.data.rel.ro 74288 74336 48 0.1
.got 4144 4152 8 0.2
.rodata 129932 130012 80 0.1
.text 1733344 1735056 1712 0.1
mbed all-clusters-app CY8CPROTO_062_4343W+release (read/write) 2382408 2382904 496 0.0
.data 5288 5304 16 0.3
.text 1345008 1345504 496 0.0
lighting-app CY8CPROTO_062_4343W+release (read/write) 2338200 2338384 184 0.0
.text 1300800 1300984 184 0.0
lock-app CY8CPROTO_062_4343W+release (read/write) 2302240 2302368 128 0.0
.text 1264840 1264968 128 0.0
shell CY8CPROTO_062_4343W+release (read/write) 2292980 2293092 112 0.0
.text 1255552 1255664 112 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 981375 984359 2984 0.3
rodata 115684 115772 88 0.1
text 668228 671080 2852 0.4
nrf52840dk_nrf52840+rpc (read/write) 966923 969903 2980 0.3
rodata 107160 107252 92 0.1
text 664672 667524 2852 0.4
nrf52840dongle_nrf52840 (read/write) 997459 1000439 2980 0.3
rodata 114516 114608 92 0.1
text 673656 676508 2852 0.4
nrf5340dk_nrf5340_cpuapp (read/write) 890546 890802 256 0.0
rodata 108964 109020 56 0.1
text 584416 584608 192 0.0
lock-app nrf52840dk_nrf52840 (read/write) 913955 916959 3004 0.3
rodata 104320 104412 92 0.1
text 614212 617064 2852 0.5
nrf5340dk_nrf5340_cpuapp (read/write) 824006 824254 248 0.0
rodata 97528 97584 56 0.1
text 531172 531364 192 0.0
pump-app nrf52840dk_nrf52840 (read/write) 916819 919815 2996 0.3
rodata 104832 104924 92 0.1
text 616748 619600 2852 0.5
pump-controller-app nrf52840dk_nrf52840 (read/write) 912003 915007 3004 0.3
rodata 103936 104028 92 0.1
text 612788 615640 2852 0.5
p6 all-clusters-app default (read/write) 2441656 2442384 728 0.0
.data 2584 2592 8 0.3
.text 1399920 1400648 728 0.1
light-app default (read/write) 2338568 2338824 256 0.0
.text 1296832 1297088 256 0.0
lock-app default (read/write) 2304080 2304344 264 0.0
.data 2360 2368 8 0.3
.text 1262344 1262608 264 0.0
qpg lighting-app qpg6105+debug (read only) 570884 571312 428 0.1
(read/write) 146936 146940 4 0.0
.data 1060 1064 4 0.4
.text 565564 565992 428 0.1
lock-app qpg6105+debug (read only) 517004 517440 436 0.1
.data 992 996 4 0.4
.text 511684 512120 436 0.1
telink lighting-app tlsr9518adk80d (read/write) 845770 846494 724 0.1
text 592508 593108 600 0.1
Decreases (2 builds for linux, qpg)
platform target config section d2fded9 11b9fe9 change % change
linux thermostat-no-ble arm64 .bss 67169 67089 -80 -0.1
qpg lock-app qpg6105+debug (read/write) 146940 146936 -4 -0.0
Full report (33 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section d2fded9 11b9fe9 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 578130 578322 192 0.0
.app_xip_area 484224 484416 192 0.0
.bss 76652 76652 0 0.0
.data 596 600 4 0.7
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock-app CYW30739 (read/write) 536142 536346 204 0.0
.app_xip_area 443780 443976 196 0.0
.bss 75148 75148 0 0.0
.data 560 564 4 0.7
.rodata 0 0 0 0.0
.text 0 0 0 0.0
efr32 lighting-app BRD4161A (read only) 842984 843488 504 0.1
(read/write) 126200 126200 0 0.0
.bss 124296 124296 0 0.0
.data 1900 1904 4 0.2
.text 842976 843480 504 0.1
BRD4161A+rpc (read only) 830336 830848 512 0.1
(read/write) 142856 142864 8 0.0
.bss 140856 140856 0 0.0
.data 2000 2004 4 0.2
.text 830328 830840 512 0.1
window-app BRD4161A (read only) 815560 816064 504 0.1
(read/write) 124852 124860 8 0.0
.bss 122996 122996 0 0.0
.data 1856 1860 4 0.2
.text 815552 816056 504 0.1
esp32 all-clusters-app c3devkit (read only) 932870 933436 566 0.1
(read/write) 1397322 1397434 112 0.0
.dram0.bss 69688 69688 0 0.0
.dram0.data 14244 14252 8 0.1
.flash.rodata 194480 194592 112 0.1
.flash.text 932870 933436 566 0.1
.iram0.text 62056 62056 0 0.0
m5stack (read only) 980767 981183 416 0.0
(read/write) 461692 461820 128 0.0
.dram0.bss 74432 74432 0 0.0
.dram0.data 34024 34040 16 0.0
.flash.rodata 221108 221220 112 0.1
.flash.text 975383 975799 416 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 662940 663380 440 0.1
.bss 76428 76428 0 0.0
.data 1868 1872 4 0.2
.text 578844 579280 436 0.1
lock k32w061+release (read/write) 663844 664280 436 0.1
.bss 76692 76692 0 0.0
.data 1892 1896 4 0.2
.text 579460 579892 432 0.1
linux chip-tool-ipv6only arm64 (read only) 6765620 6766644 1024 0.0
(read/write) 279201 279249 48 0.0
.bss 55537 55537 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 175984 176008 24 0.0
.dynamic 560 560 0 0.0
.got 42784 42800 16 0.0
.init 24 24 0 0.0
.init_array 200 200 0 0.0
.rodata 386892 386892 0 0.0
.text 5806628 5807540 912 0.0
thermostat-no-ble arm64 (read only) 2080620 2082604 1984 0.1
(read/write) 149537 149537 0 0.0
.bss 67169 67089 -80 -0.1
.data 960 984 24 2.5
.data.rel.ro 74288 74336 48 0.1
.dynamic 560 560 0 0.0
.got 4144 4152 8 0.2
.init 24 24 0 0.0
.init_array 336 336 0 0.0
.rodata 129932 130012 80 0.1
.text 1733344 1735056 1712 0.1
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2382408 2382904 496 0.0
.bss 188588 188588 0 0.0
.data 5288 5304 16 0.3
.text 1345008 1345504 496 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2338200 2338384 184 0.0
.bss 179304 179304 0 0.0
.data 5584 5584 0 0.0
.text 1300800 1300984 184 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2302240 2302368 128 0.0
.bss 179208 179208 0 0.0
.data 5552 5552 0 0.0
.text 1264840 1264968 128 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2292980 2293092 112 0.0
.bss 176532 176532 0 0.0
.data 5384 5384 0 0.0
.text 1255552 1255664 112 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 981375 984359 2984 0.3
bss 119660 119660 0 0.0
rodata 115684 115772 88 0.1
text 668228 671080 2852 0.4
nrf52840dk_nrf52840+rpc (read/write) 966923 969903 2980 0.3
bss 116704 116704 0 0.0
rodata 107160 107252 92 0.1
text 664672 667524 2852 0.4
nrf52840dongle_nrf52840 (read/write) 997459 1000439 2980 0.3
bss 120832 120832 0 0.0
rodata 114516 114608 92 0.1
text 673656 676508 2852 0.4
nrf5340dk_nrf5340_cpuapp (read/write) 890546 890802 256 0.0
bss 116448 116448 0 0.0
rodata 108964 109020 56 0.1
text 584416 584608 192 0.0
lock-app nrf52840dk_nrf52840 (read/write) 913955 916959 3004 0.3
bss 118040 118040 0 0.0
rodata 104320 104412 92 0.1
text 614212 617064 2852 0.5
nrf5340dk_nrf5340_cpuapp (read/write) 824006 824254 248 0.0
bss 114856 114856 0 0.0
rodata 97528 97584 56 0.1
text 531172 531364 192 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 541779 541779 0 0.0
bss 52588 52588 0 0.0
rodata 50048 50048 0 0.0
text 376940 376940 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 916819 919815 2996 0.3
bss 117792 117792 0 0.0
rodata 104832 104924 92 0.1
text 616748 619600 2852 0.5
pump-controller-app nrf52840dk_nrf52840 (read/write) 912003 915007 3004 0.3
bss 117816 117816 0 0.0
rodata 103936 104028 92 0.1
text 612788 615640 2852 0.5
shell nrf52840dk_nrf52840 (read/write) 798203 798203 0 0.0
bss 109776 109776 0 0.0
rodata 78288 78288 0 0.0
text 533640 533640 0 0.0
p6 all-clusters-app default (read/write) 2441656 2442384 728 0.0
.bss 116740 116740 0 0.0
.data 2584 2592 8 0.3
.text 1399920 1400648 728 0.1
light-app default (read/write) 2338568 2338824 256 0.0
.bss 104484 104484 0 0.0
.data 2408 2408 0 0.0
.text 1296832 1297088 256 0.0
lock-app default (read/write) 2304080 2304344 264 0.0
.bss 104228 104228 0 0.0
.data 2360 2368 8 0.3
.text 1262344 1262608 264 0.0
qpg lighting-app qpg6105+debug (read only) 570884 571312 428 0.1
(read/write) 146936 146940 4 0.0
.bss 88640 88640 0 0.0
.data 1060 1064 4 0.4
.text 565564 565992 428 0.1
lock-app qpg6105+debug (read only) 517004 517440 436 0.1
(read/write) 146940 146936 -4 -0.0
.bss 88112 88112 0 0.0
.data 992 996 4 0.4
.text 511684 512120 436 0.1
persistent-storage-app qpg6105+debug (read only) 107140 107140 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38504 38504 0 0.0
.data 288 288 0 0.0
.text 101820 101820 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 845770 846494 724 0.1
bss 86440 86440 0 0.0
noinit 37160 37160 0 0.0
text 592508 593108 600 0.1

bzbarsky-apple
bzbarsky-apple reviewed Jan 29, 2022
View reviewed changes
Copy link
Contributor

@bzbarsky-apple bzbarsky-apple left a comment

Choose a reason for hiding this comment

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

This seems pretty reasonable, but also looks like it will conflict with #14303. I'd really prefer to review this after that lands and this is merged/rebased...

src/credentials/FabricTable.h Outdated Show resolved Hide resolved
@pullapprove pullapprove bot requested a review from isiu-apple January 29, 2022 06:31
@gjc13
Copy link
Contributor Author

gjc13 commented Feb 2, 2022

This seems pretty reasonable, but also looks like it will conflict with #14303. I'd really prefer to review this after that lands and this is merged/rebased...

Since it's a long holiday in Shanghai and it will be some time before I can address the commentes in #14303, maybe we can merge this first? I'll rebase #14303 after I'm back in office next Monday. @bzbarsky-apple

@bzbarsky-apple
Copy link
Contributor

We can do that, but I thought 14303 was pretty close.... and importantly it will need a wholesale re-review on top of these changes. Which will delay it landing even more.... But whichever you prefer.

@bzbarsky-apple
Copy link
Contributor

/rebase

@github-actions
Copy link

github-actions bot commented Feb 3, 2022 •
edited
Loading

PR #14487: Size comparison from 2294bcc to 7e8a072

Increases above 0.2%:

platform target config section 2294bcc 7e8a072 change % change
cyw30739 light cyw930739m2evb_01 .data 596 600 4 0.7
lock cyw930739m2evb_01 .data 560 564 4 0.7
ota-requestor cyw930739m2evb_01 .data 504 508 4 0.8
linux thermostat-no-ble arm64 .data 952 976 24 2.5
mbed all-clusters-app CY8CPROTO_062_4343W+release .data 5288 5304 16 0.3
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 980975 983959 2984 0.3
text 668596 671448 2852 0.4
nrf52840dk_nrf52840+rpc (read/write) 966535 969531 2996 0.3
text 665040 667892 2852 0.4
nrf52840dongle_nrf52840 (read/write) 997039 1000019 2980 0.3
text 673972 676824 2852 0.4
lock-app nrf52840dk_nrf52840 (read/write) 913319 916299 2980 0.3
text 614704 617556 2852 0.5
pump-app nrf52840dk_nrf52840 (read/write) 915987 918975 2988 0.3
text 617048 619900 2852 0.5
pump-controller-app nrf52840dk_nrf52840 (read/write) 911195 914175 2980 0.3
text 613104 615956 2852 0.5
p6 all-clusters-app default .data 2576 2584 8 0.3
light-app default .data 2400 2408 8 0.3
lock-app default .data 2360 2368 8 0.3
qpg lighting-app qpg6105+debug .data 1056 1060 4 0.4
lock-app qpg6105+debug .data 992 996 4 0.4
Increases (30 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 2294bcc 7e8a072 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 577390 577582 192 0.0
.app_xip_area 484884 485076 192 0.0
.data 596 600 4 0.7
lock cyw930739m2evb_01 (read/write) 535134 535330 196 0.0
.app_xip_area 444196 444384 188 0.0
.data 560 564 4 0.7
ota-requestor cyw930739m2evb_01 (read/write) 559618 559826 208 0.0
.app_xip_area 459360 459560 200 0.0
.data 504 508 4 0.8
efr32 lighting-app BRD4161A (read only) 844328 844840 512 0.1
.data 1892 1896 4 0.2
.text 844320 844832 512 0.1
BRD4161A+rpc (read only) 831704 832192 488 0.1
(read/write) 141448 141456 8 0.0
.data 1992 1996 4 0.2
.text 831696 832184 488 0.1
window-app BRD4161A (read only) 816404 816900 496 0.1
(read/write) 123412 123416 4 0.0
.data 1848 1852 4 0.2
.text 816396 816892 496 0.1
esp32 all-clusters-app c3devkit (read only) 934598 935164 566 0.1
(read/write) 1401002 1401138 136 0.0
.dram0.data 14268 14276 8 0.1
.flash.rodata 197792 197912 120 0.1
.flash.text 934598 935164 566 0.1
m5stack (read only) 982723 983207 484 0.0
(read/write) 465360 465496 136 0.0
.dram0.data 34024 34040 16 0.0
.flash.rodata 224400 224520 120 0.1
.flash.text 977339 977823 484 0.0
k32w light k32w061+release (read/write) 661620 662060 440 0.1
.data 1852 1856 4 0.2
.text 579020 579456 436 0.1
lock k32w061+release (read/write) 662880 663316 436 0.1
.data 1892 1896 4 0.2
.text 579920 580352 432 0.1
linux chip-tool-ipv6only arm64 (read only) 7120532 7121572 1040 0.0
(read/write) 284545 284593 48 0.0
.data.rel.ro 186712 186736 24 0.0
.got 45336 45352 16 0.0
.text 6127236 6128148 912 0.0
thermostat-no-ble arm64 (read only) 2091484 2093468 1984 0.1
(read/write) 140401 140481 80 0.1
.data 952 976 24 2.5
.data.rel.ro 74624 74672 48 0.1
.got 4136 4144 8 0.2
.rodata 130764 130844 80 0.1
.text 1743008 1744720 1712 0.1
mbed all-clusters-app CY8CPROTO_062_4343W+release (read/write) 2386056 2386560 504 0.0
.data 5288 5304 16 0.3
.text 1348656 1349160 504 0.0
lighting-app CY8CPROTO_062_4343W+release (read/write) 2338744 2338864 120 0.0
.data 5568 5576 8 0.1
.text 1301344 1301464 120 0.0
lock-app CY8CPROTO_062_4343W+release (read/write) 2302600 2302720 120 0.0
.data 5544 5552 8 0.1
.text 1265200 1265320 120 0.0
shell CY8CPROTO_062_4343W+release (read/write) 2292980 2293092 112 0.0
.data 5368 5376 8 0.1
.text 1255552 1255664 112 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 980975 983959 2984 0.3
rodata 116324 116412 88 0.1
text 668596 671448 2852 0.4
nrf52840dk_nrf52840+rpc (read/write) 966535 969531 2996 0.3
rodata 107796 107888 92 0.1
text 665040 667892 2852 0.4
nrf52840dongle_nrf52840 (read/write) 997039 1000019 2980 0.3
rodata 115168 115260 92 0.1
text 673972 676824 2852 0.4
nrf5340dk_nrf5340_cpuapp (read/write) 890190 890446 256 0.0
rodata 109616 109672 56 0.1
text 584788 584980 192 0.0
lock-app nrf52840dk_nrf52840 (read/write) 913319 916299 2980 0.3
rodata 104596 104688 92 0.1
text 614704 617556 2852 0.5
nrf5340dk_nrf5340_cpuapp (read/write) 823350 823598 248 0.0
rodata 97800 97856 56 0.1
text 531672 531864 192 0.0
pump-app nrf52840dk_nrf52840 (read/write) 915987 918975 2988 0.3
rodata 105112 105204 92 0.1
text 617048 619900 2852 0.5
pump-controller-app nrf52840dk_nrf52840 (read/write) 911195 914175 2980 0.3
rodata 104216 104308 92 0.1
text 613104 615956 2852 0.5
p6 all-clusters-app default (read/write) 2447224 2447936 712 0.0
.data 2576 2584 8 0.3
.text 1405488 1406200 712 0.1
light-app default (read/write) 2340864 2341128 264 0.0
.data 2400 2408 8 0.3
.text 1299128 1299392 264 0.0
lock-app default (read/write) 2305896 2306144 248 0.0
.data 2360 2368 8 0.3
.text 1264160 1264408 248 0.0
qpg lighting-app qpg6105+debug (read only) 571244 571696 452 0.1
.data 1056 1060 4 0.4
.text 565924 566376 452 0.1
lock-app qpg6105+debug (read only) 517084 517536 452 0.1
.data 992 996 4 0.4
.text 511764 512216 452 0.1
telink lighting-app tlsr9518adk80d (read/write) 845594 846318 724 0.1
text 592830 593430 600 0.1
Decreases (2 builds for qpg)
platform target config section 2294bcc 7e8a072 change % change
qpg lighting-app qpg6105+debug (read/write) 146940 146936 -4 -0.0
lock-app qpg6105+debug (read/write) 146940 146936 -4 -0.0
Full report (34 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 2294bcc 7e8a072 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 577390 577582 192 0.0
.app_xip_area 484884 485076 192 0.0
.bss 75252 75252 0 0.0
.data 596 600 4 0.7
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 535134 535330 196 0.0
.app_xip_area 444196 444384 188 0.0
.bss 73724 73724 0 0.0
.data 560 564 4 0.7
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 559618 559826 208 0.0
.app_xip_area 459360 459560 200 0.0
.bss 82716 82716 0 0.0
.data 504 508 4 0.8
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 844328 844840 512 0.1
(read/write) 124792 124792 0 0.0
.bss 122896 122896 0 0.0
.data 1892 1896 4 0.2
.text 844320 844832 512 0.1
BRD4161A+rpc (read only) 831704 832192 488 0.1
(read/write) 141448 141456 8 0.0
.bss 139456 139456 0 0.0
.data 1992 1996 4 0.2
.text 831696 832184 488 0.1
window-app BRD4161A (read only) 816404 816900 496 0.1
(read/write) 123412 123416 4 0.0
.bss 121564 121564 0 0.0
.data 1848 1852 4 0.2
.text 816396 816892 496 0.1
esp32 all-clusters-app c3devkit (read only) 934598 935164 566 0.1
(read/write) 1401002 1401138 136 0.0
.dram0.bss 70048 70048 0 0.0
.dram0.data 14268 14276 8 0.1
.flash.rodata 197792 197912 120 0.1
.flash.text 934598 935164 566 0.1
.iram0.text 62056 62056 0 0.0
m5stack (read only) 982723 983207 484 0.0
(read/write) 465360 465496 136 0.0
.dram0.bss 74808 74808 0 0.0
.dram0.data 34024 34040 16 0.0
.flash.rodata 224400 224520 120 0.1
.flash.text 977339 977823 484 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 661620 662060 440 0.1
.bss 74948 74948 0 0.0
.data 1852 1856 4 0.2
.text 579020 579456 436 0.1
lock k32w061+release (read/write) 662880 663316 436 0.1
.bss 75268 75268 0 0.0
.data 1892 1896 4 0.2
.text 579920 580352 432 0.1
linux chip-tool-ipv6only arm64 (read only) 7120532 7121572 1040 0.0
(read/write) 284545 284593 48 0.0
.bss 47585 47585 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 186712 186736 24 0.0
.dynamic 560 560 0 0.0
.got 45336 45352 16 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 391564 391564 0 0.0
.text 6127236 6128148 912 0.0
thermostat-no-ble arm64 (read only) 2091484 2093468 1984 0.1
(read/write) 140401 140481 80 0.1
.bss 57713 57713 0 0.0
.data 952 976 24 2.5
.data.rel.ro 74624 74672 48 0.1
.dynamic 560 560 0 0.0
.got 4136 4144 8 0.2
.init 24 24 0 0.0
.init_array 336 336 0 0.0
.rodata 130764 130844 80 0.1
.text 1743008 1744720 1712 0.1
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2386056 2386560 504 0.0
.bss 188964 188964 0 0.0
.data 5288 5304 16 0.3
.text 1348656 1349160 504 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2338744 2338864 120 0.0
.bss 177888 177888 0 0.0
.data 5568 5576 8 0.1
.text 1301344 1301464 120 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2302600 2302720 120 0.0
.bss 177776 177776 0 0.0
.data 5544 5552 8 0.1
.text 1265200 1265320 120 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2292980 2293092 112 0.0
.bss 175052 175052 0 0.0
.data 5368 5376 8 0.1
.text 1255552 1255664 112 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 980975 983959 2984 0.3
bss 118260 118260 0 0.0
rodata 116324 116412 88 0.1
text 668596 671448 2852 0.4
nrf52840dk_nrf52840+rpc (read/write) 966535 969531 2996 0.3
bss 115304 115304 0 0.0
rodata 107796 107888 92 0.1
text 665040 667892 2852 0.4
nrf52840dongle_nrf52840 (read/write) 997039 1000019 2980 0.3
bss 119432 119432 0 0.0
rodata 115168 115260 92 0.1
text 673972 676824 2852 0.4
nrf5340dk_nrf5340_cpuapp (read/write) 890190 890446 256 0.0
bss 115044 115044 0 0.0
rodata 109616 109672 56 0.1
text 584788 584980 192 0.0
lock-app nrf52840dk_nrf52840 (read/write) 913319 916299 2980 0.3
bss 116620 116620 0 0.0
rodata 104596 104688 92 0.1
text 614704 617556 2852 0.5
nrf5340dk_nrf5340_cpuapp (read/write) 823350 823598 248 0.0
bss 113440 113440 0 0.0
rodata 97800 97856 56 0.1
text 531672 531864 192 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 541779 541779 0 0.0
bss 52588 52588 0 0.0
rodata 50048 50048 0 0.0
text 376940 376940 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 915987 918975 2988 0.3
bss 116380 116380 0 0.0
rodata 105112 105204 92 0.1
text 617048 619900 2852 0.5
pump-controller-app nrf52840dk_nrf52840 (read/write) 911195 914175 2980 0.3
bss 116388 116388 0 0.0
rodata 104216 104308 92 0.1
text 613104 615956 2852 0.5
shell nrf52840dk_nrf52840 (read/write) 798875 798875 0 0.0
bss 109776 109776 0 0.0
rodata 78352 78352 0 0.0
text 534248 534248 0 0.0
p6 all-clusters-app default (read/write) 2447224 2447936 712 0.0
.bss 117116 117116 0 0.0
.data 2576 2584 8 0.3
.text 1405488 1406200 712 0.1
light-app default (read/write) 2340864 2341128 264 0.0
.bss 103084 103084 0 0.0
.data 2400 2408 8 0.3
.text 1299128 1299392 264 0.0
lock-app default (read/write) 2305896 2306144 248 0.0
.bss 102804 102804 0 0.0
.data 2360 2368 8 0.3
.text 1264160 1264408 248 0.0
qpg lighting-app qpg6105+debug (read only) 571244 571696 452 0.1
(read/write) 146940 146936 -4 -0.0
.bss 87232 87232 0 0.0
.data 1056 1060 4 0.4
.text 565924 566376 452 0.1
lock-app qpg6105+debug (read only) 517084 517536 452 0.1
(read/write) 146940 146936 -4 -0.0
.bss 86680 86680 0 0.0
.data 992 996 4 0.4
.text 511764 512216 452 0.1
persistent-storage-app qpg6105+debug (read only) 107140 107140 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38504 38504 0 0.0
.data 288 288 0 0.0
.text 101820 101820 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 845594 846318 724 0.1
bss 85288 85288 0 0.0
noinit 37160 37160 0 0.0
text 592830 593430 600 0.1

@bzbarsky-apple bzbarsky-apple merged commit 792167c into project-chip:master Feb 3, 2022
bzbarsky-apple added a commit to bzbarsky-apple/connectedhomeip that referenced this pull request Feb 4, 2022
@bzbarsky-apple
Fix merge error causing test failures.
058b7db 
Merging project-chip#14487
violated the API contract that was established in
project-chip#14688, so we
started failing tests.  The two PRs had never been run through CI
together.
@bzbarsky-apple bzbarsky-apple mentioned this pull request Feb 4, 2022
Merged
bzbarsky-apple added a commit to bzbarsky-apple/connectedhomeip that referenced this pull request Feb 4, 2022
@bzbarsky-apple
Fix merge error causing test failures.
c0460b2 
Merging project-chip#14487
violated the API contract that was established in
project-chip#14688, so we
started failing tests.  The two PRs had never been run through CI
together.
bzbarsky-apple added a commit that referenced this pull request Feb 4, 2022
@bzbarsky-apple
Fix merge error causing test failures. (#14773)
1fafe32 
Merging #14487
violated the API contract that was established in
#14688, so we
started failing tests.  The two PRs had never been run through CI
together.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andy31415 andy31415 andy31415 approved these changes

@msandstedt msandstedt msandstedt approved these changes

@bzbarsky-apple bzbarsky-apple bzbarsky-apple approved these changes

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

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

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

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

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

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

@hawk248 hawk248 Awaiting requested review from hawk248

@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

@kghost kghost Awaiting requested review from kghost

@LuDuda LuDuda Awaiting requested review from LuDuda

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

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

@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

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@vijs vijs Awaiting requested review from vijs

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

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

Assignees
No one assigned
Labels
app review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gjc13 @bzbarsky-apple @andy31415 @msandstedt