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

Update FillNodeDataFromTxt to use the common & commission/operational… #18342

Merged
merged 1 commit into from
May 11, 2022
Merged

Update FillNodeDataFromTxt to use the common & commission/operational… #18342

merged 1 commit into from
May 11, 2022

Conversation

andy31415
Copy link
Contributor

… split for discovery data

Problem

Filling text fields requires separate structures that include common code. This duplicates logic (same sleepy parsing occurs in two separate places) and makes the code more complex than it should.

This is part of working on #18256 - want to split txt record parsing so it can be used by common resolution logic.

Change overview

Use separate parsing for "common" and "commission" data parsing.

Mostly a NOOP except that commission parsing will do a 2-pass iteration in minmdns to fill up both common and commissioning parsing (this was previously done in one step).

Testing

Unit tests updated. CI will validate discovery and commissioning.

@boring-cyborg boring-cyborg bot added the lib label May 11, 2022
@github-actions
Copy link

github-actions bot commented May 11, 2022 •
edited
Loading

PR #18342: Size comparison from ab57289 to b4721cd

Increases (4 builds for cc13x2_26x2)
platform target config section ab57289 b4721cd change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 161212 161292 80 0.0
lock-ftd LP_CC2652R7 (read/write) 164868 164956 88 0.1
pump-app LP_CC2652R7 (read/write) 181592 181672 80 0.0
pump-controller-app LP_CC2652R7 (read/write) 188184 188280 96 0.1
Decreases (34 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section ab57289 b4721cd change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 691139 691059 -80 -0.0
.text 587572 587492 -80 -0.0
lock-ftd LP_CC2652R7 (read only) 678587 678499 -88 -0.0
.text 583304 583216 -88 -0.0
lock-mtd LP_CC2652R7 (read only) 627339 627251 -88 -0.0
.text 532160 532072 -88 -0.0
pump-app LP_CC2652R7 (read only) 663151 663071 -80 -0.0
.text 581676 581596 -80 -0.0
pump-controller-app LP_CC2652R7 (read only) 656359 656263 -96 -0.0
.text 571788 571692 -96 -0.0
cyw30739 light cyw930739m2evb_01 (read/write) 627694 627598 -96 -0.0
.app_xip_area 530284 530188 -96 -0.0
lock cyw930739m2evb_01 (read/write) 626622 626534 -88 -0.0
.app_xip_area 530668 530580 -88 -0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 575398 575302 -96 -0.0
.app_xip_area 469728 469632 -96 -0.0
efr32 lighting-app BRD4161A (read only) 910392 910312 -80 -0.0
.text 910384 910304 -80 -0.0
BRD4161A+rpc (read only) 944736 944656 -80 -0.0
.text 944728 944648 -80 -0.0
BRD4161A+rs911x (read only) 788116 788052 -64 -0.0
.text 788108 788044 -64 -0.0
lock-app BRD4161A+wf200 (read only) 947220 947140 -80 -0.0
.text 947212 947132 -80 -0.0
window-app BRD4161A (read only) 890696 890616 -80 -0.0
.text 890688 890608 -80 -0.0
esp32 all-clusters-app c3devkit (read only) 1001414 1001362 -52 -0.0
.flash.text 1001414 1001362 -52 -0.0
m5stack (read only) 1056211 1056111 -100 -0.0
.flash.text 1050827 1050727 -100 -0.0
k32w light k32w061+release (read/write) 685244 685148 -96 -0.0
.text 600272 600176 -96 -0.0
lock k32w061+release (read/write) 730588 730492 -96 -0.0
.text 645224 645128 -96 -0.0
linux all-clusters-app debug (read only) 2743225 2743097 -128 -0.0
.text 2330674 2330546 -128 -0.0
bridge-app debug+rpc (read only) 1897865 1897737 -128 -0.0
.text 1612690 1612562 -128 -0.0
chip-tool debug (read only) 9124789 9124661 -128 -0.0
.text 7327893 7327765 -128 -0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 8943612 8943532 -80 -0.0
.rodata 439292 439276 -16 -0.0
.text 7044788 7044724 -64 -0.0
lighting-app debug+rpc (read only) 2331481 2331353 -128 -0.0
.text 1978290 1978162 -128 -0.0
lock-app debug (read only) 2238969 2238809 -160 -0.0
.rodata 195785 195753 -32 -0.0
.text 1882290 1882162 -128 -0.0
ota-provider-app debug (read only) 2067753 2067593 -160 -0.0
.rodata 176723 176691 -32 -0.0
.text 1732658 1732530 -128 -0.0
ota-requestor-app debug (read only) 2097969 2097841 -128 -0.0
.text 1765122 1764994 -128 -0.0
shell debug (read only) 2568209 2568081 -128 -0.0
.text 2187298 2187170 -128 -0.0
thermostat-no-ble arm64 (read only) 2370604 2370532 -72 -0.0
.rodata 147068 147060 -8 -0.0
.text 1993648 1993584 -64 -0.0
tv-app debug (read only) 2855865 2855737 -128 -0.0
.text 2453938 2453810 -128 -0.0
mbed lock-app CY8CPROTO_062_4343W+release (read/write) 2420420 2420356 -64 -0.0
.text 1383020 1382956 -64 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1180207 1180143 -64 -0.0
text 810020 809956 -64 -0.0
p6 all-clusters-app default (read/write) 2532024 2531960 -64 -0.0
.text 1490288 1490224 -64 -0.0
light-app default (read/write) 2422080 2422016 -64 -0.0
.text 1380344 1380280 -64 -0.0
lock-app default (read/write) 2431624 2431544 -80 -0.0
.text 1389888 1389808 -80 -0.0
telink lighting-app tlsr9518adk80d (read/write) 806612 806528 -84 -0.0
text 572836 572768 -68 -0.0
Full report (34 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section ab57289 b4721cd change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 691139 691059 -80 -0.0
(read/write) 161212 161292 80 0.0
.bss 75332 75332 0 0.0
.data 3412 3412 0 0.0
.rodata 103083 103083 0 0.0
.text 587572 587492 -80 -0.0
lock-ftd LP_CC2652R7 (read only) 678587 678499 -88 -0.0
(read/write) 164868 164956 88 0.1
.bss 73492 73492 0 0.0
.data 3236 3236 0 0.0
.rodata 94803 94803 0 0.0
.text 583304 583216 -88 -0.0
lock-mtd LP_CC2652R7 (read only) 627339 627251 -88 -0.0
(read/write) 146308 146308 0 0.0
.bss 69212 69212 0 0.0
.data 3236 3236 0 0.0
.rodata 94691 94691 0 0.0
.text 532160 532072 -88 -0.0
pump-app LP_CC2652R7 (read only) 663151 663071 -80 -0.0
(read/write) 181592 181672 80 0.0
.bss 73756 73756 0 0.0
.data 3268 3268 0 0.0
.rodata 80991 80991 0 0.0
.text 581676 581596 -80 -0.0
pump-controller-app LP_CC2652R7 (read only) 656359 656263 -96 -0.0
(read/write) 188184 188280 96 0.1
.bss 73812 73812 0 0.0
.data 3232 3232 0 0.0
.rodata 84087 84087 0 0.0
.text 571788 571692 -96 -0.0
cyw30739 light cyw930739m2evb_01 (read/write) 627694 627598 -96 -0.0
.app_xip_area 530284 530188 -96 -0.0
.bss 80052 80052 0 0.0
.data 708 708 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 626622 626534 -88 -0.0
.app_xip_area 530668 530580 -88 -0.0
.bss 78628 78628 0 0.0
.data 672 672 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 575398 575302 -96 -0.0
.app_xip_area 469728 469632 -96 -0.0
.bss 88048 88048 0 0.0
.data 584 584 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 910392 910312 -80 -0.0
(read/write) 134520 134520 0 0.0
.bss 132456 132456 0 0.0
.data 2064 2064 0 0.0
.text 910384 910304 -80 -0.0
BRD4161A+rpc (read only) 944736 944656 -80 -0.0
(read/write) 151208 151208 0 0.0
.bss 148936 148936 0 0.0
.data 2268 2268 0 0.0
.text 944728 944648 -80 -0.0
BRD4161A+rs911x (read only) 788116 788052 -64 -0.0
(read/write) 129776 129776 0 0.0
.bss 127708 127708 0 0.0
.data 2068 2068 0 0.0
.text 788108 788044 -64 -0.0
lock-app BRD4161A+wf200 (read only) 947220 947140 -80 -0.0
(read/write) 124268 124268 0 0.0
.bss 122244 122244 0 0.0
.data 2024 2024 0 0.0
.text 947212 947132 -80 -0.0
window-app BRD4161A (read only) 890696 890616 -80 -0.0
(read/write) 134472 134472 0 0.0
.bss 132416 132416 0 0.0
.data 2052 2052 0 0.0
.text 890688 890608 -80 -0.0
esp32 all-clusters-app c3devkit (read only) 1001414 1001362 -52 -0.0
(read/write) 1475986 1475986 0 0.0
.dram0.bss 68464 68464 0 0.0
.dram0.data 14444 14444 0 0.0
.flash.rodata 208632 208632 0 0.0
.flash.text 1001414 1001362 -52 -0.0
.iram0.text 62020 62020 0 0.0
m5stack (read only) 1056211 1056111 -100 -0.0
(read/write) 478392 478392 0 0.0
.dram0.bss 73984 73984 0 0.0
.dram0.data 34184 34184 0 0.0
.flash.rodata 238388 238388 0 0.0
.flash.text 1050827 1050727 -100 -0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 685244 685148 -96 -0.0
.bss 81248 81248 0 0.0
.data 2020 2020 0 0.0
.text 600272 600176 -96 -0.0
lock k32w061+release (read/write) 730588 730492 -96 -0.0
.bss 81680 81680 0 0.0
.data 1980 1980 0 0.0
.text 645224 645128 -96 -0.0
linux all-clusters-app debug (read only) 2743225 2743097 -128 -0.0
(read/write) 174552 174552 0 0.0
.bss 83904 83904 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 82456 82456 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1008 1008 0 0.0
.rodata 236677 236677 0 0.0
.text 2330674 2330546 -128 -0.0
bridge-app debug+rpc (read only) 1897865 1897737 -128 -0.0
(read/write) 121080 121080 0 0.0
.bss 71520 71520 0 0.0
.data 3488 3488 0 0.0
.data.rel.ro 40712 40712 0 0.0
.dynamic 592 592 0 0.0
.got 4056 4056 0 0.0
.init 27 27 0 0.0
.init_array 688 688 0 0.0
.rodata 161817 161817 0 0.0
.text 1612690 1612562 -128 -0.0
chip-tool debug (read only) 9124789 9124661 -128 -0.0
(read/write) 577008 577008 0 0.0
.bss 22816 22816 0 0.0
.data 1136 1136 0 0.0
.data.rel.ro 546752 546752 0 0.0
.dynamic 624 624 0 0.0
.got 5000 5000 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 472437 472437 0 0.0
.text 7327893 7327765 -128 -0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 8943612 8943532 -80 -0.0
(read/write) 643121 643121 0 0.0
.bss 41105 41105 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 582008 582008 0 0.0
.dynamic 560 560 0 0.0
.got 14976 14976 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 439292 439276 -16 -0.0
.text 7044788 7044724 -64 -0.0
lighting-app debug+rpc (read only) 2331481 2331353 -128 -0.0
(read/write) 152032 152032 0 0.0
.bss 73568 73568 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 70664 70664 0 0.0
.dynamic 608 608 0 0.0
.got 4344 4344 0 0.0
.init 27 27 0 0.0
.init_array 792 792 0 0.0
.rodata 185977 185977 0 0.0
.text 1978290 1978162 -128 -0.0
lock-app debug (read only) 2238969 2238809 -160 -0.0
(read/write) 146616 146616 0 0.0
.bss 72192 72192 0 0.0
.data 1568 1568 0 0.0
.data.rel.ro 67160 67160 0 0.0
.dynamic 592 592 0 0.0
.got 4336 4336 0 0.0
.init 27 27 0 0.0
.init_array 752 752 0 0.0
.rodata 195785 195753 -32 -0.0
.text 1882290 1882162 -128 -0.0
ota-provider-app debug (read only) 2067753 2067593 -160 -0.0
(read/write) 139696 139696 0 0.0
.bss 71680 71680 0 0.0
.data 1736 1736 0 0.0
.data.rel.ro 60488 60488 0 0.0
.dynamic 608 608 0 0.0
.got 4504 4504 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 176723 176691 -32 -0.0
.text 1732658 1732530 -128 -0.0
ota-requestor-app debug (read only) 2097969 2097841 -128 -0.0
(read/write) 142536 142536 0 0.0
.bss 72320 72320 0 0.0
.data 1992 1992 0 0.0
.data.rel.ro 62584 62584 0 0.0
.dynamic 592 592 0 0.0
.got 4344 4344 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 172988 172988 0 0.0
.text 1765122 1764994 -128 -0.0
shell debug (read only) 2568209 2568081 -128 -0.0
(read/write) 198288 198288 0 0.0
.bss 114408 114408 0 0.0
.data 1376 1376 0 0.0
.data.rel.ro 76744 76744 0 0.0
.dynamic 592 592 0 0.0
.got 4208 4208 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 218130 218130 0 0.0
.text 2187298 2187170 -128 -0.0
thermostat-no-ble arm64 (read only) 2370604 2370532 -72 -0.0
(read/write) 175153 175153 0 0.0
.bss 86417 86417 0 0.0
.data 1520 1520 0 0.0
.data.rel.ro 79408 79408 0 0.0
.dynamic 560 560 0 0.0
.got 4768 4768 0 0.0
.init 24 24 0 0.0
.init_array 376 376 0 0.0
.rodata 147068 147060 -8 -0.0
.text 1993648 1993584 -64 -0.0
tv-app debug (read only) 2855865 2855737 -128 -0.0
(read/write) 277472 277472 0 0.0
.bss 189624 189624 0 0.0
.data 4672 4672 0 0.0
.data.rel.ro 76928 76928 0 0.0
.dynamic 592 592 0 0.0
.got 4720 4720 0 0.0
.init 27 27 0 0.0
.init_array 928 928 0 0.0
.rodata 218699 218699 0 0.0
.text 2453938 2453810 -128 -0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2420420 2420356 -64 -0.0
.bss 205820 205820 0 0.0
.data 5872 5872 0 0.0
.text 1383020 1382956 -64 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1180207 1180143 -64 -0.0
bss 139680 139680 0 0.0
rodata 151792 151792 0 0.0
text 810020 809956 -64 -0.0
p6 all-clusters-app default (read/write) 2532024 2531960 -64 -0.0
.bss 139328 139328 0 0.0
.data 2808 2808 0 0.0
.text 1490288 1490224 -64 -0.0
light-app default (read/write) 2422080 2422016 -64 -0.0
.bss 132656 132656 0 0.0
.data 2608 2608 0 0.0
.text 1380344 1380280 -64 -0.0
lock-app default (read/write) 2431624 2431544 -80 -0.0
.bss 132472 132472 0 0.0
.data 2568 2568 0 0.0
.text 1389888 1389808 -80 -0.0
telink lighting-app tlsr9518adk80d (read/write) 806612 806528 -84 -0.0
bss 72176 72176 0 0.0
noinit 40416 40416 0 0.0
text 572836 572768 -68 -0.0

@andy31415 andy31415 merged commit 4d01abf into project-chip:master May 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@tcarmelveilleux tcarmelveilleux tcarmelveilleux approved these changes

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

@arkq arkq Awaiting requested review from arkq

@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

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

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

@gjc13 gjc13 Awaiting requested review from gjc13

@hawk248 hawk248 Awaiting requested review from hawk248

@holbrookt holbrookt Awaiting requested review from holbrookt

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

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

@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

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kghost kghost Awaiting requested review from kghost

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@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

@turon turon Awaiting requested review from turon

@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

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

Successfully merging this pull request may close these issues.
3 participants
@andy31415 @tcarmelveilleux @bzbarsky-apple