diff --git a/Libraries/CMakeLists.txt b/Libraries/CMakeLists.txt index c3db4a49f9d..372b966e708 100644 --- a/Libraries/CMakeLists.txt +++ b/Libraries/CMakeLists.txt @@ -9,6 +9,7 @@ add_subdirectory(LibRIFF) add_subdirectory(LibSyntax) add_subdirectory(LibTest) add_subdirectory(LibTextCodec) +add_subdirectory(LibThreading) add_subdirectory(LibUnicode) add_subdirectory(LibURL) add_subdirectory(LibXML) @@ -22,7 +23,6 @@ add_subdirectory(LibHTTP) add_subdirectory(LibIPC) add_subdirectory(LibLine) add_subdirectory(LibRequests) -add_subdirectory(LibThreading) add_subdirectory(LibTLS) add_subdirectory(LibWasm) add_subdirectory(LibWebSocket) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index b5a1fce6951..59decf12ea8 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -5,6 +5,7 @@ add_subdirectory(LibDiff) add_subdirectory(LibGC) add_subdirectory(LibJS) add_subdirectory(LibRegex) +add_subdirectory(LibThreading) add_subdirectory(LibURL) # FIXME: Increase support for building targets on Windows @@ -16,7 +17,6 @@ add_subdirectory(LibCore) add_subdirectory(LibDNS) add_subdirectory(LibTest) add_subdirectory(LibTextCodec) -add_subdirectory(LibThreading) add_subdirectory(LibTLS) add_subdirectory(LibUnicode) add_subdirectory(LibWasm) diff --git a/Tests/LibThreading/TestThread.cpp b/Tests/LibThreading/TestThread.cpp index 38396056a38..2e2717f5c11 100644 --- a/Tests/LibThreading/TestThread.cpp +++ b/Tests/LibThreading/TestThread.cpp @@ -5,9 +5,9 @@ */ #include +#include #include #include -#include using namespace AK::TimeLiterals; @@ -19,7 +19,7 @@ static void sleep_until_thread_exits(Threading::Thread const& thread) if (thread.has_exited()) return; - usleep(delay.to_microseconds()); + (void)Core::System::sleep_ms(delay.to_milliseconds()); } FAIL("Timed out waiting for thread to exit"); @@ -30,7 +30,7 @@ TEST_CASE(threads_can_detach) IGNORE_USE_IN_ESCAPING_LAMBDA Atomic should_be_42 = 0; auto thread = Threading::Thread::construct([&should_be_42]() { - usleep(10 * 1000); + (void)Core::System::sleep_ms(10); should_be_42 = 42; return 0; }); @@ -46,7 +46,7 @@ TEST_CASE(detached_threads_do_not_need_to_be_joined) IGNORE_USE_IN_ESCAPING_LAMBDA Atomic should_exit { false }; auto thread = Threading::Thread::construct([&]() { while (!should_exit.load()) - usleep(10 * 1000); + (void)Core::System::sleep_ms(10); return 0; }); thread->start();