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

Update some names in Dnssd to be more consistent across the board #13083

Merged

Conversation

vivien-apple
Copy link
Contributor

Problem

There is a lot of code duplicated into Discovery_ImplPlatform.cpp and the dnssd naming for methods and variables is not always consistent which makes it harder to read than what it should be.
The 2 methods that I have focused on in this PR are the Advertise methods, both for operation and commissionable nodes.

Change overview

  • Update names so they are at least consistent
  • Update Discovery_ImplPlatform.cpp code to benefit from those consistent names and use some macros to help readability.

Testing

I have locally checked that discovering the node over mdns is still successful.

@github-actions
Copy link

github-actions bot commented Dec 16, 2021

PR #13083: Size comparison from 91a1a5c to 543bb19

Increases (10 builds for efr32, nrfconnect)
platform target config section 91a1a5c 543bb19 change % change
efr32 lighting-app BRD4161A (read/write) 127348 127352 4 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 rodata 108056 108120 64 0.1
nrf52840dk_nrf52840+rpc rodata 101476 101536 60 0.1
nrf5340dk_nrf5340_cpuapp rodata 102984 103044 60 0.1
lock-app nrf52840dk_nrf52840 rodata 103364 103424 60 0.1
nrf5340dk_nrf5340_cpuapp rodata 98324 98388 64 0.1
pump-app nrf52840dk_nrf52840 rodata 104704 104768 64 0.1
pump-controller-app nrf52840dk_nrf52840 rodata 102836 102896 60 0.1
shell nrf52840dk_nrf52840 rodata 78032 78096 64 0.1
nrf5340dk_nrf5340_cpuapp rodata 72336 72396 60 0.1
Decreases (16 builds for efr32, k32w, nrfconnect, qpg)
platform target config section 91a1a5c 543bb19 change % change
efr32 lighting-app BRD4161A (read only) 829820 829456 -364 -0.0
.text 829812 829448 -364 -0.0
BRD4161A+rpc (read only) 817440 817084 -356 -0.0
.text 817432 817076 -356 -0.0
window-app BRD4161A (read only) 803228 802848 -380 -0.0
.text 803220 802840 -380 -0.0
k32w light k32w061+release (read/write) 648300 648296 -4 -0.0
.text 564116 564112 -4 -0.0
lock k32w061+release (read/write) 633048 633012 -36 -0.0
.text 549188 549152 -36 -0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 935739 935579 -160 -0.0
text 631728 631500 -228 -0.0
nrf52840dk_nrf52840+rpc (read/write) 922127 921963 -164 -0.0
text 627040 626812 -228 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 859490 859326 -164 -0.0
text 559164 558940 -224 -0.0
lock-app nrf52840dk_nrf52840 (read/write) 907871 907707 -164 -0.0
text 609552 609324 -228 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 831798 831638 -160 -0.0
text 537032 536808 -224 -0.0
pump-app nrf52840dk_nrf52840 (read/write) 912763 912587 -176 -0.0
text 613104 612876 -228 -0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 905951 905787 -164 -0.0
text 608300 608072 -228 -0.0
shell nrf52840dk_nrf52840 (read/write) 796271 796079 -192 -0.0
text 532304 532048 -256 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 708906 708710 -196 -0.0
text 449796 449544 -252 -0.1
qpg lighting-app qpg6105+debug (read only) 531904 531804 -100 -0.0
.text 526584 526484 -100 -0.0
lock-app qpg6105+debug (read only) 503600 503484 -116 -0.0
.text 498280 498164 -116 -0.0
Full report (31 builds for efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 91a1a5c 543bb19 change % change
efr32 lighting-app BRD4161A (read only) 829820 829456 -364 -0.0
(read/write) 127348 127352 4 0.0
.bss 125472 125472 0 0.0
.data 1876 1876 0 0.0
.text 829812 829448 -364 -0.0
BRD4161A+rpc (read only) 817440 817084 -356 -0.0
(read/write) 144016 144016 0 0.0
.bss 142040 142040 0 0.0
.data 1976 1976 0 0.0
.text 817432 817076 -356 -0.0
window-app BRD4161A (read only) 803228 802848 -380 -0.0
(read/write) 126288 126288 0 0.0
.bss 124456 124456 0 0.0
.data 1832 1832 0 0.0
.text 803220 802840 -380 -0.0
esp32 all-clusters-app c3devkit (read only) 877064 877064 0 0.0
(read/write) 1313042 1313042 0 0.0
.dram0.bss 69784 69784 0 0.0
.dram0.data 14220 14220 0 0.0
.flash.rodata 175976 175976 0 0.0
.flash.text 877064 877064 0 0.0
.iram0.text 62254 62254 0 0.0
m5stack (read only) 937939 937939 0 0.0
(read/write) 442144 442144 0 0.0
.dram0.bss 74280 74280 0 0.0
.dram0.data 34056 34056 0 0.0
.flash.rodata 202800 202800 0 0.0
.flash.text 932555 932555 0 0.0
.iram0.text 122671 122671 0 0.0
k32w light k32w061+release (read/write) 648300 648296 -4 -0.0
.bss 76480 76480 0 0.0
.data 1904 1904 0 0.0
.text 564116 564112 -4 -0.0
lock k32w061+release (read/write) 633048 633012 -36 -0.0
.bss 76200 76200 0 0.0
.data 1860 1860 0 0.0
.text 549188 549152 -36 -0.0
linux chip-tool-ipv6only arm64 (read only) 6930700 6930700 0 0.0
(read/write) 323633 323633 0 0.0
.bss 54577 54577 0 0.0
.data 1096 1096 0 0.0
.data.rel.ro 208096 208096 0 0.0
.dynamic 560 560 0 0.0
.got 56160 56160 0 0.0
.init 24 24 0 0.0
.init_array 168 168 0 0.0
.rodata 379476 379476 0 0.0
.text 5863652 5863652 0 0.0
thermostat-no-ble arm64 (read only) 1993780 1993780 0 0.0
(read/write) 143937 143937 0 0.0
.bss 64321 64321 0 0.0
.data 880 880 0 0.0
.data.rel.ro 72000 72000 0 0.0
.dynamic 560 560 0 0.0
.got 3840 3840 0 0.0
.init 24 24 0 0.0
.init_array 288 288 0 0.0
.rodata 128196 128196 0 0.0
.text 1654112 1654112 0 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2334040 2334040 0 0.0
.bss 189068 189068 0 0.0
.data 5264 5264 0 0.0
.text 1296616 1296616 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2328616 2328616 0 0.0
.bss 180896 180896 0 0.0
.data 5544 5544 0 0.0
.text 1291216 1291216 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2301648 2301648 0 0.0
.bss 179944 179944 0 0.0
.data 5536 5536 0 0.0
.text 1264248 1264248 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1140008 1140008 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103392 103392 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2053688 2053688 0 0.0
.bss 156972 156972 0 0.0
.data 4864 4864 0 0.0
.text 1016288 1016288 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 935739 935579 -160 -0.0
bss 118400 118400 0 0.0
rodata 108056 108120 64 0.1
text 631728 631500 -228 -0.0
nrf52840dk_nrf52840+rpc (read/write) 922127 921963 -164 -0.0
bss 115444 115444 0 0.0
rodata 101476 101536 60 0.1
text 627040 626812 -228 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 859490 859326 -164 -0.0
bss 116684 116684 0 0.0
rodata 102984 103044 60 0.1
text 559164 558940 -224 -0.0
lock-app nrf52840dk_nrf52840 (read/write) 907871 907707 -164 -0.0
bss 117588 117588 0 0.0
rodata 103364 103424 60 0.1
text 609552 609324 -228 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 831798 831638 -160 -0.0
bss 115900 115900 0 0.0
rodata 98324 98388 64 0.1
text 537032 536808 -224 -0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 542351 542351 0 0.0
bss 52588 52588 0 0.0
rodata 50668 50668 0 0.0
text 376892 376892 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 912763 912587 -176 -0.0
bss 117496 117496 0 0.0
rodata 104704 104768 64 0.1
text 613104 612876 -228 -0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 905951 905787 -164 -0.0
bss 117376 117376 0 0.0
rodata 102836 102896 60 0.1
text 608300 608072 -228 -0.0
shell nrf52840dk_nrf52840 (read/write) 796271 796079 -192 -0.0
bss 109464 109464 0 0.0
rodata 78032 78096 64 0.1
text 532304 532048 -256 -0.0
nrf5340dk_nrf5340_cpuapp (read/write) 708906 708710 -196 -0.0
bss 107352 107352 0 0.0
rodata 72336 72396 60 0.1
text 449796 449544 -252 -0.1
p6 all-clusters-app default (read/write) 2384624 2384624 0 0.0
.bss 117260 117260 0 0.0
.data 2544 2544 0 0.0
.text 1342888 1342888 0 0.0
light-app default (read/write) 2324008 2324008 0 0.0
.bss 106152 106152 0 0.0
.data 2384 2384 0 0.0
.text 1282272 1282272 0 0.0
lock-app default (read/write) 2296216 2296216 0 0.0
.bss 105032 105032 0 0.0
.data 2336 2336 0 0.0
.text 1254480 1254480 0 0.0
qpg lighting-app qpg6105+debug (read only) 531904 531804 -100 -0.0
(read/write) 146936 146936 0 0.0
.bss 86816 86816 0 0.0
.data 1004 1004 0 0.0
.text 526584 526484 -100 -0.0
lock-app qpg6105+debug (read only) 503600 503484 -116 -0.0
(read/write) 146940 146940 0 0.0
.bss 85952 85952 0 0.0
.data 952 952 0 0.0
.text 498280 498164 -116 -0.0
persistent-storage-app qpg6105+debug (read only) 106448 106448 0 0.0
(read/write) 146938 146938 0 0.0
.bss 36146 36146 0 0.0
.data 288 288 0 0.0
.text 101128 101128 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 830222 830222 0 0.0
bss 87040 87040 0 0.0
noinit 37160 37160 0 0.0
text 578410 578410 0 0.0

@andy31415 andy31415 merged commit 8e40abc into project-chip:master Dec 16, 2021
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.

4 participants