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

Make rpc-ipv6only variant actually be ipv6 only #11557

Merged
merged 3 commits into from
Nov 9, 2021
Merged

Make rpc-ipv6only variant actually be ipv6 only #11557

merged 3 commits into from
Nov 9, 2021

Conversation

andy31415
Copy link
Contributor

Problem

sdkconfig.defaults for RPC builds is missing a final newline, so when we were trying to append 'disableipv4' instead we got something like

CONFIG_CHIP_ENABLE_SHELL=nCONFIG_DISABLE_IPV4=y

which does not work

Change overview

Enforce newline before and after ipv4 disabling in the build script, so that settings take effect.

Testing

I added a conditional error in IPAddress.h if IPV4 is enabled and recompiled things. Error was not triggered (was triggered before).

@boring-cyborg boring-cyborg bot added the scripts label Nov 8, 2021
@andy31415
Copy link
Contributor Author

fast track: build script that does not hit CI only.

@github-actions
Copy link

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

PR #11557: Size comparison from 86511a1 to e64323f

Increases above 0.2%:

platform target config section 86511a1 e64323f change % change
linux all-clusters-app debug (read only) 1704545 1709665 5120 0.3
.text 1431794 1436626 4832 0.3
bridge-app debug+rpc (read only) 1292549 1297669 5120 0.4
.rodata 111252 111540 288 0.3
.text 1085573 1090405 4832 0.4
lighting-app debug+rpc (read only) 1553545 1558633 5088 0.3
.text 1290258 1295090 4832 0.4
ota-provider-app debug (read only) 1251785 1256905 5120 0.4
.rodata 112488 112776 288 0.3
.text 1043362 1048194 4832 0.5
ota-requestor-app debug (read only) 1330305 1335521 5216 0.4
.rodata 124464 124784 320 0.3
.text 1107954 1112850 4896 0.4
tv-app debug (read only) 1818705 1823889 5184 0.3
.text 1521058 1525954 4896 0.3
Increases (29 builds for efr32, esp32, k32w, linux, nrfconnect, p6, qpg, telink)
platform target config section 86511a1 e64323f change % change
efr32 lighting-app BRD4161A (read only) 742336 742648 312 0.0
.text 742328 742640 312 0.0
BRD4161A+rpc (read only) 729864 730184 320 0.0
.text 729856 730176 320 0.0
lock-app BRD4161A (read only) 721600 721920 320 0.0
.text 721592 721912 320 0.0
window-app BRD4161A (read only) 722496 722816 320 0.0
.text 722488 722808 320 0.0
esp32 all-clusters-app c3devkit (read only) 880266 880598 332 0.0
.flash.text 880266 880598 332 0.0
m5stack (read only) 911395 911747 352 0.0
.flash.text 911395 911747 352 0.0
k32w lighting-app k32w061+se05x+release (read/write) 699128 699460 332 0.0
.text 613440 613772 332 0.1
lock-app k32w061+debug (read/write) 591952 592268 316 0.1
.text 515764 516080 316 0.1
shell k32w061+debug (read/write) 657608 657940 332 0.1
.text 570652 570984 332 0.1
linux all-clusters-app debug (read only) 1704545 1709665 5120 0.3
.rodata 139477 139765 288 0.2
.text 1431794 1436626 4832 0.3
bridge-app debug+rpc (read only) 1292549 1297669 5120 0.4
.rodata 111252 111540 288 0.3
.text 1085573 1090405 4832 0.4
chip-tool debug (read only) 4921613 4926973 5360 0.1
.rodata 233712 234000 288 0.1
.text 4419125 4424197 5072 0.1
lighting-app debug+rpc (read only) 1553545 1558633 5088 0.3
.rodata 129873 130129 256 0.2
.text 1290258 1295090 4832 0.4
ota-provider-app debug (read only) 1251785 1256905 5120 0.4
.rodata 112488 112776 288 0.3
.text 1043362 1048194 4832 0.5
ota-requestor-app debug (read only) 1330305 1335521 5216 0.4
.rodata 124464 124784 320 0.3
.text 1107954 1112850 4896 0.4
shell debug (read only) 788153 788233 80 0.0
.rodata 78127 78191 64 0.1
.text 608754 608770 16 0.0
tv-app debug (read only) 1818705 1823889 5184 0.3
.rodata 155528 155816 288 0.2
.text 1521058 1525954 4896 0.3
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 861779 862067 288 0.0
text 577776 578096 320 0.1
nrf52840dk_nrf52840+rpc (read/write) 824127 824415 288 0.0
text 551924 552244 320 0.1
nrf5340dk_nrf5340_cpuapp (read/write) 786822 787110 288 0.0
text 507248 507568 320 0.1
lock-app nrf52840dk_nrf52840 (read/write) 838487 838775 288 0.0
text 559256 559580 324 0.1
nrf5340dk_nrf5340_cpuapp (read/write) 763798 764086 288 0.0
text 488820 489144 324 0.1
pump-app nrf52840dk_nrf52840 (read/write) 844579 844867 288 0.0
text 563420 563740 320 0.1
pump-controller-app nrf52840dk_nrf52840 (read/write) 838343 838647 304 0.0
text 558992 559316 324 0.1
p6 all-clusters-app default (read/write) 2298888 2299200 312 0.0
.text 1257152 1257464 312 0.0
lock-app default (read/write) 2211592 2211912 320 0.0
.text 1169856 1170176 320 0.0
qpg lighting-app qpg6100+debug (read only) 490276 490588 312 0.1
.text 484956 485268 312 0.1
lock-app qpg6100+debug (read only) 466616 466928 312 0.1
.text 461296 461608 312 0.1
telink lighting-app tlsr9518adk80d (read/write) 663418 663678 260 0.0
text 458266 458558 292 0.1
Decreases (12 builds for esp32, mbed, nrfconnect)
platform target config section 86511a1 e64323f change % change
esp32 all-clusters-app c3devkit (read/write) 1306488 1306448 -40 -0.0
.flash.rodata 198376 198336 -40 -0.0
m5stack (read/write) 423808 423768 -40 -0.0
.flash.rodata 204632 204592 -40 -0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read/write) 2291552 2290768 -784 -0.0
.text 1254152 1253368 -784 -0.1
lighting-app CY8CPROTO_062_4343W+release (read/write) 2271648 2270864 -784 -0.0
.text 1234248 1233464 -784 -0.1
lock-app CY8CPROTO_062_4343W+release (read/write) 2249368 2248584 -784 -0.0
.text 1211968 1211184 -784 -0.1
nrfconnect lighting-app nrf52840dk_nrf52840 rodata 96932 96900 -32 -0.0
nrf52840dk_nrf52840+rpc rodata 88112 88080 -32 -0.0
nrf5340dk_nrf5340_cpuapp rodata 92192 92160 -32 -0.0
lock-app nrf52840dk_nrf52840 rodata 93304 93272 -32 -0.0
nrf5340dk_nrf5340_cpuapp rodata 88608 88576 -32 -0.0
pump-app nrf52840dk_nrf52840 rodata 95012 94980 -32 -0.0
pump-controller-app nrf52840dk_nrf52840 rodata 93304 93272 -32 -0.0
Full report (38 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 86511a1 e64323f change % change
efr32 lighting-app BRD4161A (read only) 742336 742648 312 0.0
(read/write) 116236 116236 0 0.0
.bss 114452 114452 0 0.0
.data 1784 1784 0 0.0
.text 742328 742640 312 0.0
BRD4161A+rpc (read only) 729864 730184 320 0.0
(read/write) 132860 132860 0 0.0
.bss 130956 130956 0 0.0
.data 1900 1900 0 0.0
.text 729856 730176 320 0.0
lock-app BRD4161A (read only) 721600 721920 320 0.0
(read/write) 114052 114052 0 0.0
.bss 112308 112308 0 0.0
.data 1744 1744 0 0.0
.text 721592 721912 320 0.0
window-app BRD4161A (read only) 722496 722816 320 0.0
(read/write) 114380 114380 0 0.0
.bss 112628 112628 0 0.0
.data 1748 1748 0 0.0
.text 722488 722808 320 0.0
esp32 all-clusters-app c3devkit (read only) 880266 880598 332 0.0
(read/write) 1306488 1306448 -40 -0.0
.dram0.bss 58400 58400 0 0.0
.dram0.data 16472 16472 0 0.0
.flash.rodata 198376 198336 -40 -0.0
.flash.text 880266 880598 332 0.0
.iram0.text 57526 57526 0 0.0
m5stack (read only) 911395 911747 352 0.0
(read/write) 423808 423768 -40 -0.0
.dram0.bss 60904 60904 0 0.0
.dram0.data 32108 32108 0 0.0
.flash.rodata 204632 204592 -40 -0.0
.flash.text 911395 911747 352 0.0
.iram0.text 125115 125115 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 699128 699460 332 0.0
.bss 77976 77976 0 0.0
.data 1912 1912 0 0.0
.text 613440 613772 332 0.1
lock-app k32w061+debug (read/write) 591952 592268 316 0.1
.bss 68508 68508 0 0.0
.data 1880 1880 0 0.0
.text 515764 516080 316 0.1
shell k32w061+debug (read/write) 657608 657940 332 0.1
.bss 79308 79308 0 0.0
.data 1848 1848 0 0.0
.text 570652 570984 332 0.1
linux all-clusters-app debug (read only) 1704545 1709665 5120 0.3
(read/write) 125888 125888 0 0.0
.bss 57360 57360 0 0.0
.data 1042 1042 0 0.0
.data.rel.ro 62208 62208 0 0.0
.dynamic 592 592 0 0.0
.got 4088 4088 0 0.0
.init 27 27 0 0.0
.init_array 552 552 0 0.0
.rodata 139477 139765 288 0.2
.text 1431794 1436626 4832 0.3
bridge-app debug+rpc (read only) 1292549 1297669 5120 0.4
(read/write) 76432 76432 0 0.0
.bss 42256 42256 0 0.0
.data 1568 1568 0 0.0
.data.rel.ro 27640 27640 0 0.0
.dynamic 592 592 0 0.0
.got 3952 3952 0 0.0
.init 27 27 0 0.0
.init_array 408 408 0 0.0
.rodata 111252 111540 288 0.3
.text 1085573 1090405 4832 0.4
chip-tool debug (read only) 4921613 4926973 5360 0.1
(read/write) 133160 133160 0 0.0
.bss 25328 25328 0 0.0
.data 2224 2224 0 0.0
.data.rel.ro 100192 100192 0 0.0
.dynamic 592 592 0 0.0
.got 4368 4368 0 0.0
.init 27 27 0 0.0
.init_array 432 432 0 0.0
.rodata 233712 234000 288 0.1
.text 4419125 4424197 5072 0.1
lighting-app debug+rpc (read only) 1553545 1558633 5088 0.3
(read/write) 109432 109432 0 0.0
.bss 47928 47928 0 0.0
.data 1170 1170 0 0.0
.data.rel.ro 55040 55040 0 0.0
.dynamic 608 608 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 536 536 0 0.0
.rodata 129873 130129 256 0.2
.text 1290258 1295090 4832 0.4
ota-provider-app debug (read only) 1251785 1256905 5120 0.4
(read/write) 74632 74632 0 0.0
.bss 44352 44352 0 0.0
.data 752 752 0 0.0
.data.rel.ro 24440 24440 0 0.0
.dynamic 592 592 0 0.0
.got 4016 4016 0 0.0
.init 27 27 0 0.0
.init_array 448 448 0 0.0
.rodata 112488 112776 288 0.3
.text 1043362 1048194 4832 0.5
ota-requestor-app debug (read only) 1330305 1335521 5216 0.4
(read/write) 83920 83920 0 0.0
.bss 52512 52512 0 0.0
.data 816 816 0 0.0
.data.rel.ro 25448 25448 0 0.0
.dynamic 592 592 0 0.0
.got 3992 3992 0 0.0
.init 27 27 0 0.0
.init_array 520 520 0 0.0
.rodata 124464 124784 320 0.3
.text 1107954 1112850 4896 0.4
shell debug (read only) 788153 788233 80 0.0
(read/write) 64808 64808 0 0.0
.bss 23400 23400 0 0.0
.data 242 242 0 0.0
.data.rel.ro 36656 36656 0 0.0
.dynamic 592 592 0 0.0
.got 3528 3528 0 0.0
.init 27 27 0 0.0
.init_array 344 344 0 0.0
.rodata 78127 78191 64 0.1
.text 608754 608770 16 0.0
tv-app debug (read only) 1818705 1823889 5184 0.3
(read/write) 297568 297568 0 0.0
.bss 230512 230512 0 0.0
.data 2704 2704 0 0.0
.data.rel.ro 58696 58696 0 0.0
.dynamic 592 592 0 0.0
.got 4408 4408 0 0.0
.init 27 27 0 0.0
.init_array 616 616 0 0.0
.rodata 155528 155816 288 0.2
.text 1521058 1525954 4896 0.3
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2291552 2290768 -784 -0.0
.bss 179404 179404 0 0.0
.data 5232 5232 0 0.0
.heap 851808 851808 0 0.0
.text 1254152 1253368 -784 -0.1
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2271648 2270864 -784 -0.0
.bss 172460 172460 0 0.0
.data 5584 5584 0 0.0
.heap 858400 858400 0 0.0
.text 1234248 1233464 -784 -0.1
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2249368 2248584 -784 -0.0
.bss 171356 171356 0 0.0
.data 5568 5568 0 0.0
.heap 859520 859520 0 0.0
.text 1211968 1211184 -784 -0.1
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) 2048760 2048760 0 0.0
.bss 156424 156424 0 0.0
.data 4976 4976 0 0.0
.heap 875048 875048 0 0.0
.text 1011360 1011360 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 861779 862067 288 0.0
bss 111444 111444 0 0.0
rodata 96932 96900 -32 -0.0
text 577776 578096 320 0.1
nrf52840dk_nrf52840+rpc (read/write) 824127 824415 288 0.0
bss 107796 107796 0 0.0
rodata 88112 88080 -32 -0.0
text 551924 552244 320 0.1
nrf5340dk_nrf5340_cpuapp (read/write) 786822 787110 288 0.0
bss 112816 112816 0 0.0
rodata 92192 92160 -32 -0.0
text 507248 507568 320 0.1
lock-app nrf52840dk_nrf52840 (read/write) 838487 838775 288 0.0
bss 110476 110476 0 0.0
rodata 93304 93272 -32 -0.0
text 559256 559580 324 0.1
nrf5340dk_nrf5340_cpuapp (read/write) 763798 764086 288 0.0
bss 111888 111888 0 0.0
rodata 88608 88576 -32 -0.0
text 488820 489144 324 0.1
pigweed-app nrf52840dk_nrf52840 (read/write) 497323 497323 0 0.0
bss 51824 51824 0 0.0
rodata 45776 45776 0 0.0
text 339436 339436 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 844579 844867 288 0.0
bss 110616 110616 0 0.0
rodata 95012 94980 -32 -0.0
text 563420 563740 320 0.1
pump-controller-app nrf52840dk_nrf52840 (read/write) 838343 838647 304 0.0
bss 110512 110512 0 0.0
rodata 93304 93272 -32 -0.0
text 558992 559316 324 0.1
shell nrf52840dk_nrf52840 (read/write) 776375 776375 0 0.0
bss 109264 109264 0 0.0
rodata 72540 72540 0 0.0
text 519972 519972 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 691430 691430 0 0.0
bss 110248 110248 0 0.0
rodata 67184 67184 0 0.0
text 440580 440580 0 0.0
p6 all-clusters-app default (read/write) 2298888 2299200 312 0.0
.bss 111936 111936 0 0.0
.data 2536 2536 0 0.0
.heap 918872 918872 0 0.0
.text 1257152 1257464 312 0.0
lock-app default (read/write) 2211592 2211912 320 0.0
.bss 100744 100744 0 0.0
.data 2408 2408 0 0.0
.heap 930192 930192 0 0.0
.text 1169856 1170176 320 0.0
qpg lighting-app qpg6100+debug (read only) 490276 490588 312 0.1
(read/write) 114140 114140 0 0.0
.bss 51136 51136 0 0.0
.data 1012 1012 0 0.0
.text 484956 485268 312 0.1
lock-app qpg6100+debug (read only) 466616 466928 312 0.1
(read/write) 114144 114144 0 0.0
.bss 50080 50080 0 0.0
.data 968 968 0 0.0
.text 461296 461608 312 0.1
persistent-storage-app qpg6100+debug (read only) 153396 153396 0 0.0
(read/write) 114140 114140 0 0.0
.bss 19600 19600 0 0.0
.data 364 364 0 0.0
.text 148076 148076 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 663418 663678 260 0.0
bss 69256 69256 0 0.0
noinit 33216 33216 0 0.0
text 458266 458558 292 0.1

@andy31415 andy31415 merged commit 2d79602 into project-chip:master Nov 9, 2021
PSONALl pushed a commit to PSONALl/connectedhomeip that referenced this pull request Dec 3, 2021
@andy31415
Make rpc-ipv6only variant actually be ipv6 only (project-chip#11557)
125b386 
* Fix newline handling in esp32 builds

* Fix unit tests

* Update to use escaping and not actual newlines
@andy31415 andy31415 deleted the fix_rpc_ipv6 branch June 14, 2023 12:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rgoliver rgoliver rgoliver approved these changes

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

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

Assignees
No one assigned
Labels
fast track scripts
Projects
None yet
Milestone
No milestone
Development

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