Skip to content

Remove singleton dependency from base::Clock #1463

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

Open
yukawa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove singleton dependency from base::Clock #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/base/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ mozc_cc_library(
srcs = ["clock.cc"],
hdrs = ["clock.h"],
deps = [
":singleton",
"@com_google_absl//absl/time",
],
)
Expand Down
32 changes: 17 additions & 15 deletions src/base/clock.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@

#include "absl/time/clock.h"
#include "absl/time/time.h"
#include "base/singleton.h"

#include <atomic>

#if defined(OS_CHROMEOS) || defined(_WIN32)
constexpr bool kUseAbslLocalTimeZone = false;
Expand All @@ -46,6 +47,8 @@ constexpr bool kUseAbslLocalTimeZone = true;
namespace mozc {
namespace {

constinit static std::atomic<ClockInterface*> g_mock = nullptr;

absl::TimeZone GetLocalTimeZone() {
if constexpr (kUseAbslLocalTimeZone) {
return absl::LocalTimeZone();
Expand All @@ -65,27 +68,26 @@ absl::TimeZone GetLocalTimeZone() {
}
}

class ClockImpl : public ClockInterface {
public:
ClockImpl() = default;
~ClockImpl() override = default;

absl::Time GetAbslTime() override { return absl::Now(); }

absl::TimeZone GetTimeZone() override { return GetLocalTimeZone(); }
};
} // namespace

using ClockSingleton = SingletonMockable<ClockInterface, ClockImpl>;

absl::Time Clock::GetAbslTime() { return ClockSingleton::Get()->GetAbslTime(); }
absl::Time Clock::GetAbslTime() {
if (ClockInterface* mock = g_mock.load(std::memory_order_acquire);
mock != nullptr) {
return mock->GetAbslTime();
}
return absl::Now();
}

absl::TimeZone Clock::GetTimeZone() {
return ClockSingleton::Get()->GetTimeZone();
if (ClockInterface* mock = g_mock.load(std::memory_order_acquire);
mock != nullptr) {
return mock->GetTimeZone();
}
return GetLocalTimeZone();
}

void Clock::SetClockForUnitTest(ClockInterface* clock) {
ClockSingleton::SetMock(clock);
g_mock.store(clock, std::memory_order_release);
}

} // namespace mozc