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

Inet: Move some InterfaceId functions out of InetLayer #11673

Merged

Conversation

kpschoedel
Copy link
Contributor

Problem

InetLayer contains some operations involving InterfaceId
that don't use any InetLayer state.

This is a step toward #7715 Virtualize System and Inet interfaces.

Change overview

Move these methods from InetLayer to InterfaceId:

  • GetLinkLocalAddr()
  • MatchLocalIPv6Subnet()
  • GetInterfaceFromAddr(), renamed InterfaceId::FromIPAddress()

Testing

CI; no changes to functionality.

#### Problem

`InetLayer` contains some operations involving `InterfaceId`
that don't use any `InetLayer` state.

This is a step toward project-chip#7715 _Virtualize System and Inet interfaces_.

#### Change overview

Move these methods from `InetLayer` to `InterfaceId`:
- `GetLinkLocalAddr()`
- `MatchLocalIPv6Subnet()`
- `GetInterfaceFromAddr()`, renamed `InterfaceId::FromIPAddress()`

#### Testing

CI; no changes to functionality.
@github-actions
Copy link

github-actions bot commented Nov 11, 2021

PR #11673: Size comparison from d45cfaa to 606e0a6

Decreases (1 build for esp32)
platform target config section d45cfaa 606e0a6 change % change
esp32 all-clusters-app m5stack (read only) 910683 910615 -68 -0.0
.flash.text 910683 910615 -68 -0.0
Full report (33 builds for efr32, esp32, k32w, linux, nrfconnect, p6, qpg, telink)
platform target config section d45cfaa 606e0a6 change % change
efr32 lighting-app BRD4161A (read only) 742476 742476 0 0.0
(read/write) 116280 116280 0 0.0
.bss 114500 114500 0 0.0
.data 1780 1780 0 0.0
.text 742468 742468 0 0.0
BRD4161A+rpc (read only) 730040 730040 0 0.0
(read/write) 132900 132900 0 0.0
.bss 131004 131004 0 0.0
.data 1896 1896 0 0.0
.text 730032 730032 0 0.0
lock-app BRD4161A (read only) 721764 721764 0 0.0
(read/write) 114096 114096 0 0.0
.bss 112356 112356 0 0.0
.data 1740 1740 0 0.0
.text 721756 721756 0 0.0
window-app BRD4161A (read only) 722676 722676 0 0.0
(read/write) 114420 114420 0 0.0
.bss 112676 112676 0 0.0
.data 1744 1744 0 0.0
.text 722668 722668 0 0.0
esp32 all-clusters-app c3devkit (read only) 879114 879114 0 0.0
(read/write) 1305968 1305968 0 0.0
.dram0.bss 58440 58440 0 0.0
.dram0.data 16456 16456 0 0.0
.flash.rodata 197824 197824 0 0.0
.flash.text 879114 879114 0 0.0
.iram0.text 57526 57526 0 0.0
m5stack (read only) 910683 910615 -68 -0.0
(read/write) 423308 423308 0 0.0
.dram0.bss 60952 60952 0 0.0
.dram0.data 32092 32092 0 0.0
.flash.rodata 204100 204100 0 0.0
.flash.text 910683 910615 -68 -0.0
.iram0.text 125115 125115 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 699396 699396 0 0.0
.bss 78012 78012 0 0.0
.data 1908 1908 0 0.0
.text 613676 613676 0 0.0
lock-app k32w061+debug (read/write) 592132 592132 0 0.0
.bss 68548 68548 0 0.0
.data 1876 1876 0 0.0
.text 515908 515908 0 0.0
shell k32w061+debug (read/write) 657760 657760 0 0.0
.bss 79340 79340 0 0.0
.data 1844 1844 0 0.0
.text 570776 570776 0 0.0
linux all-clusters-app debug (read only) 1698921 1698921 0 0.0
(read/write) 126432 126432 0 0.0
.bss 57904 57904 0 0.0
.data 1010 1010 0 0.0
.data.rel.ro 62256 62256 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 139061 139061 0 0.0
.text 1426370 1426370 0 0.0
bridge-app debug+rpc (read only) 1298741 1298741 0 0.0
(read/write) 77264 77264 0 0.0
.bss 42800 42800 0 0.0
.data 1568 1568 0 0.0
.data.rel.ro 27928 27928 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 110932 110932 0 0.0
.text 1091365 1091365 0 0.0
chip-tool debug (read only) 4813069 4813069 0 0.0
(read/write) 136992 136992 0 0.0
.bss 25960 25960 0 0.0
.data 2256 2256 0 0.0
.data.rel.ro 103336 103336 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 248298 248298 0 0.0
.text 4288437 4288437 0 0.0
lighting-app debug+rpc (read only) 1558113 1558113 0 0.0
(read/write) 110376 110376 0 0.0
.bss 48560 48560 0 0.0
.data 1202 1202 0 0.0
.data.rel.ro 55328 55328 0 0.0
.dynamic 608 608 0 0.0
.got 4112 4112 0 0.0
.init 27 27 0 0.0
.init_array 528 528 0 0.0
.rodata 128369 128369 0 0.0
.text 1295634 1295634 0 0.0
ota-provider-app debug (read only) 1259977 1259977 0 0.0
(read/write) 75624 75624 0 0.0
.bss 44992 44992 0 0.0
.data 752 752 0 0.0
.data.rel.ro 24776 24776 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 112615 112615 0 0.0
.text 1050562 1050562 0 0.0
ota-requestor-app debug (read only) 1345049 1345049 0 0.0
(read/write) 79392 79392 0 0.0
.bss 47456 47456 0 0.0
.data 816 816 0 0.0
.data.rel.ro 26040 26040 0 0.0
.dynamic 592 592 0 0.0
.got 3992 3992 0 0.0
.init 27 27 0 0.0
.init_array 472 472 0 0.0
.rodata 123728 123728 0 0.0
.text 1121970 1121970 0 0.0
shell debug (read only) 788441 788441 0 0.0
(read/write) 65608 65608 0 0.0
.bss 23944 23944 0 0.0
.data 242 242 0 0.0
.data.rel.ro 36928 36928 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 77519 77519 0 0.0
.text 609026 609026 0 0.0
tv-app debug (read only) 1842905 1842905 0 0.0
(read/write) 408216 408216 0 0.0
.bss 340232 340232 0 0.0
.data 2736 2736 0 0.0
.data.rel.ro 59600 59600 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 155757 155757 0 0.0
.text 1542674 1542674 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 861907 861907 0 0.0
bss 111476 111476 0 0.0
rodata 96532 96532 0 0.0
text 578272 578272 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 824267 824267 0 0.0
bss 107828 107828 0 0.0
rodata 87708 87708 0 0.0
text 552444 552444 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 786946 786946 0 0.0
bss 112848 112848 0 0.0
rodata 91788 91788 0 0.0
text 507740 507740 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 838615 838615 0 0.0
bss 110508 110508 0 0.0
rodata 92904 92904 0 0.0
text 559756 559756 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 763926 763926 0 0.0
bss 111920 111920 0 0.0
rodata 88208 88208 0 0.0
text 489316 489316 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497327 497327 0 0.0
bss 51824 51824 0 0.0
rodata 45780 45780 0 0.0
text 339436 339436 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 844707 844707 0 0.0
bss 110648 110648 0 0.0
rodata 94612 94612 0 0.0
text 563916 563916 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 838467 838467 0 0.0
bss 110544 110544 0 0.0
rodata 92900 92900 0 0.0
text 559492 559492 0 0.0
shell nrf52840dk_nrf52840 (read/write) 775955 775955 0 0.0
bss 109288 109288 0 0.0
rodata 72152 72152 0 0.0
text 519904 519904 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 690962 690962 0 0.0
bss 110272 110272 0 0.0
rodata 66796 66796 0 0.0
text 440512 440512 0 0.0
p6 all-clusters-app default (read/write) 2297136 2297136 0 0.0
.bss 112416 112416 0 0.0
.data 2520 2520 0 0.0
.heap 918408 918408 0 0.0
.text 1255400 1255400 0 0.0
lock-app default (read/write) 2211760 2211760 0 0.0
.bss 101264 101264 0 0.0
.data 2400 2400 0 0.0
.heap 929680 929680 0 0.0
.text 1170024 1170024 0 0.0
qpg lighting-app qpg6100+debug (read only) 490672 490672 0 0.0
(read/write) 114144 114144 0 0.0
.bss 51168 51168 0 0.0
.data 1008 1008 0 0.0
.text 485352 485352 0 0.0
lock-app qpg6100+debug (read only) 466900 466900 0 0.0
(read/write) 114140 114140 0 0.0
.bss 50112 50112 0 0.0
.data 964 964 0 0.0
.text 461580 461580 0 0.0
persistent-storage-app qpg6100+debug (read only) 105408 105408 0 0.0
(read/write) 114142 114142 0 0.0
.bss 8978 8978 0 0.0
.data 272 272 0 0.0
.text 100088 100088 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 663418 663418 0 0.0
bss 69288 69288 0 0.0
noinit 33216 33216 0 0.0
text 458654 458654 0 0.0

@andy31415
Copy link
Contributor

1 day fast track: this refactors code by moving it around.

@andy31415 andy31415 merged commit 415ca52 into project-chip:master Nov 12, 2021
@kpschoedel kpschoedel deleted the x7715-inet-interface-statics branch November 12, 2021 20:29
PSONALl pushed a commit to PSONALl/connectedhomeip that referenced this pull request Dec 3, 2021
…11673)

* Inet: Move some InterfaceId functions out of InetLayer

#### Problem

`InetLayer` contains some operations involving `InterfaceId`
that don't use any `InetLayer` state.

This is a step toward project-chip#7715 _Virtualize System and Inet interfaces_.

#### Change overview

Move these methods from `InetLayer` to `InterfaceId`:
- `GetLinkLocalAddr()`
- `MatchLocalIPv6Subnet()`
- `GetInterfaceFromAddr()`, renamed `InterfaceId::FromIPAddress()`

#### Testing

CI; no changes to functionality.

* restyle
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