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

Moving more stuff out of the MTRDevice #36090

Closed

Conversation

woody-apple
Copy link
Contributor

MTRDevice is still using some basic C++ stuff here, we should be not doing this in MTRDevice_XPC, I did a quick and simple hack here. @bzbarsky-apple

@woody-apple woody-apple requested a review from a team as a code owner October 16, 2024 01:23
Copy link

Review changes with SemanticDiff.

Copy link

github-actions bot commented Oct 16, 2024

PR #36090: Size comparison from 579b1b1 to 151a7ac

Full report (82 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section 579b1b1 151a7ac change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1349986 1349986 0 0.0
RAM 104120 104120 0 0.0
bl702 lighting-app bl702+eth FLASH 647742 647742 0 0.0
RAM 25233 25233 0 0.0
bl702+wifi FLASH 825228 825228 0 0.0
RAM 13965 13965 0 0.0
bl706+mfd+rpc+littlefs FLASH 1054154 1054154 0 0.0
RAM 23821 23821 0 0.0
bl702l lighting-app bl702l+mfd+littlefs FLASH 974998 974998 0 0.0
RAM 16468 16468 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 829532 829532 0 0.0
RAM 123452 123452 0 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 814872 814872 0 0.0
RAM 125332 125332 0 0.0
pump-app LP_EM_CC1354P10_6 FLASH 761436 761436 0 0.0
RAM 113824 113824 0 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 745664 745664 0 0.0
RAM 114016 114016 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 617202 617202 0 0.0
RAM 205908 205908 0 0.0
lock CC3235SF_LAUNCHXL FLASH 657258 657258 0 0.0
RAM 206060 206060 0 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 678517 678517 0 0.0
RAM 78668 78668 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 698361 698361 0 0.0
RAM 81300 81300 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 698361 698361 0 0.0
RAM 81300 81300 0 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 655297 655297 0 0.0
RAM 73736 73736 0 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 614845 614845 0 0.0
RAM 71628 71628 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 634473 634473 0 0.0
RAM 74180 74180 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 634473 634473 0 0.0
RAM 74180 74180 0 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 634165 634165 0 0.0
RAM 74676 74676 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 653873 653873 0 0.0
RAM 77228 77228 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 653873 653873 0 0.0
RAM 77228 77228 0 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 609477 609477 0 0.0
RAM 68764 68764 0 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 629337 629337 0 0.0
RAM 71396 71396 0 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 629337 629337 0 0.0
RAM 71396 71396 0 0.0
efr32 lock-app BRD4187C FLASH 925216 925216 0 0.0
RAM 159708 159708 0 0.0
BRD4338a FLASH 741384 741376 -8 -0.0
RAM 231008 231008 0 0.0
window-app BRD4187C FLASH 1018172 1018172 0 0.0
RAM 128052 128052 0 0.0
esp32 all-clusters-app c3devkit DRAM 94248 94248 0 0.0
FLASH 1538732 1538732 0 0.0
IRAM 82538 82538 0 0.0
m5stack DRAM 115192 115192 0 0.0
FLASH 1549078 1549078 0 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4688 4688 0 0.0
FLASH 2781089 2781089 0 0.0
RAM 129520 129520 0 0.0
all-clusters-app debug unknown 5528 5528 0 0.0
FLASH 6087530 6087530 0 0.0
RAM 522912 522912 0 0.0
all-clusters-minimal-app debug unknown 5424 5424 0 0.0
FLASH 5418280 5418280 0 0.0
RAM 241200 241200 0 0.0
bridge-app debug unknown 5408 5408 0 0.0
FLASH 4751720 4751720 0 0.0
RAM 218384 218384 0 0.0
chip-tool debug unknown 5960 5960 0 0.0
FLASH 13161544 13161544 0 0.0
RAM 584562 584562 0 0.0
chip-tool-ipv6only arm64 unknown 21408 21408 0 0.0
FLASH 11720160 11720160 0 0.0
RAM 635480 635480 0 0.0
fabric-admin debug unknown 5792 5792 0 0.0
FLASH 11377139 11377139 0 0.0
RAM 584218 584218 0 0.0
fabric-bridge-app debug unknown 4632 4632 0 0.0
FLASH 4575352 4575352 0 0.0
RAM 205048 205048 0 0.0
lighting-app debug+rpc+ui unknown 6056 6056 0 0.0
FLASH 5693729 5693729 0 0.0
RAM 228488 228488 0 0.0
lock-app debug unknown 5344 5344 0 0.0
FLASH 4801296 4801296 0 0.0
RAM 204472 204472 0 0.0
ota-provider-app debug unknown 4720 4720 0 0.0
FLASH 4430678 4430678 0 0.0
RAM 198192 198192 0 0.0
ota-requestor-app debug unknown 4656 4656 0 0.0
FLASH 4569444 4569444 0 0.0
RAM 202760 202760 0 0.0
shell debug unknown 4216 4216 0 0.0
FLASH 3111005 3111005 0 0.0
RAM 159280 159280 0 0.0
thermostat-no-ble arm64 unknown 9448 9448 0 0.0
FLASH 4319696 4319696 0 0.0
RAM 242888 242888 0 0.0
tv-app debug unknown 5624 5624 0 0.0
FLASH 6031557 6031557 0 0.0
RAM 596416 596416 0 0.0
tv-casting-app debug unknown 5208 5208 0 0.0
FLASH 11367389 11367389 0 0.0
RAM 675936 675936 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 914504 914504 0 0.0
RAM 142359 142359 0 0.0
nrf7002dk_nrf5340_cpuapp FLASH 885280 885280 0 0.0
RAM 140498 140498 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 847924 847924 0 0.0
RAM 141261 141261 0 0.0
nxp contact k32w0+release FLASH 582248 582248 0 0.0
RAM 70952 70952 0 0.0
k32w1+release FLASH 597136 597136 0 0.0
RAM 63184 63184 0 0.0
mcxw71+release FLASH 596896 596896 0 0.0
RAM 63184 63184 0 0.0
light k32w0+release FLASH 618764 618764 0 0.0
RAM 70416 70416 0 0.0
k32w1+release FLASH 683112 683112 0 0.0
RAM 48816 48816 0 0.0
mcxw71+release FLASH 683128 683128 0 0.0
RAM 48816 48816 0 0.0
lock k32w1+release FLASH 705480 705480 0 0.0
RAM 67324 67324 0 0.0
mcxw71+release FLASH 705504 705504 0 0.0
RAM 67324 67324 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1646388 1646388 0 0.0
RAM 211400 211400 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1552436 1552436 0 0.0
RAM 208200 208200 0 0.0
light cy8ckit_062s2_43012 FLASH 1467860 1467860 0 0.0
RAM 201200 201200 0 0.0
lock cy8ckit_062s2_43012 FLASH 1464932 1464932 0 0.0
RAM 225560 225560 0 0.0
qpg lighting-app qpg6105+debug FLASH 660560 660560 0 0.0
RAM 105396 105396 0 0.0
lock-app qpg6105+debug FLASH 618580 618580 0 0.0
RAM 99864 99864 0 0.0
stm32 light STM32WB5MM-DK FLASH 481864 481864 0 0.0
RAM 144844 144844 0 0.0
telink air-quality-sensor-app tlsr9528a_retention FLASH 620998 620998 0 0.0
RAM 50648 50648 0 0.0
all-clusters-app tlsr9118bdk40d FLASH 688222 688222 0 0.0
RAM 148488 148488 0 0.0
all-clusters-minimal-app tlsr9528a FLASH 781214 781214 0 0.0
RAM 110440 110440 0 0.0
bridge-app tlsr9258a FLASH 681098 681098 0 0.0
RAM 91304 91304 0 0.0
contact-sensor-app tlsr9528a_retention FLASH 620762 620762 0 0.0
RAM 50600 50600 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a FLASH 708716 708716 0 0.0
RAM 73940 73940 0 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 625716 625716 0 0.0
RAM 144468 144468 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 811724 811724 0 0.0
RAM 99100 99100 0 0.0
lock-app-dfu tlsr9528a FLASH 656668 656668 0 0.0
RAM 66660 66660 0 0.0
ota-requestor-app tlsr9258a FLASH 697076 697076 0 0.0
RAM 90896 90896 0 0.0
pump-app-usb tlsr9518adk80d FLASH 634408 634408 0 0.0
RAM 55476 55476 0 0.0
pump-controller-app tlsr9518adk80d FLASH 611598 611598 0 0.0
RAM 52720 52720 0 0.0
shell tlsr9518adk80d FLASH 467872 467872 0 0.0
RAM 68168 68168 0 0.0
smoke_co_alarm-app tlsr9528a_retention FLASH 627912 627912 0 0.0
RAM 52320 52320 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d FLASH 653730 653730 0 0.0
RAM 56268 56268 0 0.0
thermostat tlsr9518adk80d FLASH 638340 638340 0 0.0
RAM 53112 53112 0 0.0
window-covering tlsr9118bdk40d FLASH 524456 524456 0 0.0
RAM 97444 97444 0 0.0
tizen all-clusters-app arm unknown 4904 4904 0 0.0
FLASH 1726716 1726716 0 0.0
RAM 89084 89084 0 0.0
chip-tool-ubsan arm unknown 10792 10792 0 0.0
FLASH 18327198 18327198 0 0.0
RAM 7969512 7969512 0 0.0

@@ -309,4 +309,41 @@ - (void)downloadLogOfType:(MTRDiagnosticLogType)type
// Not Supported via XPC
// - (oneway void)downloadLogOfType:(MTRDiagnosticLogType)type nodeID:(NSNumber *)nodeID timeout:(NSTimeInterval)timeout completion:(void (^)(NSURL * _Nullable url, NSError * _Nullable error))completion;

#pragma mark - Storage Overrides

- (NSDictionary<MTRClusterPath *, MTRDeviceClusterData *> *)_clusterDataToPersistSnapshot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the goal is to not have persistence at all in MTRDevice_XPC, then we should just rip it out of MTRDevice, not do this, I think....

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have at it :)

@@ -1646,11 +1646,6 @@ - (void)_scheduleClusterDataPersistence
}
[_mostRecentReportTimes addObject:[NSDate now]];

{
std::lock_guard lock(_descriptionLock);
_mostRecentReportTimeForDescription = [_mostRecentReportTimes lastObject];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this being removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just copied and pasted the base implementation into concrete, please fix :)

@woody-apple woody-apple marked this pull request as draft October 17, 2024 00:32
@bzbarsky-apple
Copy link
Contributor

I think we should do #36132 instead.

@mergify mergify bot added the conflict label Oct 18, 2024
@mergify mergify bot removed the conflict label Oct 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants