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

tv-casting-app fixed memory issues around stopDiscovery function #34758

Merged
merged 3 commits into from
Aug 7, 2024
Merged

tv-casting-app fixed memory issues around stopDiscovery function #34758

merged 3 commits into from
Aug 7, 2024

Conversation

pgregorr-amazon
Copy link
Contributor

@pgregorr-amazon pgregorr-amazon commented Aug 2, 2024 •
edited
Loading

Updated the common Linux implementation of CastingPlayerDiscovery.h/cpp and CastingPlayer.h/cpp to better manage the lifecycle of CastingPlayers. The stopDiscovery() API can now be called anytime.

Change Details

  1. Updated CastingPlayerDiscovery.h/cpp to store CastingPlayers in an internal vector to ensure that the CastingPlayer we are trying to connect to is not deleted when switching fragments and prior to calling VerifyOrEstablishConnection().
  2. Updated CastingPlayer.h/cpp to store static memory::Weak mTargetCastingPlayerWeak; // This is a std::weak_ptr.
  3. Updated DiscoveryExampleFragment public void onPause() to call stopDiscovery();. This was previously deleting all the CastingPlayers held by CastingPlayerDiscovery.h/cpp std::vector<memory::Strong> mCastingPlayers;
  4. Updated connectedhomeip/examples/tv-casting-app/android/App/app/src/main/res/layout/custom_passcode_dialog.xml so that the dialog text instructions can be visible in both dark and light mode. The text was previously white making it invisible in light mode.

Testing

Verified and tested locally with the Linux, Android and iOS tv-casting-app example mobile apps, and the Linux tv-app (CastingPlayer). Able to build and commission with the example apps using both the commissionee and commissioner generated passcode flows.

@semanticdiff-com SemanticDiff.com
Copy link

semanticdiff-com bot commented Aug 2, 2024 •
edited
Loading

Review changes with SemanticDiff.

Analyzed 2 of 10 files.

Overall, the semantic diff is 41% smaller than the GitHub diff.

Filename Status
❔ examples/tv-casting-app/tv-casting-common/support/CastingStore.cpp Unsupported file format
❔ examples/tv-casting-app/tv-casting-common/support/ChipDeviceEventHandler.cpp Unsupported file format
❔ examples/tv-casting-app/tv-casting-common/core/CastingPlayer.cpp Unsupported file format
❔ examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h Unsupported file format
❔ examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp Unsupported file format
❔ examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.h Unsupported file format
❔ examples/tv-casting-app/android/App/app/src/main/res/layout/custom_passcode_dialog.xml Unsupported file format
❔ examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_matter_connection_example.xml Unsupported file format
✔️ examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/ConnectionExampleFragment.java 41.9% smaller
✔️ examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/DiscoveryExampleFragment.java 39.3% smaller

@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 2, 2024 •
edited
Loading

PR #34758: Size comparison from 1e9082f to 125d6c6

