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

Add more ContentApp cluster handlers #12634

Merged
merged 18 commits into from
Dec 13, 2021
Merged

Add more ContentApp cluster handlers #12634

merged 18 commits into from
Dec 13, 2021

Conversation

chrisdecenzo
Copy link
Contributor

@chrisdecenzo chrisdecenzo commented Dec 6, 2021

Problem

  • ContentApp clusters do not route messages to the ContentApp

Change overview

  • Add cluster handlers for all ContentApp clusters

Testing

  • chip-tool commands
  • TODO: integration tests

// launch tv-app
./out/host/chip-tv-app --secured-device-port 5640 --secured-commissioner-port 5552

// commission it from chip-tool
./out/host/chip-tool pairing onnetwork-long 1234 20202021 3840

// launch app named "App3" which is a dummy app on linux, which puts it at endpoint 6
./out/host/chip-tool applicationlauncher launch-app foo1 1 App3 1234 1

// read the application launcher list
./out/host/chip-tool applicationlauncher read application-launcher-list 1234 6

// read the accepts header for content launcher
./out/host/chip-tool contentlauncher read accepts-header-list 1234 6

// use content launcher to launch a url
./out/host/chip-tool contentlauncher launch-url http://www.yahoo.com foo2 1234 6

// use content launcher to launch content
./out/host/chip-tool contentlauncher launch-content 1 data1 1234 6

// use target navigator to read list of targets
./out/host/chip-tool targetnavigator read target-navigator-list 1234 6

// use target navigator to navigate to target 2
./out/host/chip-tool targetnavigator navigate-target 2 foo1 1234 6

@github-actions
Copy link

github-actions bot commented Dec 9, 2021

PR #12634: Size comparison from a8b7f4b to c6457e4

Full report (5 builds for mbed)
platform target config section a8b7f4b c6457e4 change % change
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2321408 2321408 0 0.0
.bss 186892 186892 0 0.0
.data 5232 5232 0 0.0
.heap 844320 844320 0 0.0
.text 1283984 1283984 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2307200 2307200 0 0.0
.bss 175704 175704 0 0.0
.data 5488 5488 0 0.0
.heap 855256 855256 0 0.0
.text 1269800 1269800 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2279992 2279992 0 0.0
.bss 174744 174744 0 0.0
.data 5488 5488 0 0.0
.heap 856216 856216 0 0.0
.text 1242592 1242592 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 4376 4376 0 0.0
.heap 1020312 1020312 0 0.0
.text 103392 103392 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2047904 2047904 0 0.0
.bss 156564 156564 0 0.0
.data 4864 4864 0 0.0
.heap 875016 875016 0 0.0
.text 1010504 1010504 0 0.0

@woody-apple
Copy link
Contributor

/rebase

@github-actions
Copy link

github-actions bot commented Dec 11, 2021

PR #12634: Size comparison from edbbd7f to 43e6484

