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

Revert PR 16743 #17427

Merged
merged 2 commits into from
Apr 18, 2022
Merged

Revert PR 16743 #17427

merged 2 commits into from
Apr 18, 2022

Conversation

isiu-apple
Copy link
Contributor

Problem

The BDX timeout tracking code is not used in OTA-R, but it is actually being used in OTA-P. Therefore need to revert the code removal made with #16743

Change overview

Revert the changes made in: #16743

Testing

Sanity test OTA-R and OTA-P.

@boring-cyborg boring-cyborg bot added the app label Apr 15, 2022
@isiu-apple
Copy link
Contributor Author

This PR reverts issue #12520, PR #16743.

@isiu-apple isiu-apple mentioned this pull request Apr 15, 2022
Open
@github-actions
Copy link

github-actions bot commented Apr 15, 2022 •
edited
Loading

PR #17427: Size comparison from 4967c0e to 3a9868e

Increases (11 builds for cc13x2_26x2, cyw30739, efr32, linux, nrfconnect)
platform target config section 4967c0e 3a9868e change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 684127 684295 168 0.0
.bss 76152 76168 16 0.0
.text 580344 580512 168 0.0
lock-ftd LP_CC2652R7 (read only) 677015 677199 184 0.0
.bss 74152 74168 16 0.0
.text 577772 577956 184 0.0
lock-mtd LP_CC2652R7 (read only) 625759 625943 184 0.0
(read/write) 146940 146956 16 0.0
.bss 69872 69888 16 0.0
.text 526628 526812 184 0.0
pump-app LP_CC2652R7 (read only) 649255 649439 184 0.0
(read/write) 152476 152492 16 0.0
.bss 74608 74624 16 0.0
.text 573120 573304 184 0.0
pump-controller-app LP_CC2652R7 (read only) 642503 642687 184 0.0
(read/write) 152144 152160 16 0.0
.bss 74312 74328 16 0.0
.text 563088 563272 184 0.0
cyw30739 ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 565838 566022 184 0.0
.app_xip_area 464504 464672 168 0.0
.bss 83736 83752 16 0.0
efr32 lighting-app BRD4161A (read only) 908556 908620 64 0.0
(read/write) 133112 133128 16 0.0
.bss 131072 131088 16 0.0
.text 908548 908612 64 0.0
BRD4161A+rpc (read only) 942932 942996 64 0.0
(read/write) 149796 149812 16 0.0
.bss 147552 147568 16 0.0
.text 942924 942988 64 0.0
linux ota-provider-app debug (read only) 2050649 2051129 480 0.0
.text 1720418 1720898 480 0.0
ota-requestor-app debug (read only) 2080329 2080953 624 0.0
.text 1752290 1752914 624 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1164051 1164211 160 0.0
bss 136504 136520 16 0.0
text 801444 801616 172 0.0
Decreases (2 builds for cc13x2_26x2)
platform target config section 4967c0e 3a9868e change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 169040 168888 -152 -0.1
lock-ftd LP_CC2652R7 (read/write) 167096 166928 -168 -0.1
Full report (32 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 4967c0e 3a9868e change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 684127 684295 168 0.0
(read/write) 169040 168888 -152 -0.1
.bss 76152 76168 16 0.0
.data 3380 3380 0 0.0
.rodata 103303 103303 0 0.0
.text 580344 580512 168 0.0
lock-ftd LP_CC2652R7 (read only) 677015 677199 184 0.0
(read/write) 167096 166928 -168 -0.1
.bss 74152 74168 16 0.0
.data 3212 3212 0 0.0
.rodata 98759 98759 0 0.0
.text 577772 577956 184 0.0
lock-mtd LP_CC2652R7 (read only) 625759 625943 184 0.0
(read/write) 146940 146956 16 0.0
.bss 69872 69888 16 0.0
.data 3212 3212 0 0.0
.rodata 98639 98639 0 0.0
.text 526628 526812 184 0.0
pump-app LP_CC2652R7 (read only) 649255 649439 184 0.0
(read/write) 152476 152492 16 0.0
.bss 74608 74624 16 0.0
.data 3244 3244 0 0.0
.rodata 75647 75647 0 0.0
.text 573120 573304 184 0.0
pump-controller-app LP_CC2652R7 (read only) 642503 642687 184 0.0
(read/write) 152144 152160 16 0.0
.bss 74312 74328 16 0.0
.data 3208 3208 0 0.0
.rodata 78927 78927 0 0.0
.text 563088 563272 184 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 619134 619134 0 0.0
.app_xip_area 525892 525892 0 0.0
.bss 75908 75908 0 0.0
.data 684 684 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 613394 613394 0 0.0
.app_xip_area 521656 521656 0 0.0
.bss 74436 74436 0 0.0
.data 648 648 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 565838 566022 184 0.0
.app_xip_area 464504 464672 168 0.0
.bss 83736 83752 16 0.0
.data 564 564 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 908556 908620 64 0.0
(read/write) 133112 133128 16 0.0
.bss 131072 131088 16 0.0
.data 2040 2040 0 0.0
.text 908548 908612 64 0.0
BRD4161A+rpc (read only) 942932 942996 64 0.0
(read/write) 149796 149812 16 0.0
.bss 147552 147568 16 0.0
.data 2244 2244 0 0.0
.text 942924 942988 64 0.0
window-app BRD4161A (read only) 845356 845356 0 0.0
(read/write) 131116 131116 0 0.0
.bss 129168 129168 0 0.0
.data 1948 1948 0 0.0
.text 845348 845348 0 0.0
esp32 all-clusters-app c3devkit (read only) 980270 980270 0 0.0
(read/write) 1397738 1397738 0 0.0
.dram0.bss 62600 62600 0 0.0
.dram0.data 14412 14412 0 0.0
.flash.rodata 201808 201808 0 0.0
.flash.text 980270 980270 0 0.0
.iram0.text 62016 62016 0 0.0
m5stack (read only) 1035771 1035771 0 0.0
(read/write) 465472 465472 0 0.0
.dram0.bss 68112 68112 0 0.0
.dram0.data 34152 34152 0 0.0
.flash.rodata 231372 231372 0 0.0
.flash.text 1030387 1030387 0 0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 684716 684716 0 0.0
.bss 77912 77912 0 0.0
.data 1992 1992 0 0.0
.text 599012 599012 0 0.0
lock k32w061+release (read/write) 725572 725572 0 0.0
.bss 78520 78520 0 0.0
.data 1952 1952 0 0.0
.text 639300 639300 0 0.0
linux all-clusters-app debug (read only) 2701817 2701817 0 0.0
(read/write) 149560 149560 0 0.0
.bss 59968 59968 0 0.0
.data 1920 1920 0 0.0
.data.rel.ro 81624 81624 0 0.0
.dynamic 608 608 0 0.0
.got 4448 4448 0 0.0
.init 27 27 0 0.0
.init_array 976 976 0 0.0
.rodata 232741 232741 0 0.0
.text 2294450 2294450 0 0.0
bridge-app debug+rpc (read only) 1841149 1841149 0 0.0
(read/write) 91920 91920 0 0.0
.bss 44232 44232 0 0.0
.data 2912 2912 0 0.0
.data.rel.ro 39688 39688 0 0.0
.dynamic 592 592 0 0.0
.got 3920 3920 0 0.0
.init 27 27 0 0.0
.init_array 544 544 0 0.0
.rodata 148697 148697 0 0.0
.text 1573525 1573525 0 0.0
chip-tool debug (read only) 10761653 10761653 0 0.0
(read/write) 373200 373200 0 0.0
.bss 22592 22592 0 0.0
.data 1136 1136 0 0.0
.data.rel.ro 343224 343224 0 0.0
.dynamic 624 624 0 0.0
.got 4936 4936 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 540333 540333 0 0.0
.text 9388005 9388005 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 10387012 10387012 0 0.0
(read/write) 493489 493489 0 0.0
.bss 40865 40865 0 0.0
.data 1184 1184 0 0.0
.data.rel.ro 390224 390224 0 0.0
.dynamic 560 560 0 0.0
.got 57408 57408 0 0.0
.init 24 24 0 0.0
.init_array 184 184 0 0.0
.rodata 513876 513876 0 0.0
.text 8766020 8766020 0 0.0
door-lock-app debug (read only) 2112465 2112465 0 0.0
(read/write) 119688 119688 0 0.0
.bss 47840 47840 0 0.0
.data 1472 1472 0 0.0
.data.rel.ro 64840 64840 0 0.0
.dynamic 592 592 0 0.0
.got 4248 4248 0 0.0
.init 27 27 0 0.0
.init_array 672 672 0 0.0
.rodata 186953 186953 0 0.0
.text 1769314 1769314 0 0.0
lighting-app debug+rpc (read only) 2317281 2317281 0 0.0
(read/write) 127976 127976 0 0.0
.bss 50016 50016 0 0.0
.data 1952 1952 0 0.0
.data.rel.ro 70312 70312 0 0.0
.dynamic 608 608 0 0.0
.got 4304 4304 0 0.0
.init 27 27 0 0.0
.init_array 768 768 0 0.0
.rodata 182889 182889 0 0.0
.text 1967970 1967970 0 0.0
ota-provider-app debug (read only) 2050649 2051129 480 0.0
(read/write) 115608 115608 0 0.0
.bss 48032 48032 0 0.0
.data 1640 1640 0 0.0
.data.rel.ro 60200 60200 0 0.0
.dynamic 608 608 0 0.0
.got 4448 4448 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 173259 173259 0 0.0
.text 1720418 1720898 480 0.0
ota-requestor-app debug (read only) 2080329 2080953 624 0.0
(read/write) 118416 118416 0 0.0
.bss 48704 48704 0 0.0
.data 1896 1896 0 0.0
.data.rel.ro 62248 62248 0 0.0
.dynamic 592 592 0 0.0
.got 4288 4288 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 169580 169580 0 0.0
.text 1752290 1752914 624 0.0
shell debug (read only) 2530369 2530369 0 0.0
(read/write) 150376 150376 0 0.0
.bss 67368 67368 0 0.0
.data 1296 1296 0 0.0
.data.rel.ro 76008 76008 0 0.0
.dynamic 592 592 0 0.0
.got 4168 4168 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 215090 215090 0 0.0
.text 2153394 2153394 0 0.0
thermostat-no-ble arm64 (read only) 2357428 2357428 0 0.0
(read/write) 151137 151137 0 0.0
.bss 62945 62945 0 0.0
.data 1440 1440 0 0.0
.data.rel.ro 78984 78984 0 0.0
.dynamic 560 560 0 0.0
.got 4752 4752 0 0.0
.init 24 24 0 0.0
.init_array 368 368 0 0.0
.rodata 144788 144788 0 0.0
.text 1983648 1983648 0 0.0
tv-app debug (read only) 2833129 2833129 0 0.0
(read/write) 250952 250952 0 0.0
.bss 163896 163896 0 0.0
.data 4480 4480 0 0.0
.data.rel.ro 76384 76384 0 0.0
.dynamic 592 592 0 0.0
.got 4680 4680 0 0.0
.init 27 27 0 0.0
.init_array 904 904 0 0.0
.rodata 214187 214187 0 0.0
.text 2436914 2436914 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2410188 2410188 0 0.0
.bss 185228 185228 0 0.0
.data 5840 5840 0 0.0
.text 1372788 1372788 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1164051 1164211 160 0.0
bss 136504 136520 16 0.0
rodata 147444 147444 0 0.0
text 801444 801616 172 0.0
p6 all-clusters-app default (read/write) 2516664 2516664 0 0.0
.bss 118624 118624 0 0.0
.data 2768 2768 0 0.0
.text 1474928 1474928 0 0.0
light-app default (read/write) 2416968 2416968 0 0.0
.bss 112104 112104 0 0.0
.data 2576 2576 0 0.0
.text 1375232 1375232 0 0.0
lock-app default (read/write) 2420432 2420432 0 0.0
.bss 111880 111880 0 0.0
.data 2536 2536 0 0.0
.text 1378696 1378696 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 801664 801664 0 0.0
bss 69952 69952 0 0.0
noinit 40416 40416 0 0.0
text 570346 570346 0 0.0

@carol-apple carol-apple merged commit 4fc01e1 into project-chip:master Apr 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carol-apple carol-apple carol-apple approved these changes

@selissia selissia selissia approved these changes

@andy31415 andy31415 Awaiting requested review from andy31415

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

@austinh0 austinh0 Awaiting requested review from austinh0

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@bzbarsky-apple bzbarsky-apple Awaiting requested review from bzbarsky-apple

@cecille cecille Awaiting requested review from cecille

@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

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

@gjc13 gjc13 Awaiting requested review from gjc13

@hawk248 hawk248 Awaiting requested review from hawk248

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

@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

@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

@mlepage-google mlepage-google Awaiting requested review from mlepage-google

@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

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@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

@yunhanw-google yunhanw-google Awaiting requested review from yunhanw-google

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

Successfully merging this pull request may close these issues.
3 participants
@isiu-apple @selissia @carol-apple