Full report (85 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, mbed, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 1e9082f 125d6c6 change % change
bl602 lighting-app bl602 FLASH 1277742 1277742 0 0.0
RAM 95896 95896 0 0.0
bl602+mfd FLASH 1292000 1292000 0 0.0
RAM 96048 96048 0 0.0
bl602+rpc FLASH 1316710 1316710 0 0.0
RAM 104320 104320 0 0.0
bl702 lighting-app bl702 FLASH 1098886 1098886 0 0.0
RAM 15249 15249 0 0.0
bl702+mfd FLASH 1109580 1109580 0 0.0
RAM 15393 15393 0 0.0
bl702+rpc FLASH 1188952 1188952 0 0.0
RAM 24245 24245 0 0.0
bl706-eth FLASH 881920 881920 0 0.0
RAM 27352 27352 0 0.0
bl706-wifi FLASH 1135098 1135098 0 0.0
RAM 14685 14685 0 0.0
bl702l lighting-app bl702l FLASH 1085792 1085792 0 0.0
RAM 21804 21804 0 0.0
bl702l+mfd FLASH 1097054 1097054 0 0.0
RAM 21956 21956 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 802664 802664 0 0.0
RAM 117620 117620 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 818628 818628 0 0.0
RAM 125220 125220 0 0.0
lock-mtd LP_EM_CC1354P10_6 FLASH 810904 810904 0 0.0
RAM 119500 119500 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 763108 763108 0 0.0
RAM 113640 113640 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 747768 747768 0 0.0
RAM 113832 113832 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 610502 610502 0 0.0
RAM 205380 205380 0 0.0
lock CC3235SF_LAUNCHXL FLASH 654774 654774 0 0.0
RAM 205620 205620 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 671745 671745 0 0.0
RAM 78348 78348 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 691597 691597 0 0.0
RAM 80980 80980 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 691597 691597 0 0.0
RAM 80980 80980 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 648541 648541 0 0.0
RAM 73416 73416 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 610409 610409 0 0.0
RAM 71340 71340 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 630037 630037 0 0.0
RAM 73892 73892 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 630037 630037 0 0.0
RAM 73892 73892 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 627761 627761 0 0.0
RAM 74356 74356 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 647469 647469 0 0.0
RAM 76908 76908 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 647469 647469 0 0.0
RAM 76908 76908 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 599861 599861 0 0.0
RAM 68372 68372 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 619713 619713 0 0.0
RAM 71004 71004 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 619713 619713 0 0.0
RAM 71004 71004 0 0.0
efr32 lighting-app BRD4187C FLASH 929712 929712 0 0.0
RAM 135148 135148 0 0.0
lock-app BRD4338a FLASH 737116 737108 -8 -0.0
RAM 208436 208436 0 0.0
window-app BRD4187C FLASH 1015508 1015508 0 0.0
RAM 127084 127084 0 0.0
esp32 all-clusters-app c3devkit DRAM 94136 94136 0 0.0
FLASH 1530482 1530482 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 115072 115072 0 0.0
FLASH 1541014 1541014 0 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4632 4632 0 0.0
FLASH 2746431 2746431 0 0.0
RAM 128368 128368 0 0.0
all-clusters-app debug unknown 5416 5416 0 0.0
FLASH 6027574 6027574 0 0.0
RAM 509904 509904 0 0.0
all-clusters-minimal-app debug unknown 5312 5312 0 0.0
FLASH 5367464 5367464 0 0.0
RAM 240000 240000 0 0.0
bridge-app debug unknown 5296 5296 0 0.0
FLASH 4727210 4727210 0 0.0
RAM 217024 217024 0 0.0
chip-tool debug unknown 5832 5832 0 0.0
FLASH 12496460 12496460 0 0.0
RAM 558362 558362 0 0.0
chip-tool-ipv6only arm64 unknown 20352 20352 0 0.0
FLASH 11173932 11173932 0 0.0
RAM 608320 608320 0 0.0
fabric-admin debug unknown 5672 5672 0 0.0
FLASH 11474703 11474703 0 0.0
RAM 555098 555098 0 0.0
fabric-bridge-app debug unknown 4568 4568 0 0.0
FLASH 4483232 4483232 0 0.0
RAM 202192 202192 0 0.0
lighting-app debug+rpc+ui unknown 5968 5968 0 0.0
FLASH 5661281 5661281 0 0.0
RAM 228112 228112 0 0.0
lock-app debug unknown 5232 5232 0 0.0
FLASH 4782040 4782040 0 0.0
RAM 203840 203840 0 0.0
ota-provider-app debug unknown 4608 4608 0 0.0
FLASH 4422354 4422354 0 0.0
RAM 197824 197824 0 0.0
ota-requestor-app debug unknown 4544 4544 0 0.0
FLASH 4560500 4560500 0 0.0
RAM 202360 202360 0 0.0
shell debug unknown 4176 4176 0 0.0
FLASH 3066669 3066669 0 0.0
RAM 158952 158952 0 0.0
thermostat-no-ble arm64 unknown 9352 9352 0 0.0
FLASH 4357300 4357300 0 0.0
RAM 242216 242216 0 0.0
tv-app debug unknown 5504 5504 0 0.0
FLASH 6004549 6004549 0 0.0
RAM 583552 583552 0 0.0
tv-casting-app debug unknown 5176 5176 0 0.0
FLASH 10700989 10701117 128 0.0
RAM 645608 645616 8 0.0
mbed lock-app-release cy8cproto_062_4343w FLASH 1505732 1505732 0 0.0
RAM 227296 227296 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 906844 906844 0 0.0
RAM 142225 142225 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 879492 879492 0 0.0
RAM 140364 140364 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 838596 838596 0 0.0
RAM 141062 141062 0 0.0
nxp contact k32w0+release FLASH 576700 576700 0 0.0
RAM 70416 70416 0 0.0
k32w1+release FLASH 592408 592408 0 0.0
RAM 74456 74456 0 0.0
light k32w0+release FLASH 612344 612344 0 0.0
RAM 69920 69920 0 0.0
k32w1+release FLASH 677240 677240 0 0.0
RAM 83232 83232 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1635916 1635916 0 0.0
RAM 210912 210912 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1541116 1541116 0 0.0
RAM 207664 207664 0 0.0
light cy8ckit_062s2_43012 FLASH 1463348 1463348 0 0.0
RAM 200776 200776 0 0.0
lock cy8ckit_062s2_43012 FLASH 1462156 1462156 0 0.0
RAM 225120 225120 0 0.0
qpg lighting-app qpg6105+debug FLASH 655460 655460 0 0.0
RAM 105148 105148 0 0.0
lock-app qpg6105+debug FLASH 612912 612912 0 0.0
RAM 99632 99632 0 0.0
stm32 light STM32WB5MM-DK FLASH 477792 477792 0 0.0
RAM 144756 144756 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 619742 619742 0 0.0
RAM 50936 50936 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 678490 678490 0 0.0
RAM 149556 149556 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 771754 771754 0 0.0
RAM 110732 110732 0 0.0
bridge-app tlsr9258a FLASH 678356 678356 0 0.0
RAM 91624 91624 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 621334 621334 0 0.0
RAM 50980 50980 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 707198 707198 0 0.0
RAM 74316 74316 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 620110 620110 0 0.0
RAM 145580 145580 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 806196 806196 0 0.0
RAM 99504 99504 0 0.0
lock-app-dfu tlsr9528a FLASH 654076 654076 0 0.0
RAM 67012 67012 0 0.0
ota-requestor-app tlsr9258a FLASH 696390 696390 0 0.0
RAM 91308 91308 0 0.0
pump-app-usb tlsr9518adk80d FLASH 630690 630690 0 0.0
RAM 55756 55756 0 0.0
pump-controller-app tlsr9518adk80d FLASH 608290 608290 0 0.0
RAM 53000 53000 0 0.0
shell tlsr9518adk80d FLASH 466810 466810 0 0.0
RAM 68660 68660 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 628102 628102 0 0.0
RAM 52696 52696 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 652112 652112 0 0.0
RAM 56636 56636 0 0.0
thermostat tlsr9518adk80d FLASH 631874 631874 0 0.0
RAM 53376 53376 0 0.0
window-covering tlsr9118bdk40d FLASH 522252 522252 0 0.0
RAM 98536 98536 0 0.0
tizen all-clusters-app arm unknown 1588 1588 0 0.0
FLASH 1705140 1705140 0 0.0
RAM 51820 51820 0 0.0
chip-tool-ubsan arm unknown 2404 2404 0 0.0
FLASH 16619594 16619594 0 0.0
RAM 7303840 7303840 0 0.0

@woody-apple woody-apple merged commit 78a8357 into project-chip:master Aug 7, 2024
68 checks passed
austina-csa pushed a commit to austina-csa/connectedhomeip that referenced this pull request Aug 12, 2024
@pgregorr-amazon @austina-csa
tv-casting-app fixed memory issues around stopDiscovery function (pro…
7dd127e 
…ject-chip#34758)

* tv-casting-app fixed memory issues around stopDiscovery function

* Fixing style issues

* Addressed comments by sharadb-amazon
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sharadb-amazon sharadb-amazon sharadb-amazon approved these changes

@woody-apple woody-apple woody-apple approved these changes

@chrisdecenzo chrisdecenzo chrisdecenzo approved these changes

@andy31415 andy31415 Awaiting requested review from andy31415

@andyg-apple andyg-apple Awaiting requested review from andyg-apple

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

@arkq arkq Awaiting requested review from arkq

@axelnxp axelnxp Awaiting requested review from axelnxp

@bauerschwan bauerschwan Awaiting requested review from bauerschwan

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

@carol-apple carol-apple Awaiting requested review from carol-apple

@cecille cecille Awaiting requested review from cecille

@chapongatien chapongatien Awaiting requested review from chapongatien

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@cliffamzn cliffamzn Awaiting requested review from cliffamzn

@Damian-Nordic Damian-Nordic Awaiting requested review from Damian-Nordic

@dhrishi dhrishi Awaiting requested review from dhrishi

@doru91 doru91 Awaiting requested review from doru91

@fessehaeve fessehaeve Awaiting requested review from fessehaeve

@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

@hicklin hicklin Awaiting requested review from hicklin

@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

@joonhaengHeo joonhaengHeo Awaiting requested review from joonhaengHeo

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

@kiel-apple kiel-apple Awaiting requested review from kiel-apple

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

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@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

@mhazley mhazley Awaiting requested review from mhazley

@mkardous-silabs mkardous-silabs Awaiting requested review from mkardous-silabs

@mspang mspang Awaiting requested review from mspang

@nivi-apple nivi-apple Awaiting requested review from nivi-apple

@p0fi p0fi Awaiting requested review from p0fi

@plauric plauric Awaiting requested review from plauric

@rcasallas-silabs rcasallas-silabs Awaiting requested review from rcasallas-silabs

@ReneJosefsen ReneJosefsen Awaiting requested review from ReneJosefsen

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tcarmelveilleux tcarmelveilleux Awaiting requested review from tcarmelveilleux

@tecimovic tecimovic Awaiting requested review from tecimovic

@tima-q tima-q Awaiting requested review from tima-q

@tobiasgraf tobiasgraf Awaiting requested review from tobiasgraf

@turon turon Awaiting requested review from turon

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

@wiba-nordic wiba-nordic Awaiting requested review from wiba-nordic

@younghak-hwang younghak-hwang Awaiting requested review from younghak-hwang

@yufengwangca yufengwangca Awaiting requested review from yufengwangca

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

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

Successfully merging this pull request may close these issues.
4 participants
@pgregorr-amazon @sharadb-amazon @woody-apple @chrisdecenzo