Full report (18 builds for mbed, nrfconnect, qpg)
platform target config section edbbd7f 43e6484 change % change
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2313248 2313248 0 0.0
.bss 183948 183948 0 0.0
.data 5232 5232 0 0.0
.heap 847264 847264 0 0.0
.text 1275824 1275824 0 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2309040 2309040 0 0.0
.bss 175808 175808 0 0.0
.data 5528 5528 0 0.0
.heap 855112 855112 0 0.0
.text 1271640 1271640 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2282160 2282160 0 0.0
.bss 174848 174848 0 0.0
.data 5520 5520 0 0.0
.heap 856080 856080 0 0.0
.text 1244760 1244760 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 4376 4376 0 0.0
.heap 1020312 1020312 0 0.0
.text 103392 103392 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2053672 2053672 0 0.0
.bss 156980 156980 0 0.0
.data 4864 4864 0 0.0
.heap 874600 874600 0 0.0
.text 1016272 1016272 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 (read/write) 906939 906939 0 0.0
bss 116280 116280 0 0.0
rodata 101932 101932 0 0.0
text 613140 613140 0 0.0
nrf52840dk_nrf52840+rpc (read/write) 869987 869987 0 0.0
bss 112628 112628 0 0.0
rodata 93228 93228 0 0.0
text 587884 587884 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 832938 832938 0 0.0
bss 117656 117656 0 0.0
rodata 97188 97188 0 0.0
text 543568 543568 0 0.0
lock-app nrf52840dk_nrf52840 (read/write) 879599 879599 0 0.0
bss 113544 113544 0 0.0
rodata 98048 98048 0 0.0
text 592584 592584 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 805838 805838 0 0.0
bss 114952 114952 0 0.0
rodata 93336 93336 0 0.0
text 523104 523104 0 0.0
pigweed-app nrf52840dk_nrf52840 (read/write) 497463 497463 0 0.0
bss 51820 51820 0 0.0
rodata 45852 45852 0 0.0
text 339492 339492 0 0.0
pump-app nrf52840dk_nrf52840 (read/write) 884535 884535 0 0.0
bss 113456 113456 0 0.0
rodata 99400 99400 0 0.0
text 596176 596176 0 0.0
pump-controller-app nrf52840dk_nrf52840 (read/write) 877731 877731 0 0.0
bss 113332 113332 0 0.0
rodata 97540 97540 0 0.0
text 591372 591372 0 0.0
shell nrf52840dk_nrf52840 (read/write) 782283 782283 0 0.0
bss 109624 109624 0 0.0
rodata 74296 74296 0 0.0
text 523852 523852 0 0.0
nrf5340dk_nrf5340_cpuapp (read/write) 697362 697362 0 0.0
bss 110604 110604 0 0.0
rodata 68940 68940 0 0.0
text 444492 444492 0 0.0
qpg lighting-app qpg6100+debug (read only) 521412 521412 0 0.0
(read/write) 122336 122336 0 0.0
.bss 82696 82696 0 0.0
.data 992 992 0 0.0
.text 516092 516092 0 0.0
lock-app qpg6100+debug (read only) 495800 495800 0 0.0
(read/write) 122332 122332 0 0.0
.bss 81832 81832 0 0.0
.data 948 948 0 0.0
.text 490480 490480 0 0.0
persistent-storage-app qpg6100+debug (read only) 108104 108104 0 0.0
(read/write) 122336 122336 0 0.0
.bss 36160 36160 0 0.0
.data 288 288 0 0.0
.text 102784 102784 0 0.0

@github-actions
Copy link

github-actions bot commented Dec 11, 2021

PR #12634: Size comparison from edbbd7f to 1ca1298

Increases above 0.2%:

