summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2020-02-10 15:02:04 -0400
committerFernando Sahmkow <fsahmkow27@gmail.com>2020-06-18 16:29:22 -0400
commit49a7e0984a1210832b8be24433a95711c7ce029b (patch)
tree73cfc4456382895f75b6f56f5f1bb96501929de9 /src/common
parent1f7dd36499786d373b143a4437d4c32e077a32aa (diff)
Core/HostTiming: Allow events to be advanced manually.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/fiber.cpp2
-rw-r--r--src/common/wall_clock.cpp9
2 files changed, 6 insertions, 5 deletions
diff --git a/src/common/fiber.cpp b/src/common/fiber.cpp
index 1220eddf0..e9c0946b6 100644
--- a/src/common/fiber.cpp
+++ b/src/common/fiber.cpp
@@ -110,7 +110,7 @@ Fiber::Fiber(std::function<void(void*)>&& entry_point_func, void* start_paramete
FiberStartFunc);
}
-Fiber::Fiber() : guard{}, entry_point{}, start_parameter{}, previous_fiber{} {
+Fiber::Fiber() {
impl = std::make_unique<FiberImpl>();
}
diff --git a/src/common/wall_clock.cpp b/src/common/wall_clock.cpp
index e6161c72c..d4d35f4e7 100644
--- a/src/common/wall_clock.cpp
+++ b/src/common/wall_clock.cpp
@@ -42,14 +42,15 @@ public:
u64 GetClockCycles() override {
std::chrono::nanoseconds time_now = GetTimeNS();
- const u128 temporal = Common::Multiply64Into128(time_now.count(), emulated_clock_frequency);
- return Common::Divide128On32(temporal, 1000000000).first;
+ const u128 temporary =
+ Common::Multiply64Into128(time_now.count(), emulated_clock_frequency);
+ return Common::Divide128On32(temporary, 1000000000).first;
}
u64 GetCPUCycles() override {
std::chrono::nanoseconds time_now = GetTimeNS();
- const u128 temporal = Common::Multiply64Into128(time_now.count(), emulated_cpu_frequency);
- return Common::Divide128On32(temporal, 1000000000).first;
+ const u128 temporary = Common::Multiply64Into128(time_now.count(), emulated_cpu_frequency);
+ return Common::Divide128On32(temporary, 1000000000).first;
}
private: