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

chip-repl hits the Code is unsafe/racy assert when BLE commissioning is started #26338

Merged
merged 6 commits into from
May 5, 2023
Merged

chip-repl hits the Code is unsafe/racy assert when BLE commissioning is started #26338

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb56c41
chip-repl hits the Code is unsafe/racy assert when BLE commissioning …
tehampson May 2, 2023
22d4958
Add lock/unlock to CancelTimer
tehampson May 2, 2023
86ad94f
Fix a few other issue
tehampson May 3, 2023
a6d999e
Restyle
tehampson May 3, 2023
c633ade
Small fix
tehampson May 3, 2023
53f5446
Last few fixes
tehampson May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/platform/Linux/bluez/ChipDeviceScanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ ChipDeviceScanner::~ChipDeviceScanner()
StopScan();

// In case the timeout timer is still active
DeviceLayer::PlatformMgr().LockChipStack();
chip::DeviceLayer::SystemLayer().CancelTimer(TimerExpiredCallback, this);
tehampson marked this conversation as resolved.
Show resolved Hide resolved
DeviceLayer::PlatformMgr().UnlockChipStack();

g_object_unref(mManager);
g_object_unref(mCancellable);
Expand Down Expand Up @@ -136,7 +138,9 @@ CHIP_ERROR ChipDeviceScanner::StartScan(System::Clock::Timeout timeout)
return CHIP_ERROR_INTERNAL;
tehampson marked this conversation as resolved.
Show resolved Hide resolved
}

DeviceLayer::PlatformMgr().LockChipStack();
CHIP_ERROR err = chip::DeviceLayer::SystemLayer().StartTimer(timeout, TimerExpiredCallback, static_cast<void *>(this));
DeviceLayer::PlatformMgr().UnlockChipStack();

if (err != CHIP_NO_ERROR)
{
Expand Down