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

Fix initialization-order-fiasco #32854

Merged
merged 12 commits into from
Apr 26, 2024
Merged

Fix initialization-order-fiasco #32854

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e9510a2
Fix initialization-order-fiasco
mwswartwout Apr 4, 2024
d73e6e1
Restyled by clang-format
restyled-commits Apr 4, 2024
d5282f6
Fix pointer declaration
mwswartwout Apr 4, 2024
7b9c3a7
Restyled by clang-format
restyled-commits Apr 4, 2024
6c53a6a
Merge branch 'project-chip:master' into initialization_fiasco
mwswartwout Apr 17, 2024
9011e3e
Do not set mLocalMRPConfig in PairingSession constructor
mwswartwout Apr 17, 2024
e87c03d
Revert "Restyled by clang-format"
mwswartwout Apr 17, 2024
35eb4dd
Revert "Fix pointer declaration"
mwswartwout Apr 17, 2024
2a4fa19
Revert "Restyled by clang-format"
mwswartwout Apr 17, 2024
99066ad
Revert "Fix initialization-order-fiasco"
mwswartwout Apr 17, 2024
42026d5
Add missing MakeOptional
mwswartwout Apr 17, 2024
a19b540
Merge branch 'master' into initialization_fiasco
mwswartwout Apr 18, 2024
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
2 changes: 0 additions & 2 deletions src/app/server/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ class DeviceTypeResolver : public chip::Access::AccessControl::DeviceTypeResolve

namespace chip {

Server Server::sServer;

#if CHIP_CONFIG_ENABLE_SERVER_IM_EVENT
#define CHIP_NUM_EVENT_LOGGING_BUFFERS 3
static uint8_t sInfoEventBuffer[CHIP_DEVICE_CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE];
Expand Down
8 changes: 5 additions & 3 deletions src/app/server/Server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,13 +386,15 @@ class Server
return System::SystemClock().GetMonotonicMicroseconds64() - mInitTimestamp;
}

static Server & GetInstance() { return sServer; }
static Server & GetInstance()
{
static Server * sServer = new Server();
return *sServer;
}

private:
Server() {}

static Server sServer;

void InitFailSafe();
void OnPlatformEvent(const DeviceLayer::ChipDeviceEvent & event);
void CheckServerReadyEvent();
Expand Down
Loading