diff --git a/Userland/Libraries/LibCore/ElapsedTimer.cpp b/Userland/Libraries/LibCore/ElapsedTimer.cpp index e4dd994759f..aef9694efb7 100644 --- a/Userland/Libraries/LibCore/ElapsedTimer.cpp +++ b/Userland/Libraries/LibCore/ElapsedTimer.cpp @@ -33,7 +33,7 @@ i64 ElapsedTimer::elapsed_milliseconds() const return elapsed_time().to_milliseconds(); } -Duration ElapsedTimer::elapsed_time() const +AK::Duration ElapsedTimer::elapsed_time() const { VERIFY(is_valid()); auto now = m_timer_type == TimerType::Precise ? MonotonicTime::now() : MonotonicTime::now_coarse(); diff --git a/Userland/Libraries/LibCore/ElapsedTimer.h b/Userland/Libraries/LibCore/ElapsedTimer.h index 716943cad90..b2157e66c31 100644 --- a/Userland/Libraries/LibCore/ElapsedTimer.h +++ b/Userland/Libraries/LibCore/ElapsedTimer.h @@ -29,7 +29,7 @@ public: void reset(); i64 elapsed_milliseconds() const; - Duration elapsed_time() const; + AK::Duration elapsed_time() const; // FIXME: Move callers to elapsed_milliseconds(), remove this. i64 elapsed() const // milliseconds diff --git a/Userland/Libraries/LibCore/EventLoopImplementationUnix.cpp b/Userland/Libraries/LibCore/EventLoopImplementationUnix.cpp index 88ea5c7f122..562d21873d3 100644 --- a/Userland/Libraries/LibCore/EventLoopImplementationUnix.cpp +++ b/Userland/Libraries/LibCore/EventLoopImplementationUnix.cpp @@ -71,7 +71,7 @@ public: protected: union { - Duration m_duration; + AK::Duration m_duration; MonotonicTime m_fire_time; }; @@ -209,7 +209,7 @@ public: ThreadEventQueue::current().post_event(*strong_owner, make()); } - Duration interval; + AK::Duration interval; bool should_reload { false }; TimerShouldFireWhenNotVisible fire_when_not_visible { TimerShouldFireWhenNotVisible::No }; WeakPtr owner; @@ -367,7 +367,7 @@ retry: if (next_timer_expiration.has_value()) { auto computed_timeout = next_timer_expiration.value() - time_at_iteration_start; if (computed_timeout.is_negative()) - computed_timeout = Duration::zero(); + computed_timeout = AK::Duration::zero(); i64 true_timeout = computed_timeout.to_milliseconds(); timeout = static_cast(min(AK::NumericLimits::max(), true_timeout)); } else { @@ -651,7 +651,7 @@ intptr_t EventLoopManagerUnix::register_timer(EventReceiver& object, int millise auto timer = new EventLoopTimer; timer->owner_thread = s_thread_id; timer->owner = object; - timer->interval = Duration::from_milliseconds(milliseconds); + timer->interval = AK::Duration::from_milliseconds(milliseconds); timer->reload(MonotonicTime::now_coarse()); timer->should_reload = should_reload; timer->fire_when_not_visible = fire_when_not_visible; diff --git a/Userland/Libraries/LibCore/Platform/ProcessStatisticsMach.cpp b/Userland/Libraries/LibCore/Platform/ProcessStatisticsMach.cpp index 5d1d36e1db3..b40d9d5e800 100644 --- a/Userland/Libraries/LibCore/Platform/ProcessStatisticsMach.cpp +++ b/Userland/Libraries/LibCore/Platform/ProcessStatisticsMach.cpp @@ -61,15 +61,15 @@ ErrorOr update_process_statistics(ProcessStatistics& statistics) } timeval scratch_timeval = { static_cast(time_info.user_time.seconds), static_cast(time_info.user_time.microseconds) }; - auto time_in_process = Duration::from_timeval(scratch_timeval); + auto time_in_process = AK::Duration::from_timeval(scratch_timeval); scratch_timeval = { static_cast(time_info.system_time.seconds), static_cast(time_info.system_time.microseconds) }; - time_in_process += Duration::from_timeval(scratch_timeval); + time_in_process += AK::Duration::from_timeval(scratch_timeval); - auto time_diff_process = time_in_process - Duration::from_microseconds(process->time_spent_in_process); + auto time_diff_process = time_in_process - AK::Duration::from_microseconds(process->time_spent_in_process); process->time_spent_in_process = time_in_process.to_microseconds(); process->cpu_percent = 0.0f; - if (time_diff_process > Duration::zero()) + if (time_diff_process > AK::Duration::zero()) process->cpu_percent = 100.0f * static_cast(time_diff_process.to_microseconds()) / total_cpu_micro_diff; } diff --git a/Userland/Libraries/LibCore/Socket.cpp b/Userland/Libraries/LibCore/Socket.cpp index 7dc777b8c5a..6369d4f5dae 100644 --- a/Userland/Libraries/LibCore/Socket.cpp +++ b/Userland/Libraries/LibCore/Socket.cpp @@ -200,7 +200,7 @@ ErrorOr PosixSocketHelper::set_close_on_exec(bool enabled) return {}; } -ErrorOr PosixSocketHelper::set_receive_timeout(Duration timeout) +ErrorOr PosixSocketHelper::set_receive_timeout(AK::Duration timeout) { auto timeout_spec = timeout.to_timespec(); return System::setsockopt(m_fd, SOL_SOCKET, SO_RCVTIMEO, &timeout_spec, sizeof(timeout_spec)); @@ -259,14 +259,14 @@ ErrorOr PosixSocketHelper::pending_bytes() const return static_cast(value); } -ErrorOr> UDPSocket::connect(ByteString const& host, u16 port, Optional timeout) +ErrorOr> UDPSocket::connect(ByteString const& host, u16 port, Optional timeout) { auto ip_address = TRY(resolve_host(host, SocketType::Datagram)); return ip_address.visit([port, timeout](auto address) { return connect(SocketAddress { address, port }, timeout); }); } -ErrorOr> UDPSocket::connect(SocketAddress const& address, Optional timeout) +ErrorOr> UDPSocket::connect(SocketAddress const& address, Optional timeout) { auto socket = TRY(adopt_nonnull_own_or_enomem(new (nothrow) UDPSocket())); diff --git a/Userland/Libraries/LibCore/Socket.h b/Userland/Libraries/LibCore/Socket.h index bcac9803ea7..5159d3e1190 100644 --- a/Userland/Libraries/LibCore/Socket.h +++ b/Userland/Libraries/LibCore/Socket.h @@ -144,7 +144,7 @@ public: ErrorOr set_blocking(bool enabled); ErrorOr set_close_on_exec(bool enabled); - ErrorOr set_receive_timeout(Duration timeout); + ErrorOr set_receive_timeout(AK::Duration timeout); void setup_notifier(); RefPtr notifier() { return m_notifier; } @@ -218,8 +218,8 @@ private: class UDPSocket final : public Socket { public: - static ErrorOr> connect(ByteString const& host, u16 port, Optional timeout = {}); - static ErrorOr> connect(SocketAddress const& address, Optional timeout = {}); + static ErrorOr> connect(ByteString const& host, u16 port, Optional timeout = {}); + static ErrorOr> connect(SocketAddress const& address, Optional timeout = {}); UDPSocket(UDPSocket&& other) : Socket(static_cast(other))