-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix reference cycle between controller and data store in Matter.frame…
…work. (#33263) * Fix reference cycle between controller and data store in Matter.framework. Also adds some leak detection to unit tests in CI that would have caught this. * Address review comment. * Disable the leak checks for now, because we are getting unrelated positives.
- Loading branch information
1 parent
de796eb
commit 16b8076
Showing
6 changed files
with
137 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /** | ||
| * Copyright (c) 2024 Project CHIP Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #import <XCTest/XCTest.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| @interface MTRTestCase : XCTestCase | ||
| // It would be nice to do the leak-detection automatically, but running "leaks" | ||
| // on every single sub-test is slow, and some of our tests seem to have leaks | ||
| // outside Matter.framework. So have it be opt-in for now, and improve later. | ||
| @property (nonatomic) BOOL detectLeaks; | ||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /** | ||
| * Copyright (c) 2024 Project CHIP Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include <stdlib.h> | ||
| #include <unistd.h> | ||
|
|
||
| #import "MTRTestCase.h" | ||
|
|
||
| @implementation MTRTestCase | ||
|
|
||
| /** | ||
| * Unfortunately, doing this in "+ (void)tearDown" (the global suite teardown) | ||
| * does not trigger a test failure even if the XCTAssertEqual fails. | ||
| */ | ||
| - (void)tearDown | ||
| { | ||
| #if 0 | ||
| #if defined(ENABLE_LEAK_DETECTION) && ENABLE_LEAK_DETECTION | ||
| if (_detectLeaks) { | ||
| int pid = getpid(); | ||
| __auto_type * cmd = [NSString stringWithFormat:@"leaks %d", pid]; | ||
| int ret = system(cmd.UTF8String); | ||
| XCTAssertEqual(ret, 0, "LEAKS DETECTED"); | ||
| } | ||
| #endif | ||
| #endif | ||
|
|
||
| [super tearDown]; | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters