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

Wrap usages of src/ble/... with CONFIG_NETWORK_LAYER_BLE #16414

Merged
merged 11 commits into from
Mar 24, 2022

Conversation

wendythewan
Copy link
Contributor

Problem

What is being fixed? Examples:

  • When CONFIG_NETWORK_LAYER_BLE=0, src/ble/.. files will not be built, yet there are still usages of it that is unguarded by CONFIG_NETWORK_LAYER_BLE.

Change overview

  • Guard usages of src/ble/... with CONFIG_NETWORK_LAYER_BLE.
  • Remove the include of src/ble in CHIPDeviceLayer.h because it is not needed.

Testing

How was this tested? (at least one bullet point required)

  • Build Matter locally

@github-actions
Copy link

github-actions bot commented Mar 18, 2022

PR #16414: Size comparison from f68cca0 to e3b68e4

Decreases (2 builds for linux, telink)
platform target config section f68cca0 e3b68e4 change % change
linux thermostat-no-ble arm64 (read only) 2221604 2221508 -96 -0.0
(read/write) 149809 149793 -16 -0.0
.bss 65713 65697 -16 -0.0
.text 1863584 1863488 -96 -0.0
telink lighting-app tlsr9518adk80d (read/write) 895346 895322 -24 -0.0
bss 87432 87424 -8 -0.0
text 633008 633000 -8 -0.0
Full report (18 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section f68cca0 e3b68e4 change % change
cyw30739 light cyw930739m2evb_01 (read/write) 603610 603610 0 0.0
.app_xip_area 510708 510708 0 0.0
.bss 75656 75656 0 0.0
.data 596 596 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 561398 561398 0 0.0
.app_xip_area 470024 470024 0 0.0
.bss 74160 74160 0 0.0
.data 560 560 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 571114 571114 0 0.0
.app_xip_area 470092 470092 0 0.0
.bss 83464 83464 0 0.0
.data 520 520 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 921448 921448 0 0.0
(read/write) 128752 128752 0 0.0
.bss 126744 126744 0 0.0
.data 2008 2008 0 0.0
.text 921440 921440 0 0.0
BRD4161A+rpc (read only) 950252 950252 0 0.0
(read/write) 144708 144708 0 0.0
.bss 142520 142520 0 0.0
.data 2188 2188 0 0.0
.text 950244 950244 0 0.0
window-app BRD4161A (read only) 852008 852008 0 0.0
(read/write) 126704 126704 0 0.0
.bss 124840 124840 0 0.0
.data 1864 1864 0 0.0
.text 852000 852000 0 0.0
esp32 all-clusters-app c3devkit (read only) 961538 961538 0 0.0
(read/write) 1395034 1395034 0 0.0
.dram0.bss 64048 64048 0 0.0
.dram0.data 14188 14188 0 0.0
.flash.rodata 197888 197888 0 0.0
.flash.text 961538 961538 0 0.0
.iram0.text 62016 62016 0 0.0
m5stack (read only) 1017691 1017691 0 0.0
(read/write) 462892 462892 0 0.0
.dram0.bss 69576 69576 0 0.0
.dram0.data 34016 34016 0 0.0
.flash.rodata 227464 227464 0 0.0
.flash.text 1012307 1012307 0 0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 700580 700580 0 0.0
.bss 77632 77632 0 0.0
.data 1888 1888 0 0.0
.text 615260 615260 0 0.0
lock k32w061+release (read/write) 700716 700716 0 0.0
.bss 77624 77624 0 0.0
.data 1908 1908 0 0.0
.text 615384 615384 0 0.0
linux chip-tool-ipv6only arm64 (read only) 9767676 9767676 0 0.0
(read/write) 476113 476113 0 0.0
.bss 44033 44033 0 0.0
.data 1128 1128 0 0.0
.data.rel.ro 371824 371824 0 0.0
.dynamic 560 560 0 0.0
.got 55328 55328 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 493620 493620 0 0.0
.text 8222692 8222692 0 0.0
thermostat-no-ble arm64 (read only) 2221604 2221508 -96 -0.0
(read/write) 149809 149793 -16 -0.0
.bss 65713 65697 -16 -0.0
.data 1024 1024 0 0.0
.data.rel.ro 75728 75728 0 0.0
.dynamic 560 560 0 0.0
.got 4352 4352 0 0.0
.init 24 24 0 0.0
.init_array 360 360 0 0.0
.rodata 137956 137956 0 0.0
.text 1863584 1863488 -96 -0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2352876 2352876 0 0.0
.bss 186644 186644 0 0.0
.data 5752 5752 0 0.0
.text 1315476 1315476 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1155287 1155287 0 0.0
bss 146724 146724 0 0.0
rodata 145768 145768 0 0.0
text 787640 787640 0 0.0
p6 all-clusters-app default (read/write) 2492200 2492200 0 0.0
.bss 120072 120072 0 0.0
.data 2632 2632 0 0.0
.text 1450464 1450464 0 0.0
light-app default (read/write) 2395768 2395768 0 0.0
.bss 113536 113536 0 0.0
.data 2488 2488 0 0.0
.text 1354032 1354032 0 0.0
lock-app default (read/write) 2359312 2359312 0 0.0
.bss 113280 113280 0 0.0
.data 2448 2448 0 0.0
.text 1317576 1317576 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 895346 895322 -24 -0.0
bss 87432 87424 -8 -0.0
noinit 37160 37160 0 0.0
text 633008 633000 -8 -0.0

@wendythewan wendythewan changed the title Wrap usages of src/ble/BleLayer with CONFIG_NETWORK_LAYER_BLE Wrap usages of src/ble/... with CONFIG_NETWORK_LAYER_BLE Mar 18, 2022
@wendythewan wendythewan reopened this Mar 18, 2022
@andy31415 andy31415 merged commit e6141d4 into project-chip:master Mar 24, 2022
andrei-menzopol pushed a commit to andrei-menzopol/connectedhomeip that referenced this pull request Apr 14, 2022
…p#16414)

* Wrap usages of src/ble/BleLayer with CONFIG_NETWORK_LAYER_BLE

* Restyle Server.cpp

* Restyle CHIPDeviceControllerFactory

* Restyle CASEServer.cpp

* Update Server.cpp

* Restyle change

* Restyle change

* Restyle

* Restyle

* Restyle

* Remove whitespace
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