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

Match the order of ScoreIpAddress with IpScore #28934

Merged
merged 1 commit into from
Aug 29, 2023

Conversation

yhoyoon
Copy link
Contributor

@yhoyoon yhoyoon commented Aug 29, 2023

The #27981 PR was merged, but it didn't follow IpScore's comments.

// IP addess "suitability"
//   - Larger value means "more suitable"
//   - Enum ordered ascending for easier read. Note however that order of
//     checks MUST match in ScoreIpAddress below.
enum class IpScore : unsigned

This change matches the order of ScoreIpAddress with the order of IpScore enum.

The project-chip#27981 PR was merged, but it didn't follow IpScore's comments.

// IP addess "suitability"
//   - Larger value means "more suitable"
//   - Enum ordered ascending for easier read. Note however that order of
//     checks MUST match in ScoreIpAddress below.
enum class IpScore : unsigned

This change matches the order of ScoreIpAddress with the order of
IpScore enum.

Signed-off-by: Youngho Yoon <[email protected]>
@github-actions
Copy link

github-actions bot commented Aug 29, 2023

PR #28934: Size comparison from 1e3c20a to dd859f1

Decreases (1 build for efr32)
platform target config section 1e3c20a dd859f1 change % change
efr32 lighting-app BRD4187C (read/write) 1070648 1070640 -8 -0.0
.text 890560 890552 -8 -0.0
Full report (55 builds for cc32xx, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 1e3c20a dd859f1 change % change
cc32xx lock CC3235SF_LAUNCHXL (blank) 0 0 0 0.0
(read only) 617146 617146 0 0.0
(read/write) 207256 207256 0 0.0
.ARM.attributes 44 44 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 200696 200696 0 0.0
.comment 206 206 0 0.0
.data 1440 1440 0 0.0
.debug_abbrev 966866 966866 0 0.0
.debug_aranges 106736 106736 0 0.0
.debug_frame 360948 360948 0 0.0
.debug_info 21242142 21242142 0 0.0
.debug_line 2796102 2796102 0 0.0
.debug_line_str 513 513 0 0.0
.debug_loc 33340 33340 0 0.0
.debug_loclists 1566782 1566782 0 0.0
.debug_ranges 4984 4984 0 0.0
.debug_rnglists 98923 98923 0 0.0
.debug_str 3367821 3367821 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 106506 106506 0 0.0
.shstrtab 265 265 0 0.0
.stack 2048 2048 0 0.0
.strtab 499911 499911 0 0.0
.symtab 294208 294208 0 0.0
.text 508520 508520 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 552247 552247 0 0.0
.app_xip_area 443513 443513 0 0.0
.bss 63704 63704 0 0.0
.data 664 664 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 538703 538703 0 0.0
.app_xip_area 425033 425033 0 0.0
.bss 68608 68608 0 0.0
.data 692 692 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 574063 574063 0 0.0
.app_xip_area 466529 466529 0 0.0
.bss 62576 62576 0 0.0
.data 592 592 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
switch cyw930739m2evb_01 (read/write) 558671 558671 0 0.0
.app_xip_area 447921 447921 0 0.0
.bss 65696 65696 0 0.0
.data 688 688 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rs9116 (read/write) 1026968 1026968 0 0.0
.bss 193040 193040 0 0.0
.data 2668 2668 0 0.0
.text 831240 831240 0 0.0
BRD4187C (read/write) 1070648 1070640 -8 -0.0
.bss 176812 176812 0 0.0
.data 3256 3256 0 0.0
.text 890560 890552 -8 -0.0
lock-app BRD4161A+wf200 (read/write) 1103744 1103744 0 0.0
.bss 186976 186976 0 0.0
.data 2684 2684 0 0.0
.text 914064 914064 0 0.0
window-app BRD4187C (read/write) 1119500 1119500 0 0.0
.bss 159564 159564 0 0.0
.data 3132 3132 0 0.0
.text 956784 956784 0 0.0
esp32 all-clusters-app c3devkit (read only) 1172942 1172942 0 0.0
(read/write) 1703892 1703892 0 0.0
.dram0.bss 79056 79056 0 0.0
.dram0.data 13084 13084 0 0.0
.flash.rodata 268840 268840 0 0.0
.flash.text 1172942 1172942 0 0.0
.iram0.text 75244 75244 0 0.0
m5stack (read only) 1213727 1213727 0 0.0
(read/write) 552802 552802 0 0.0
.dram0.bss 85424 85424 0 0.0
.dram0.data 34036 34036 0 0.0
.flash.rodata 299724 299724 0 0.0
.flash.text 1208343 1208343 0 0.0
.iram0.text 123287 123287 0 0.0
k32w contact k32w0+release (read only) 591052 591052 0 0.0
(read/write) 87944 87944 0 0.0
.bss 71192 71192 0 0.0
.data 2128 2128 0 0.0
.text 590516 590516 0 0.0
light k32w0+release (read only) 589836 589836 0 0.0
(read/write) 87596 87596 0 0.0
.bss 70856 70856 0 0.0
.data 2116 2116 0 0.0
.text 589300 589300 0 0.0
lock k32w0+release (read only) 562196 562196 0 0.0
(read/write) 85396 85396 0 0.0
.bss 68712 68712 0 0.0
.data 2060 2060 0 0.0
.text 561660 561660 0 0.0
linux all-clusters-app debug (read only) 5648985 5648985 0 0.0
(read/write) 420456 420456 0 0.0
.bss 130688 130688 0 0.0
.data 4016 4016 0 0.0
.data.rel.ro 278376 278376 0 0.0
.dynamic 624 624 0 0.0
.got 5384 5384 0 0.0
.init 27 27 0 0.0
.init_array 1344 1344 0 0.0
.rodata 339188 339188 0 0.0
.text 4928307 4928307 0 0.0
all-clusters-minimal-app debug (read only) 4915553 4915553 0 0.0
(read/write) 232392 232392 0 0.0
.bss 126368 126368 0 0.0
.data 3856 3856 0 0.0
.data.rel.ro 95024 95024 0 0.0
.dynamic 624 624 0 0.0
.got 5344 5344 0 0.0
.init 27 27 0 0.0
.init_array 1152 1152 0 0.0
.rodata 272584 272584 0 0.0
.text 4412195 4412195 0 0.0
bridge-app debug (read only) 2772593 2772593 0 0.0
(read/write) 133176 133176 0 0.0
.bss 51800 51800 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 71440 71440 0 0.0
.dynamic 624 624 0 0.0
.got 4640 4640 0 0.0
.init 27 27 0 0.0
.init_array 824 824 0 0.0
.rodata 214536 214536 0 0.0
.text 2380387 2380387 0 0.0
chip-tool debug (read only) 10331929 10331929 0 0.0
(read/write) 441688 441688 0 0.0
.bss 93688 93688 0 0.0
.data 5090 5090 0 0.0
.data.rel.ro 335664 335664 0 0.0
.dynamic 624 624 0 0.0
.got 5816 5816 0 0.0
.init 27 27 0 0.0
.init_array 760 760 0 0.0
.rodata 388785 388785 0 0.0
.text 9347667 9347667 0 0.0
chip-tool-ipv6only arm64 (read only) 10173340 10173340 0 0.0
(read/write) 504152 504152 0 0.0
.bss 103080 103080 0 0.0
.data 4392 4392 0 0.0
.data.rel.ro 373032 373032 0 0.0
.dynamic 512 512 0 0.0
.got 18192 18192 0 0.0
.init 24 24 0 0.0
.init_array 248 248 0 0.0
.rodata 316168 316168 0 0.0
.text 9093224 9093224 0 0.0
lighting-app debug+rpc+ui (read only) 5245321 5245321 0 0.0
(read/write) 222536 222536 0 0.0
.bss 118064 118064 0 0.0
.data 4528 4528 0 0.0
.data.rel.ro 92376 92376 0 0.0
.dynamic 672 672 0 0.0
.got 5928 5928 0 0.0
.init 27 27 0 0.0
.init_array 944 944 0 0.0
.rodata 337076 337076 0 0.0
.text 4665811 4665811 0 0.0
lock-app debug (read only) 4478929 4478929 0 0.0
(read/write) 203128 203128 0 0.0
.bss 113488 113488 0 0.0
.data 3760 3760 0 0.0
.data.rel.ro 79080 79080 0 0.0
.dynamic 624 624 0 0.0
.got 5264 5264 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 248488 248488 0 0.0
.text 4020947 4020947 0 0.0
ota-provider-app debug (read only) 4130305 4130305 0 0.0
(read/write) 192064 192064 0 0.0
.bss 113632 113632 0 0.0
.data 4032 4032 0 0.0
.data.rel.ro 68480 68480 0 0.0
.dynamic 624 624 0 0.0
.got 4544 4544 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 201160 201160 0 0.0
.text 3738707 3738707 0 0.0
ota-requestor-app debug (read only) 4223769 4223769 0 0.0
(read/write) 196376 196376 0 0.0
.bss 114688 114688 0 0.0
.data 4272 4272 0 0.0
.data.rel.ro 71480 71480 0 0.0
.dynamic 624 624 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 784 784 0 0.0
.rodata 204488 204488 0 0.0
.text 3824515 3824515 0 0.0
shell debug (read only) 3049233 3049233 0 0.0
(read/write) 152936 152936 0 0.0
.bss 60392 60392 0 0.0
.data 784 784 0 0.0
.data.rel.ro 85832 85832 0 0.0
.dynamic 592 592 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 1176 1176 0 0.0
.rodata 214162 214162 0 0.0
.text 2660962 2660962 0 0.0
thermostat-no-ble arm64 (read only) 4357932 4357932 0 0.0
(read/write) 241912 241912 0 0.0
.bss 122216 122216 0 0.0
.data 2896 2896 0 0.0
.data.rel.ro 100512 100512 0 0.0
.dynamic 512 512 0 0.0
.got 11824 11824 0 0.0
.init 24 24 0 0.0
.init_array 424 424 0 0.0
.rodata 161268 161268 0 0.0
.text 3862600 3862600 0 0.0
tv-app debug (read only) 5318793 5318793 0 0.0
(read/write) 350272 350272 0 0.0
.bss 241632 241632 0 0.0
.data 5136 5136 0 0.0
.data.rel.ro 96096 96096 0 0.0
.dynamic 624 624 0 0.0
.got 5616 5616 0 0.0
.init 27 27 0 0.0
.init_array 1144 1144 0 0.0
.rodata 272472 272472 0 0.0
.text 4802563 4802563 0 0.0
tv-casting-app debug (read only) 8277561 8277561 0 0.0
(read/write) 210768 210768 0 0.0
.bss 54336 54336 0 0.0
.data 2544 2544 0 0.0
.data.rel.ro 147064 147064 0 0.0
.dynamic 624 624 0 0.0
.got 5088 5088 0 0.0
.init 27 27 0 0.0
.init_array 1064 1064 0 0.0
.rodata 337980 337980 0 0.0
.text 7539363 7539363 0 0.0
mbed lock-app-release cy8cproto_062_4343w (read only) 6224 6224 0 0.0
(read/write) 2523272 2523272 0 0.0
.bss 219424 219424 0 0.0
.data 5128 5128 0 0.0
.text 1485956 1485956 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1241172 1241172 0 0.0
bss 155482 155482 0 0.0
rodata 143176 143176 0 0.0
text 863520 863520 0 0.0
nrf7002dk_nrf5340_cpuapp (read only) 4 4 0 0.0
(read/write) 1359528 1359528 0 0.0
bss 140940 140940 0 0.0
rodata 137080 137080 0 0.0
text 790792 790792 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1160980 1160980 0 0.0
bss 154844 154844 0 0.0
rodata 113680 113680 0 0.0
text 813520 813520 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 837160 837160 0 0.0
(read/write) 1793916 1793916 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 193628 193628 0 0.0
.comment 212 212 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2552 2552 0 0.0
.debug_abbrev 1418422 1418422 0 0.0
.debug_aranges 145152 145152 0 0.0
.debug_frame 482876 482876 0 0.0
.debug_info 33508554 33508554 0 0.0
.debug_line 4234108 4234108 0 0.0
.debug_line_str 957 957 0 0.0
.debug_loclists 2304365 2304365 0 0.0
.debug_rnglists 144597 144597 0 0.0
.debug_str 4529477 4529477 0 0.0
.heap 837160 837160 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 296 296 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 850431 850431 0 0.0
.symtab 515376 515376 0 0.0
.text 1589348 1589348 0 0.0
.zero.table 8 8 0 0.0
text 0 0 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 839944 839944 0 0.0
(read/write) 1678740 1678740 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 190932 190932 0 0.0
.comment 212 212 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2464 2464 0 0.0
.debug_abbrev 1290829 1290829 0 0.0
.debug_aranges 135016 135016 0 0.0
.debug_frame 454352 454352 0 0.0
.debug_info 29288615 29288615 0 0.0
.debug_line 3947226 3947226 0 0.0
.debug_line_str 981 981 0 0.0
.debug_loclists 2120042 2120042 0 0.0
.debug_rnglists 133989 133989 0 0.0
.debug_str 3922055 3922055 0 0.0
.heap 839944 839944 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 296 296 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 719966 719966 0 0.0
.symtab 467712 467712 0 0.0
.text 1476956 1476956 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 846280 846280 0 0.0
(read/write) 1607052 1607052 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184708 184708 0 0.0
.comment 212 212 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2352 2352 0 0.0
.debug_abbrev 1130654 1130654 0 0.0
.debug_aranges 125112 125112 0 0.0
.debug_frame 417396 417396 0 0.0
.debug_info 24342677 24342677 0 0.0
.debug_line 3511670 3511670 0 0.0
.debug_line_str 942 942 0 0.0
.debug_loclists 1956828 1956828 0 0.0
.debug_rnglists 123673 123673 0 0.0
.debug_str 3729298 3729298 0 0.0
.heap 846280 846280 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 296 296 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 637531 637531 0 0.0
.symtab 431248 431248 0 0.0
.text 1411604 1411604 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 818880 818880 0 0.0
(read/write) 1640324 1640324 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 212092 212092 0 0.0
.comment 212 212 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2368 2368 0 0.0
.debug_abbrev 1121618 1121618 0 0.0
.debug_aranges 123920 123920 0 0.0
.debug_frame 413048 413048 0 0.0
.debug_info 2415440 2415440 0 0.0
.debug_line 3464725 3464725 0 0.0
.debug_line_str 933 933 0 0.0
.debug_loclists 1935347 1935347 0 0.0
.debug_rnglists 121769 121769 0 0.0
.debug_str 3692687 3692687 0 0.0
.heap 818880 818880 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 296 296 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 611606 611606 0 0.0
.symtab 423296 423296 0 0.0
.text 1417476 1417476 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1177908 1177908 0 0.0
.bss 101024 101024 0 0.0
.data 744 744 0 0.0
.text 624752 624752 0 0.0
lock-app qpg6105+debug (read/write) 1135388 1135388 0 0.0
.bss 95744 95744 0 0.0
.data 748 748 0 0.0
.text 582228 582228 0 0.0
telink all-clusters-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1096056 1096056 0 0.0
bss 108180 108180 0 0.0
text 752060 752060 0 0.0
all-clusters-minimal-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 981688 981688 0 0.0
bss 105332 105332 0 0.0
text 673674 673674 0 0.0
bridge-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 944936 944936 0 0.0
bss 109652 109652 0 0.0
text 647580 647580 0 0.0
contact-sensor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 876892 876892 0 0.0
bss 98696 98696 0 0.0
text 591102 591102 0 0.0
light-switch-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 923228 923228 0 0.0
bss 99536 99536 0 0.0
text 632788 632788 0 0.0
lighting-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 984156 984156 0 0.0
bss 107504 107504 0 0.0
text 687250 687250 0 0.0
lighting-app-factory-data tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 995520 995520 0 0.0
bss 111752 111752 0 0.0
text 694766 694766 0 0.0
lighting-app-rpc tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1053744 1053744 0 0.0
bss 109076 109076 0 0.0
text 732246 732246 0 0.0
lighting-app-shell tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 1085232 1085232 0 0.0
bss 120152 120152 0 0.0
text 752462 752462 0 0.0
lock-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 934956 934956 0 0.0
bss 99424 99424 0 0.0
text 622230 622230 0 0.0
ota-requestor-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 899488 899488 0 0.0
bss 100012 100012 0 0.0
text 612956 612956 0 0.0
pump-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 882308 882308 0 0.0
bss 98828 98828 0 0.0
text 596728 596728 0 0.0
pump-controller-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 869448 869448 0 0.0
bss 98628 98628 0 0.0
text 587150 587150 0 0.0
shell tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 744116 744116 0 0.0
bss 97208 97208 0 0.0
text 478532 478532 0 0.0
smoke_co_alarm-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 880384 880384 0 0.0
bss 98816 98816 0 0.0
text 595460 595460 0 0.0
temperature-measurement-app tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 865628 865628 0 0.0
bss 98536 98536 0 0.0
text 582796 582796 0 0.0
thermostat tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 890904 890904 0 0.0
bss 98928 98928 0 0.0
text 602878 602878 0 0.0
window-covering tlsr9518adk80d (read only) 4 4 0 0.0
(read/write) 886528 886528 0 0.0
bss 99252 99252 0 0.0
text 598202 598202 0 0.0

Copy link
Contributor

@chulspro chulspro left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@mergify mergify bot merged commit ba6af3c into project-chip:master Aug 29, 2023
@yhoyoon yhoyoon deleted the feature/contribution-inet branch August 29, 2023 03:47
HunsupJung pushed a commit to HunsupJung/connectedhomeip that referenced this pull request Oct 23, 2023
The project-chip#27981 PR was merged, but it didn't follow IpScore's comments.

// IP addess "suitability"
//   - Larger value means "more suitable"
//   - Enum ordered ascending for easier read. Note however that order of
//     checks MUST match in ScoreIpAddress below.
enum class IpScore : unsigned

This change matches the order of ScoreIpAddress with the order of
IpScore enum.

Signed-off-by: Youngho Yoon <[email protected]>
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.

3 participants