platform target config section edbbd7f 1ca1298 change % change
p6 all-clusters-app default .data 2520 2528 8 0.3
light-app default .data 2360 2368 8 0.3
Increases (9 builds for esp32, k32w, p6, telink)
platform target config section edbbd7f 1ca1298 change % change
esp32 all-clusters-app c3devkit (read only) 856438 857194 756 0.1
(read/write) 1304266 1304378 112 0.0
.dram0.bss 64680 64696 16 0.0
.flash.rodata 172424 172520 96 0.1
.flash.text 856438 857194 756 0.1
m5stack (read only) 960075 960795 720 0.1
(read/write) 449992 450092 100 0.0
.dram0.bss 73960 73976 16 0.0
.flash.rodata 210196 210280 84 0.0
.flash.text 954691 955411 720 0.1
k32w lighting-app k32w061+se05x+release (read/write) 669632 670416 784 0.1
.bss 73856 73872 16 0.0
.data 1892 1896 4 0.2
.text 588084 588848 764 0.1
lock-app k32w061+debug (read/write) 619584 620352 768 0.1
.bss 72008 72024 16 0.0
.data 1852 1856 4 0.2
.text 539924 540672 748 0.1
shell k32w061+debug (read/write) 624904 625720 816 0.1
.bss 74316 74332 16 0.0
.data 1832 1836 4 0.2
.text 542956 543752 796 0.1
p6 all-clusters-app default (read/write) 2359800 2360920 1120 0.0
.bss 112148 112164 16 0.0
.data 2520 2528 8 0.3
.text 1318064 1319184 1120 0.1
light-app default (read/write) 2300384 2301520 1136 0.0
.bss 101064 101080 16 0.0
.data 2360 2368 8 0.3
.text 1258648 1259784 1136 0.1
lock-app default (read/write) 2276456 2277584 1128 0.0
.bss 99944 99960 16 0.0
.text 1234720 1235848 1128 0.1
telink lighting-app tlsr9518adk80d (read/write) 811418 812246 828 0.1
bss 82848 82864 16 0.0
text 566528 567248 720 0.1
Decreases (3 builds for p6)
platform target config section edbbd7f 1ca1298 change % change
p6 all-clusters-app default .heap 918672 918648 -24 -0.0
light-app default .heap 929920 929896 -24 -0.0
lock-app default .heap 931072 931056 -16 -0.0
Full report (9 builds for esp32, k32w, p6, telink)
platform target config section edbbd7f 1ca1298 change % change
esp32 all-clusters-app c3devkit (read only) 856438 857194 756 0.1
(read/write) 1304266 1304378 112 0.0
.dram0.bss 64680 64696 16 0.0
.dram0.data 14124 14124 0 0.0
.flash.rodata 172424 172520 96 0.1
.flash.text 856438 857194 756 0.1
.iram0.text 62076 62076 0 0.0
m5stack (read only) 960075 960795 720 0.1
(read/write) 449992 450092 100 0.0
.dram0.bss 73960 73976 16 0.0
.dram0.data 34048 34048 0 0.0
.flash.rodata 210196 210280 84 0.0
.flash.text 954691 955411 720 0.1
.iram0.text 123451 123451 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 669632 670416 784 0.1
.bss 73856 73872 16 0.0
.data 1892 1896 4 0.2
.text 588084 588848 764 0.1
lock-app k32w061+debug (read/write) 619584 620352 768 0.1
.bss 72008 72024 16 0.0
.data 1852 1856 4 0.2
.text 539924 540672 748 0.1
shell k32w061+debug (read/write) 624904 625720 816 0.1
.bss 74316 74332 16 0.0
.data 1832 1836 4 0.2
.text 542956 543752 796 0.1
p6 all-clusters-app default (read/write) 2359800 2360920 1120 0.0
.bss 112148 112164 16 0.0
.data 2520 2528 8 0.3
.heap 918672 918648 -24 -0.0
.text 1318064 1319184 1120 0.1
light-app default (read/write) 2300384 2301520 1136 0.0
.bss 101064 101080 16 0.0
.data 2360 2368 8 0.3
.heap 929920 929896 -24 -0.0
.text 1258648 1259784 1136 0.1
lock-app default (read/write) 2276456 2277584 1128 0.0
.bss 99944 99960 16 0.0
.data 2328 2328 0 0.0
.heap 931072 931056 -16 -0.0
.text 1234720 1235848 1128 0.1
telink lighting-app tlsr9518adk80d (read/write) 811418 812246 828 0.1
bss 82848 82864 16 0.0
noinit 37160 37160 0 0.0
text 566528 567248 720 0.1

@boring-cyborg boring-cyborg bot added the github label Dec 12, 2021
* Restyled by prettier-markdown

* Restyled by prettier-yaml

Co-authored-by: Restyled.io <commits@restyled.io>
@github-actions
Copy link

github-actions bot commented Dec 12, 2021

PR #12634: Size comparison from edbbd7f to e76033f

Increases above 0.2%:

