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

Remove mRemoteMRPConfig member from OperationalSessionSetup #21924

Merged

Conversation

tehampson
Copy link
Contributor

Problem

Change overview

  • Remove mRemoteMRPConfig member from OperationalSessionSetup since we can just rely on the information being on the stack.
  • Remove unused method OperationalSessionSetup::IsConnecting()
  • Make it more clear that we don't actually get into certain states anymore with the ephemeral OperationalSessionSetup refactor.

Testing

  • CI passes

@github-actions github-actions bot added the app label Aug 16, 2022
@github-actions
Copy link

github-actions bot commented Aug 16, 2022

PR #21924: Size comparison from 5a05207 to 7790e7e

Increases (17 builds for linux, p6)
platform target config section 5a05207 7790e7e change % change
linux all-clusters-app debug (read only) 3034065 3034113 48 0.0
.text 2580546 2580594 48 0.0
all-clusters-minimal-app debug (read only) 2873921 2873969 48 0.0
.text 2422914 2422962 48 0.0
bridge-app debug+rpc (read only) 2372777 2372825 48 0.0
.text 2006722 2006770 48 0.0
chip-tool debug (read only) 10725353 10725401 48 0.0
.text 8663396 8663444 48 0.0
chip-tool-ipv6only arm64 (read only) 10131452 10131484 32 0.0
.text 8007092 8007124 32 0.0
lighting-app debug+rpc (read only) 2596761 2596809 48 0.0
.text 2205842 2205890 48 0.0
lock-app debug (read only) 2580673 2580721 48 0.0
.text 2176754 2176802 48 0.0
ota-provider-app debug (read only) 2357833 2357881 48 0.0
.text 1985122 1985170 48 0.0
ota-requestor-app debug (read only) 2523049 2523097 48 0.0
.text 2134482 2134530 48 0.0
shell debug (read only) 2602369 2602417 48 0.0
.text 2209474 2209522 48 0.0
thermostat-no-ble arm64 (read only) 2356964 2356996 32 0.0
.text 1978720 1978752 32 0.0
tv-app debug (read only) 3173721 3173769 48 0.0
.text 2725122 2725170 48 0.0
tv-casting-app debug (read only) 5416113 5416161 48 0.0
.text 4805314 4805362 48 0.0
p6 all-clusters-app default (read only) 881368 881400 32 0.0
all-clusters-minimal-app default (read only) 882088 882120 32 0.0
light-app default (read only) 890432 890464 32 0.0
lock-app default (read only) 885936 885968 32 0.0
Decreases (30 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, mbed, nrfconnect, p6, telink)
platform target config section 5a05207 7790e7e change % change
bl602 lighting-app bl602 (read/write) 1383498 1383458 -40 -0.0
.bss 119906 119874 -32 -0.0
.text 1051032 1051028 -4 -0.0
bl602+rpc (read/write) 1429010 1428970 -40 -0.0
.bss 127346 127314 -32 -0.0
.text 1082792 1082788 -4 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 672371 672355 -16 -0.0
(read/write) 179140 179124 -16 -0.0
.bss 74404 74372 -32 -0.0
.text 583308 583292 -16 -0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 637763 637747 -16 -0.0
(read/write) 157980 157948 -32 -0.0
.bss 73692 73660 -32 -0.0
.text 559460 559444 -16 -0.0
lock-ftd LP_CC2652R7 (read only) 674095 674079 -16 -0.0
(read/write) 167632 167616 -16 -0.0
.bss 71508 71476 -32 -0.0
.text 596944 596928 -16 -0.0
lock-mtd LP_CC2652R7 (read only) 656839 656815 -24 -0.0
(read/write) 180576 180568 -8 -0.0
.bss 67196 67164 -32 -0.0
.text 554600 554576 -24 -0.0
pump-app LP_CC2652R7 (read only) 684767 684751 -16 -0.0
(read/write) 157768 157752 -16 -0.0
.bss 71548 71516 -32 -0.0
.text 594324 594308 -16 -0.0
pump-controller-app LP_CC2652R7 (read only) 669259 669243 -16 -0.0
(read/write) 173396 173380 -16 -0.0
.bss 71668 71636 -32 -0.0
.text 583264 583248 -16 -0.0
shell LP_CC2652R7 (read only) 665062 665046 -16 -0.0
(read/write) 181968 181952 -16 -0.0
.bss 76724 76692 -32 -0.0
.text 579052 579036 -16 -0.0
cyw30739 light cyw930739m2evb_01 (read/write) 586070 586014 -56 -0.0
.app_xip_area 462704 462680 -24 -0.0
.bss 65800 65768 -32 -0.0
lock cyw930739m2evb_01 (read/write) 591886 591830 -56 -0.0
.app_xip_area 463736 463712 -24 -0.0
.bss 70584 70552 -32 -0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 599026 598970 -56 -0.0
.app_xip_area 476380 476356 -24 -0.0
.bss 65112 65080 -32 -0.0
efr32 lighting-app BRD4161A (read/write) 1100620 1100460 -160 -0.0
.bss 133020 132988 -32 -0.0
.text 965512 965384 -128 -0.0
BRD4161A+rpc (read/write) 1154860 1154700 -160 -0.0
.bss 149708 149676 -32 -0.0
.text 1002852 1002724 -128 -0.0
BRD4161A+rs911x (read/write) 989748 989636 -112 -0.0
.bss 162344 162312 -32 -0.0
.text 825328 825248 -80 -0.0
lock-app BRD4161A+wf200 (read/write) 1139216 1139136 -80 -0.0
.bss 145520 145488 -32 -0.0
.text 991612 991564 -48 -0.0
window-app BRD4161A (read/write) 1092080 1091920 -160 -0.0
.bss 134460 134428 -32 -0.0
.text 955504 955376 -128 -0.0
esp32 all-clusters-app c3devkit (read only) 1029980 1029944 -36 -0.0
(read/write) 1488674 1488642 -32 -0.0
.dram0.bss 70864 70832 -32 -0.0
.flash.text 1029980 1029944 -36 -0.0
m5stack (read only) 1083335 1083283 -52 -0.0
(read/write) 490632 490600 -32 -0.0
.dram0.bss 76376 76344 -32 -0.0
.flash.text 1077951 1077899 -52 -0.0
k32w light k32w0+release (read/write) 645092 645028 -64 -0.0
.bss 69848 69816 -32 -0.0
.text 570472 570440 -32 -0.0
lock k32w0+release (read/write) 702644 702580 -64 -0.0
.bss 70320 70288 -32 -0.0
.text 627544 627512 -32 -0.0
mbed lock-app CY8CPROTO_062_4343W+release (read/write) 2454328 2454264 -64 -0.0
.bss 214692 214660 -32 -0.0
.text 1416972 1416908 -64 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1179683 1179539 -144 -0.0
bss 143375 143343 -32 -0.0
text 814084 814076 -8 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1159543 1159415 -128 -0.0
bss 142612 142580 -32 -0.0
text 803072 803064 -8 -0.0
p6 all-clusters-app default (read/write) 1698964 1698868 -96 -0.0
.bss 149320 149288 -32 -0.0
.text 1538600 1538536 -64 -0.0
all-clusters-minimal-app default (read/write) 1642972 1642876 -96 -0.0
.bss 148600 148568 -32 -0.0
.text 1483328 1483264 -64 -0.0
light-app default (read/write) 1560260 1560148 -112 -0.0
.bss 140464 140432 -32 -0.0
.text 1408960 1408880 -80 -0.0
lock-app default (read/write) 1597540 1597428 -112 -0.0
.bss 144944 144912 -32 -0.0
.text 1441744 1441664 -80 -0.0
telink light-switch-app tlsr9518adk80d (read/write) 808416 808344 -72 -0.0
bss 71096 71064 -32 -0.0
text 571346 571302 -44 -0.0
lighting-app tlsr9518adk80d (read/write) 830352 830280 -72 -0.0
bss 71952 71920 -32 -0.0
text 589436 589394 -42 -0.0
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 5a05207 7790e7e change % change
bl602 lighting-app bl602 (read/write) 1383498 1383458 -40 -0.0
.bss 119906 119874 -32 -0.0
.data 4480 4480 0 0.0
.text 1051032 1051028 -4 -0.0
bl602+rpc (read/write) 1429010 1428970 -40 -0.0
.bss 127346 127314 -32 -0.0
.data 4600 4600 0 0.0
.text 1082792 1082788 -4 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 672371 672355 -16 -0.0
(read/write) 179140 179124 -16 -0.0
.bss 74404 74372 -32 -0.0
.data 3372 3372 0 0.0
.rodata 88747 88747 0 0.0
.text 583308 583292 -16 -0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 637763 637747 -16 -0.0
(read/write) 157980 157948 -32 -0.0
.bss 73692 73660 -32 -0.0
.data 3372 3372 0 0.0
.rodata 77979 77979 0 0.0
.text 559460 559444 -16 -0.0
lock-ftd LP_CC2652R7 (read only) 674095 674079 -16 -0.0
(read/write) 167632 167616 -16 -0.0
.bss 71508 71476 -32 -0.0
.data 3296 3296 0 0.0
.rodata 76671 76671 0 0.0
.text 596944 596928 -16 -0.0
lock-mtd LP_CC2652R7 (read only) 656839 656815 -24 -0.0
(read/write) 180576 180568 -8 -0.0
.bss 67196 67164 -32 -0.0
.data 3296 3296 0 0.0
.rodata 101759 101759 0 0.0
.text 554600 554576 -24 -0.0
pump-app LP_CC2652R7 (read only) 684767 684751 -16 -0.0
(read/write) 157768 157752 -16 -0.0
.bss 71548 71516 -32 -0.0
.data 3296 3296 0 0.0
.rodata 89959 89959 0 0.0
.text 594324 594308 -16 -0.0
pump-controller-app LP_CC2652R7 (read only) 669259 669243 -16 -0.0
(read/write) 173396 173380 -16 -0.0
.bss 71668 71636 -32 -0.0
.data 3292 3292 0 0.0
.rodata 85515 85515 0 0.0
.text 583264 583248 -16 -0.0
shell LP_CC2652R7 (read only) 665062 665046 -16 -0.0
(read/write) 181968 181952 -16 -0.0
.bss 76724 76692 -32 -0.0
.data 3376 3376 0 0.0
.rodata 85694 85694 0 0.0
.text 579052 579036 -16 -0.0
cyw30739 light cyw930739m2evb_01 (read/write) 586070 586014 -56 -0.0
.app_xip_area 462704 462680 -24 -0.0
.bss 65800 65768 -32 -0.0
.data 744 744 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 591886 591830 -56 -0.0
.app_xip_area 463736 463712 -24 -0.0
.bss 70584 70552 -32 -0.0
.data 748 748 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 599026 598970 -56 -0.0
.app_xip_area 476380 476356 -24 -0.0
.bss 65112 65080 -32 -0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1100620 1100460 -160 -0.0
.bss 133020 132988 -32 -0.0
.data 2068 2068 0 0.0
.text 965512 965384 -128 -0.0
BRD4161A+rpc (read/write) 1154860 1154700 -160 -0.0
.bss 149708 149676 -32 -0.0
.data 2280 2280 0 0.0
.text 1002852 1002724 -128 -0.0
BRD4161A+rs911x (read/write) 989748 989636 -112 -0.0
.bss 162344 162312 -32 -0.0
.data 2056 2056 0 0.0
.text 825328 825248 -80 -0.0
lock-app BRD4161A+wf200 (read/write) 1139216 1139136 -80 -0.0
.bss 145520 145488 -32 -0.0
.data 2064 2064 0 0.0
.text 991612 991564 -48 -0.0
window-app BRD4161A (read/write) 1092080 1091920 -160 -0.0
.bss 134460 134428 -32 -0.0
.data 2096 2096 0 0.0
.text 955504 955376 -128 -0.0
esp32 all-clusters-app c3devkit (read only) 1029980 1029944 -36 -0.0
(read/write) 1488674 1488642 -32 -0.0
.dram0.bss 70864 70832 -32 -0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 217776 217776 0 0.0
.flash.text 1029980 1029944 -36 -0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1083335 1083283 -52 -0.0
(read/write) 490632 490600 -32 -0.0
.dram0.bss 76376 76344 -32 -0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 248116 248116 0 0.0
.flash.text 1077951 1077899 -52 -0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w0+release (read/write) 645092 645028 -64 -0.0
.bss 69848 69816 -32 -0.0
.data 2044 2044 0 0.0
.text 570472 570440 -32 -0.0
lock k32w0+release (read/write) 702644 702580 -64 -0.0
.bss 70320 70288 -32 -0.0
.data 2052 2052 0 0.0
.text 627544 627512 -32 -0.0
linux all-clusters-app debug (read only) 3034065 3034113 48 0.0
(read/write) 155920 155920 0 0.0
.bss 61888 61888 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 85560 85560 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 1160 1160 0 0.0
.rodata 274443 274443 0 0.0
.text 2580546 2580594 48 0.0
all-clusters-minimal-app debug (read only) 2873921 2873969 48 0.0
(read/write) 147624 147624 0 0.0
.bss 61152 61152 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 78120 78120 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1152 1152 0 0.0
.rodata 274635 274635 0 0.0
.text 2422914 2422962 48 0.0
bridge-app debug+rpc (read only) 2372777 2372825 48 0.0
(read/write) 127584 127584 0 0.0
.bss 50656 50656 0 0.0
.data 3600 3600 0 0.0
.data.rel.ro 67464 67464 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 824 824 0 0.0
.rodata 203432 203432 0 0.0
.text 2006722 2006770 48 0.0
chip-tool debug (read only) 10725353 10725401 48 0.0
(read/write) 650912 650912 0 0.0
.bss 25240 25240 0 0.0
.data 3266 3266 0 0.0
.data.rel.ro 615880 615880 0 0.0
.dynamic 608 608 0 0.0
.got 5096 5096 0 0.0
.init 27 27 0 0.0
.init_array 768 768 0 0.0
.rodata 556213 556213 0 0.0
.text 8663396 8663444 48 0.0
chip-tool-ipv6only arm64 (read only) 10131452 10131484 32 0.0
(read/write) 698657 698657 0 0.0
.bss 33297 33297 0 0.0
.data 3272 3272 0 0.0
.data.rel.ro 643408 643408 0 0.0
.dynamic 560 560 0 0.0
.got 13720 13720 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 487404 487404 0 0.0
.text 8007092 8007124 32 0.0
lighting-app debug+rpc (read only) 2596761 2596809 48 0.0
(read/write) 130176 130176 0 0.0
.bss 49760 49760 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72360 72360 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 220208 220208 0 0.0
.text 2205842 2205890 48 0.0
lock-app debug (read only) 2580673 2580721 48 0.0
(read/write) 125512 125512 0 0.0
.bss 48288 48288 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69512 69512 0 0.0
.dynamic 608 608 0 0.0
.got 4464 4464 0 0.0
.init 27 27 0 0.0
.init_array 896 896 0 0.0
.rodata 237264 237264 0 0.0
.text 2176754 2176802 48 0.0
ota-provider-app debug (read only) 2357833 2357881 48 0.0
(read/write) 118976 118976 0 0.0
.bss 47808 47808 0 0.0
.data 1936 1936 0 0.0
.data.rel.ro 63336 63336 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 760 760 0 0.0
.rodata 209240 209240 0 0.0
.text 1985122 1985170 48 0.0
ota-requestor-app debug (read only) 2523049 2523097 48 0.0
(read/write) 127320 127320 0 0.0
.bss 50336 50336 0 0.0
.data 2304 2304 0 0.0
.data.rel.ro 68728 68728 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 848 848 0 0.0
.rodata 216000 216000 0 0.0
.text 2134482 2134530 48 0.0
shell debug (read only) 2602369 2602417 48 0.0
(read/write) 142040 142040 0 0.0
.bss 57800 57800 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 77160 77160 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 1032 1032 0 0.0
.rodata 234546 234546 0 0.0
.text 2209474 2209522 48 0.0
thermostat-no-ble arm64 (read only) 2356964 2356996 32 0.0
(read/write) 141825 141825 0 0.0
.bss 55345 55345 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 75984 75984 0 0.0
.dynamic 560 560 0 0.0
.got 5048 5048 0 0.0
.init 24 24 0 0.0
.init_array 408 408 0 0.0
.rodata 140524 140524 0 0.0
.text 1978720 1978752 32 0.0
tv-app debug (read only) 3173721 3173769 48 0.0
(read/write) 257968 257968 0 0.0
.bss 167480 167480 0 0.0
.data 4736 4736 0 0.0
.data.rel.ro 79184 79184 0 0.0
.dynamic 608 608 0 0.0
.got 4856 4856 0 0.0
.init 27 27 0 0.0
.init_array 1072 1072 0 0.0
.rodata 258856 258856 0 0.0
.text 2725122 2725170 48 0.0
tv-casting-app debug (read only) 5416113 5416161 48 0.0
(read/write) 159088 159088 0 0.0
.bss 51448 51448 0 0.0
.data 2432 2432 0 0.0
.data.rel.ro 98776 98776 0 0.0
.dynamic 608 608 0 0.0
.got 4776 4776 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 342449 342449 0 0.0
.text 4805314 4805362 48 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2454328 2454264 -64 -0.0
.bss 214692 214660 -32 -0.0
.data 5872 5872 0 0.0
.text 1416972 1416908 -64 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1179683 1179539 -144 -0.0
bss 143375 143343 -32 -0.0
rodata 143268 143268 0 0.0
text 814084 814076 -8 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1159543 1159415 -128 -0.0
bss 142612 142580 -32 -0.0
rodata 134944 134944 0 0.0
text 803072 803064 -8 -0.0
p6 all-clusters-app default (read only) 881368 881400 32 0.0
(read/write) 1698964 1698868 -96 -0.0
.bss 149320 149288 -32 -0.0
.data 2656 2656 0 0.0
.text 1538600 1538536 -64 -0.0
all-clusters-minimal-app default (read only) 882088 882120 32 0.0
(read/write) 1642972 1642876 -96 -0.0
.bss 148600 148568 -32 -0.0
.data 2656 2656 0 0.0
.text 1483328 1483264 -64 -0.0
light-app default (read only) 890432 890464 32 0.0
(read/write) 1560260 1560148 -112 -0.0
.bss 140464 140432 -32 -0.0
.data 2448 2448 0 0.0
.text 1408960 1408880 -80 -0.0
lock-app default (read only) 885936 885968 32 0.0
(read/write) 1597540 1597428 -112 -0.0
.bss 144944 144912 -32 -0.0
.data 2464 2464 0 0.0
.text 1441744 1441664 -80 -0.0
telink light-switch-app tlsr9518adk80d (read/write) 808416 808344 -72 -0.0
bss 71096 71064 -32 -0.0
noinit 43488 43488 0 0.0
text 571346 571302 -44 -0.0
lighting-app tlsr9518adk80d (read/write) 830352 830280 -72 -0.0
bss 71952 71920 -32 -0.0
noinit 43488 43488 0 0.0
text 589436 589394 -42 -0.0

@tehampson tehampson merged commit 24cd722 into project-chip:master Aug 16, 2022
@tehampson tehampson deleted the 0816-remove-mRemoteMRPConfig-21610 branch August 16, 2022 16:54
@@ -125,7 +125,12 @@ void OperationalSessionSetup::Connect(Callback::Callback<OnDeviceConnected> * on
isConnected = AttachToExistingSecureSession();
if (!isConnected)
{
err = EstablishConnection();
// We should not actually every be in be in State::HasAddress. This
Copy link
Contributor

Choose a reason for hiding this comment

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

"should not actually ever be in"

isiu-apple pushed a commit to isiu-apple/connectedhomeip that referenced this pull request Sep 16, 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.

Remove mRemoteMRPConfig member from OperationalSessionSetup
4 participants