jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flipper | Replace global static variables in FlipperSocketProvider with local static.

Browse Source 
Summary: Replacing global static varaibles with local static. No cost at startup time, and also fixes any potential static initialization order fiasco.

Differential Revision: D45900297

fbshipit-source-id: 80e3ffb6527f7f7b6b08de4a6209f0f8298f7bf5
This commit is contained in:
Nikita Lutsenko
2023-05-16 14:15:04 -07:00
committed by Facebook GitHub Bot
parent 7386608a53
commit 0069155b1e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xplat/Flipper/FlipperSocketProvider.cpp
View File

@@ -12,17 +12,18 @@
namespace facebook { namespace facebook {
namespace flipper { namespace flipper {
std::unique_ptr<FlipperSocketProvider> FlipperSocketProvider::provider_ = std::unique_ptr<FlipperSocketProvider>&
nullptr; FlipperSocketProvider::defaultProvider() {
static std::unique_ptr<FlipperSocketProvider> provider;
std::unique_ptr<FlipperSocketProvider> FlipperSocketProvider::shelvedProvider_ = return provider;
nullptr; }
std::unique_ptr<FlipperSocket> FlipperSocketProvider::socketCreate( std::unique_ptr<FlipperSocket> FlipperSocketProvider::socketCreate(
FlipperConnectionEndpoint endpoint, FlipperConnectionEndpoint endpoint,
std::unique_ptr<FlipperSocketBasePayload> payload, std::unique_ptr<FlipperSocketBasePayload> payload,
Scheduler* scheduler) { Scheduler* scheduler) {
return provider_->create(std::move(endpoint), std::move(payload), scheduler); return defaultProvider()->create(
std::move(endpoint), std::move(payload), scheduler);
} }
std::unique_ptr<FlipperSocket> FlipperSocketProvider::socketCreate( std::unique_ptr<FlipperSocket> FlipperSocketProvider::socketCreate(
@@ -30,7 +31,7 @@ std::unique_ptr<FlipperSocket> FlipperSocketProvider::socketCreate(
std::unique_ptr<FlipperSocketBasePayload> payload, std::unique_ptr<FlipperSocketBasePayload> payload,
Scheduler* scheduler, Scheduler* scheduler,
ConnectionContextStore* connectionContextStore) { ConnectionContextStore* connectionContextStore) {
return provider_->create( return defaultProvider()->create(
std::move(endpoint), std::move(endpoint),
std::move(payload), std::move(payload),
scheduler, scheduler,
@@ -39,11 +40,11 @@ std::unique_ptr<FlipperSocket> FlipperSocketProvider::socketCreate(
void FlipperSocketProvider::setDefaultProvider( void FlipperSocketProvider::setDefaultProvider(
std::unique_ptr<FlipperSocketProvider> provider) { std::unique_ptr<FlipperSocketProvider> provider) {
provider_ = std::move(provider); defaultProvider() = std::move(provider);
} }
bool FlipperSocketProvider::hasProvider() { bool FlipperSocketProvider::hasProvider() {
return provider_ != nullptr; return defaultProvider() != nullptr;
} }
} // namespace flipper } // namespace flipper

3
xplat/Flipper/FlipperSocketProvider.h
View File

@@ -71,8 +71,7 @@ class FlipperSocketProvider {
static bool hasProvider(); static bool hasProvider();
private: private:
static std::unique_ptr<FlipperSocketProvider> provider_; static std::unique_ptr<FlipperSocketProvider>& defaultProvider();
static std::unique_ptr<FlipperSocketProvider> shelvedProvider_;
}; };
} // namespace flipper } // namespace flipper