platform target config section edbbd7f e76033f change % change
linux thermostat-no-ble arm64 (read only) 1947956 1954196 6240 0.3
.data.rel.ro 70344 70528 184 0.3
.got 3624 3648 24 0.7
.init_array 272 280 8 2.9
.text 1614704 1620304 5600 0.3
p6 all-clusters-app default .data 2520 2528 8 0.3
light-app default .data 2360 2368 8 0.3
Increases (17 builds for efr32, esp32, k32w, linux, mbed, p6)
platform target config section edbbd7f e76033f change % change
efr32 lighting-app BRD4161A (read only) 814844 815892 1048 0.1
(read/write) 123132 123152 20 0.0
.bss 121272 121288 16 0.0
.data 1860 1864 4 0.2
.text 814836 815884 1048 0.1
BRD4161A+rpc (read only) 802476 803524 1048 0.1
(read/write) 139808 139828 20 0.0
.bss 137848 137864 16 0.0
.data 1960 1964 4 0.2
.text 802468 803516 1048 0.1
window-app BRD4161A (read only) 791920 792976 1056 0.1
(read/write) 122080 122104 24 0.0
.bss 120256 120272 16 0.0
.data 1824 1828 4 0.2
.text 791912 792968 1056 0.1
esp32 all-clusters-app c3devkit (read only) 856438 857194 756 0.1
(read/write) 1304266 1304378 112 0.0
.dram0.bss 64680 64696 16 0.0
.flash.rodata 172424 172520 96 0.1
.flash.text 856438 857194 756 0.1
m5stack (read only) 960075 960795 720 0.1
(read/write) 449992 450092 100 0.0
.dram0.bss 73960 73976 16 0.0
.flash.rodata 210196 210280 84 0.0
.flash.text 954691 955411 720 0.1
k32w lighting-app k32w061+se05x+release (read/write) 669632 670416 784 0.1
.bss 73856 73872 16 0.0
.data 1892 1896 4 0.2
.text 588084 588848 764 0.1
lock-app k32w061+debug (read/write) 619584 620352 768 0.1
.bss 72008 72024 16 0.0
.data 1852 1856 4 0.2
.text 539924 540672 748 0.1
shell k32w061+debug (read/write) 624904 625720 816 0.1
.bss 74316 74332 16 0.0
.data 1832 1836 4 0.2
.text 542956 543752 796 0.1
linux chip-tool-ipv6only arm64 (read only) 6861276 6863180 1904 0.0
(read/write) 318657 318737 80 0.0
.data.rel.ro 208384 208416 32 0.0
.got 53456 53512 56 0.1
.rodata 364972 364988 16 0.0
.text 5816212 5817828 1616 0.0
thermostat-no-ble arm64 (read only) 1947956 1954196 6240 0.3
(read/write) 137185 137425 240 0.2
.bss 59505 59537 32 0.1
.data.rel.ro 70344 70528 184 0.3
.got 3624 3648 24 0.7
.init_array 272 280 8 2.9
.rodata 125476 125780 304 0.2
.text 1614704 1620304 5600 0.3
mbed all-clusters-app CY8CPROTO_062_4343W+release (read/write) 2313248 2314040 792 0.0
.bss 183948 183964 16 0.0
.data 5232 5240 8 0.2
.text 1275824 1276616 792 0.1
lighting-app CY8CPROTO_062_4343W+release (read/write) 2309040 2309896 856 0.0
.bss 175808 175824 16 0.0
.data 5528 5536 8 0.1
.text 1271640 1272496 856 0.1
lock-app CY8CPROTO_062_4343W+release (read/write) 2282160 2283008 848 0.0
.bss 174848 174864 16 0.0
.data 5520 5528 8 0.1
.text 1244760 1245608 848 0.1
shell CY8CPROTO_062_4343W+release (read/write) 2053672 2053944 272 0.0
.text 1016272 1016544 272 0.0
p6 all-clusters-app default (read/write) 2359800 2360920 1120 0.0
.bss 112148 112164 16 0.0
.data 2520 2528 8 0.3
.text 1318064 1319184 1120 0.1
light-app default (read/write) 2300384 2301520 1136 0.0
.bss 101064 101080 16 0.0
.data 2360 2368 8 0.3
.text 1258648 1259784 1136 0.1
lock-app default (read/write) 2276456 2277584 1128 0.0
.bss 99944 99960 16 0.0
.text 1234720 1235848 1128 0.1
Decreases (6 builds for mbed, p6)
platform target config section edbbd7f e76033f change % change
mbed all-clusters-app CY8CPROTO_062_4343W+release .heap 847264 847240 -24 -0.0
lighting-app CY8CPROTO_062_4343W+release .heap 855112 855088 -24 -0.0
lock-app CY8CPROTO_062_4343W+release .heap 856080 856056 -24 -0.0
p6 all-clusters-app default .heap 918672 918648 -24 -0.0
light-app default .heap 929920 929896 -24 -0.0
lock-app default .heap 931072 931056 -16 -0.0
Full report (18 builds for efr32, esp32, k32w, linux, mbed, p6)
platform target config section edbbd7f e76033f change % change
efr32 lighting-app BRD4161A (read only) 814844 815892 1048 0.1
(read/write) 123132 123152 20 0.0
.bss 121272 121288 16 0.0
.data 1860 1864 4 0.2
.text 814836 815884 1048 0.1
BRD4161A+rpc (read only) 802476 803524 1048 0.1
(read/write) 139808 139828 20 0.0
.bss 137848 137864 16 0.0
.data 1960 1964 4 0.2
.text 802468 803516 1048 0.1
window-app BRD4161A (read only) 791920 792976 1056 0.1
(read/write) 122080 122104 24 0.0
.bss 120256 120272 16 0.0
.data 1824 1828 4 0.2
.text 791912 792968 1056 0.1
esp32 all-clusters-app c3devkit (read only) 856438 857194 756 0.1
(read/write) 1304266 1304378 112 0.0
.dram0.bss 64680 64696 16 0.0
.dram0.data 14124 14124 0 0.0
.flash.rodata 172424 172520 96 0.1
.flash.text 856438 857194 756 0.1
.iram0.text 62076 62076 0 0.0
m5stack (read only) 960075 960795 720 0.1
(read/write) 449992 450092 100 0.0
.dram0.bss 73960 73976 16 0.0
.dram0.data 34048 34048 0 0.0
.flash.rodata 210196 210280 84 0.0
.flash.text 954691 955411 720 0.1
.iram0.text 123451 123451 0 0.0
k32w lighting-app k32w061+se05x+release (read/write) 669632 670416 784 0.1
.bss 73856 73872 16 0.0
.data 1892 1896 4 0.2
.text 588084 588848 764 0.1
lock-app k32w061+debug (read/write) 619584 620352 768 0.1
.bss 72008 72024 16 0.0
.data 1852 1856 4 0.2
.text 539924 540672 748 0.1
shell k32w061+debug (read/write) 624904 625720 816 0.1
.bss 74316 74332 16 0.0
.data 1832 1836 4 0.2
.text 542956 543752 796 0.1
linux chip-tool-ipv6only arm64 (read only) 6861276 6863180 1904 0.0
(read/write) 318657 318737 80 0.0
.bss 51889 51889 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 208384 208416 32 0.0
.dynamic 560 560 0 0.0
.got 53456 53512 56 0.1
.init 24 24 0 0.0
.init_array 176 176 0 0.0
.rodata 364972 364988 16 0.0
.text 5816212 5817828 1616 0.0
thermostat-no-ble arm64 (read only) 1947956 1954196 6240 0.3
(read/write) 137185 137425 240 0.2
.bss 59505 59537 32 0.1
.data 832 832 0 0.0
.data.rel.ro 70344 70528 184 0.3
.dynamic 560 560 0 0.0
.got 3624 3648 24 0.7
.init 24 24 0 0.0
.init_array 272 280 8 2.9
.rodata 125476 125780 304 0.2
.text 1614704 1620304 5600 0.3
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2313248 2314040 792 0.0
.bss 183948 183964 16 0.0
.data 5232 5240 8 0.2
.heap 847264 847240 -24 -0.0
.text 1275824 1276616 792 0.1
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2309040 2309896 856 0.0
.bss 175808 175824 16 0.0
.data 5528 5536 8 0.1
.heap 855112 855088 -24 -0.0
.text 1271640 1272496 856 0.1
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2282160 2283008 848 0.0
.bss 174848 174864 16 0.0
.data 5520 5528 8 0.1
.heap 856080 856056 -24 -0.0
.text 1244760 1245608 848 0.1
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 4376 4376 0 0.0
.heap 1020312 1020312 0 0.0
.text 103392 103392 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2053672 2053944 272 0.0
.bss 156980 156980 0 0.0
.data 4864 4864 0 0.0
.heap 874600 874600 0 0.0
.text 1016272 1016544 272 0.0
p6 all-clusters-app default (read/write) 2359800 2360920 1120 0.0
.bss 112148 112164 16 0.0
.data 2520 2528 8 0.3
.heap 918672 918648 -24 -0.0
.text 1318064 1319184 1120 0.1
light-app default (read/write) 2300384 2301520 1136 0.0
.bss 101064 101080 16 0.0
.data 2360 2368 8 0.3
.heap 929920 929896 -24 -0.0
.text 1258648 1259784 1136 0.1
lock-app default (read/write) 2276456 2277584 1128 0.0
.bss 99944 99960 16 0.0
.data 2328 2328 0 0.0
.heap 931072 931056 -16 -0.0
.text 1234720 1235848 1128 0.1

@chrisdecenzo chrisdecenzo merged commit f85d6ed into master Dec 13, 2021
@chrisdecenzo chrisdecenzo deleted the tv-apps2 branch December 13, 2021 01:19
@chrisdecenzo chrisdecenzo mentioned this pull request Dec 15, 2021
examples/tv-app/linux/AppImpl.cpp Show resolved Hide resolved
examples/tv-app/linux/AppImpl.cpp Show resolved Hide resolved
examples/tv-app/linux/AppImpl.cpp Show resolved Hide resolved
src/app/util/ContentApp.cpp Show resolved Hide resolved
src/app/util/ContentApp.cpp Show resolved Hide resolved
src/app/util/ContentApp.cpp Show resolved Hide resolved
src/app/util/ContentApp.cpp Show resolved Hide resolved
src/app/util/ContentApp.cpp Show resolved Hide resolved
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.

5 participants