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

Do not reset state if query image is not available (either not availa… #25068

Merged
merged 7 commits into from
Feb 16, 2023
Merged

Do not reset state if query image is not available (either not availa… #25068

merged 7 commits into from
Feb 16, 2023

Conversation

nivi-apple
Copy link
Contributor

…ble, or protocol not supported or if delegate returns busy)

Fixes #25067

@nivi-apple nivi-apple force-pushed the ota_fix_test_remove_reset_state branch 4 times, most recently from 7aebeb8 to e489967 Compare February 15, 2023 00:24
@github-actions
Copy link

PR #25068: Size comparison from a6d2883 to 8a67319

Full report (1 build for cc32xx)
platform target config section a6d2883 8a67319 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 640577 640577 0 0.0
(read/write) 204100 204100 0 0.0
.ARM.attributes 44 44 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 197504 197504 0 0.0
.comment 194 194 0 0.0
.data 1476 1476 0 0.0
.debug_abbrev 930806 930806 0 0.0
.debug_aranges 87360 87360 0 0.0
.debug_frame 299864 299864 0 0.0
.debug_info 20307078 20307078 0 0.0
.debug_line 2654650 2654650 0 0.0
.debug_loc 2787110 2787110 0 0.0
.debug_ranges 280904 280904 0 0.0
.debug_str 3001983 3001983 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105665 105665 0 0.0
.shstrtab 232 232 0 0.0
.stab 204 204 0 0.0
.stabstr 441 441 0 0.0
.stack 2048 2048 0 0.0
.strtab 375952 375952 0 0.0
.symtab 255888 255888 0 0.0
.text 532792 532792 0 0.0

nivi-apple and others added 3 commits February 14, 2023 18:31
@nivi-apple
Do not reset state if query image is not available (either not availa…
5e60759 
…ble, or protocol not supported or if delegate returns busy)
@nivi-apple @bzbarsky-apple
Update src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm
8b4abf4 
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
@nivi-apple
Addressed review comments
8cc7f47
@nivi-apple nivi-apple force-pushed the ota_fix_test_remove_reset_state branch from 8a67319 to ecf57b2 Compare February 15, 2023 02:32
@nivi-apple @bzbarsky-apple
Update src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm
f1fa48e 
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
@nivi-apple nivi-apple force-pushed the ota_fix_test_remove_reset_state branch 5 times, most recently from 3f71eb8 to 79bf22f Compare February 15, 2023 03:10
@nivi-apple nivi-apple force-pushed the ota_fix_test_remove_reset_state branch from 79bf22f to 5241912 Compare February 15, 2023 03:14
@github-actions
Copy link

PR #25068: Size comparison from a6d2883 to 5241912

Decreases (1 build for cc32xx)
platform target config section a6d2883 5241912 change % change
cc32xx lock CC3235SF_LAUNCHXL .debug_info 20307078 20307077 -1 -0.0
Full report (1 build for cc32xx)
platform target config section a6d2883 5241912 change % change
cc32xx lock CC3235SF_LAUNCHXL 0 0 0 0.0
(read only) 640577 640577 0 0.0
(read/write) 204100 204100 0 0.0
.ARM.attributes 44 44 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 197504 197504 0 0.0
.comment 194 194 0 0.0
.data 1476 1476 0 0.0
.debug_abbrev 930806 930806 0 0.0
.debug_aranges 87360 87360 0 0.0
.debug_frame 299864 299864 0 0.0
.debug_info 20307078 20307077 -1 -0.0
.debug_line 2654650 2654650 0 0.0
.debug_loc 2787110 2787110 0 0.0
.debug_ranges 280904 280904 0 0.0
.debug_str 3001983 3001983 0 0.0
.ramVecs 780 780 0 0.0
.resetVecs 64 64 0 0.0
.rodata 105665 105665 0 0.0
.shstrtab 232 232 0 0.0
.stab 204 204 0 0.0
.stabstr 441 441 0 0.0
.stack 2048 2048 0 0.0
.strtab 375952 375952 0 0.0
.symtab 255888 255888 0 0.0
.text 532792 532792 0 0.0

@nivi-apple @carol-apple
Update src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm
89c103c 
Co-authored-by: Carol Yang <clyang@apple.com>
@bzbarsky-apple bzbarsky-apple merged commit 5401763 into project-chip:master Feb 16, 2023
lecndav pushed a commit to lecndav/connectedhomeip that referenced this pull request Mar 22, 2023
@nivi-apple @bzbarsky-apple @carol-apple
Do not reset state if query image is not available (either not availa… (
b1d9779 
project-chip#25068)

* Do not reset state if query image is not available (either not available, or protocol not supported or if delegate returns busy)

* Update src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* Addressed review comments

* Update src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

* fix format specifier for nodeid and fabric index in the logs

* Update src/darwin/Framework/CHIP/MTROTAProviderDelegateBridge.mm

Co-authored-by: Carol Yang <clyang@apple.com>

* Fix style and bump up the default retry delay we communicate.

---------

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
Co-authored-by: Carol Yang <clyang@apple.com>
@nivi-apple nivi-apple deleted the ota_fix_test_remove_reset_state branch March 5, 2024 00:51
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

@Damian-Nordic Damian-Nordic Damian-Nordic approved these changes

@bzbarsky-apple bzbarsky-apple bzbarsky-apple approved these changes

@amitnj amitnj Awaiting requested review from amitnj

@andy31415 andy31415 Awaiting requested review from andy31415

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

@arkq arkq Awaiting requested review from arkq

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

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@CodeChronos928 CodeChronos928 Awaiting requested review from CodeChronos928

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

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

@gjc13 gjc13 Awaiting requested review from gjc13

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

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

@hawk248 hawk248 Awaiting requested review from hawk248

@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

@jmeg-sfy jmeg-sfy Awaiting requested review from jmeg-sfy

@jtung-apple jtung-apple Awaiting requested review from jtung-apple

@kkasperczyk-no kkasperczyk-no Awaiting requested review from kkasperczyk-no

@ksperling-apple ksperling-apple Awaiting requested review from ksperling-apple

@lazarkov lazarkov Awaiting requested review from lazarkov

@lpbeliveau-silabs lpbeliveau-silabs Awaiting requested review from lpbeliveau-silabs

@LuDuda LuDuda Awaiting requested review from LuDuda

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

@msandstedt msandstedt Awaiting requested review from msandstedt

@mspang mspang Awaiting requested review from mspang

@pjzander-signify pjzander-signify Awaiting requested review from pjzander-signify

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@tehampson tehampson Awaiting requested review from tehampson

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

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

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

Successfully merging this pull request may close these issues.

Do not reset OTA provider state if query image returns not available
4 participants
@nivi-apple @carol-apple @bzbarsky-apple @Damian-Nordic