From d42dfdf4b903763997d47b6e2214c2ce33b9bf8e Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 9 Jun 2021 21:59:17 +0800 Subject: import(life): Add operating system experiement. --- works/life/operating-system-experiment/Thread.cpp | 67 +++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 works/life/operating-system-experiment/Thread.cpp (limited to 'works/life/operating-system-experiment/Thread.cpp') diff --git a/works/life/operating-system-experiment/Thread.cpp b/works/life/operating-system-experiment/Thread.cpp new file mode 100644 index 0000000..b91ca69 --- /dev/null +++ b/works/life/operating-system-experiment/Thread.cpp @@ -0,0 +1,67 @@ +#include "Thread.h" + +#include +#include +#include + +namespace cru { +Thread::Thread(Thread &&other) noexcept + : joined_(other.joined_), thread_handle_(other.thread_handle_) { + other.joined_ = false; + other.thread_handle_ = nullptr; +} + +Thread &Thread::operator=(Thread &&other) noexcept { + if (this != &other) { + joined_ = other.joined_; + thread_handle_ = other.thread_handle_; + other.joined_ = false; + other.thread_handle_ = nullptr; + } + + return *this; +} + +Thread::~Thread() { Destroy(); } + +void Thread::Join() { + assert(thread_handle_); + joined_ = true; + WaitForSingleObject(thread_handle_, INFINITE); +} + +void Thread::Detach() { + assert(thread_handle_); + detached_ = true; +} + +void Thread::swap(Thread &other) noexcept { +#ifdef CRU_WINDOWS + Thread temp = std::move(*this); + *this = std::move(other); + other = std::move(temp); +#else +#endif +} + +void Thread::Destroy() noexcept { + if (!detached_ && !joined_ && thread_handle_ != nullptr) { + std::terminate(); + } else { + joined_ = false; + thread_handle_ = nullptr; + } +} + +namespace details { +#ifdef CRU_WINDOWS +DWORD WINAPI ThreadProc(_In_ LPVOID lpParameter) { + auto p = static_cast *>(lpParameter); + (*p)(); + delete p; + return 0; +} +#else +#endif +} // namespace details +} // namespace cru \ No newline at end of file -- cgit v1.2.3 From 8bdb5db67fa3eeda755511f91fd257bde548a18f Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 9 Jun 2021 22:28:01 +0800 Subject: import(life): ... --- works/life/operating-system-experiment/Base.h | 4 -- .../operating-system-experiment/CMakeLists.txt | 4 ++ works/life/operating-system-experiment/Thread.cpp | 53 ++++++++++++++++++++-- works/life/operating-system-experiment/Thread.h | 17 +++++++ 4 files changed, 69 insertions(+), 9 deletions(-) (limited to 'works/life/operating-system-experiment/Thread.cpp') diff --git a/works/life/operating-system-experiment/Base.h b/works/life/operating-system-experiment/Base.h index b3ac1ee..6964c1c 100644 --- a/works/life/operating-system-experiment/Base.h +++ b/works/life/operating-system-experiment/Base.h @@ -5,10 +5,6 @@ #define CRU_WINDOWS 1 #endif -#ifdef CRU_WINDOWS -#include -#endif - #ifdef CRU_WINDOWS #ifdef CRU_EXPORT_API #define CRU_API __declspec(dllexport) diff --git a/works/life/operating-system-experiment/CMakeLists.txt b/works/life/operating-system-experiment/CMakeLists.txt index 2c46b0f..540574b 100644 --- a/works/life/operating-system-experiment/CMakeLists.txt +++ b/works/life/operating-system-experiment/CMakeLists.txt @@ -12,6 +12,10 @@ find_package(Microsoft.GSL CONFIG REQUIRED) add_library(cru_system SHARED Thread.cpp) target_link_libraries(cru_system PUBLIC Microsoft.GSL::GSL fmt::fmt) target_compile_definitions(cru_system PUBLIC CRU_EXPORT_API) +if(UNIX) +target_link_libraries(cru_system PUBLIC pthread) +endif() + add_executable(main main.cpp) target_link_libraries(main PRIVATE cru_system) \ No newline at end of file diff --git a/works/life/operating-system-experiment/Thread.cpp b/works/life/operating-system-experiment/Thread.cpp index b91ca69..8230c1c 100644 --- a/works/life/operating-system-experiment/Thread.cpp +++ b/works/life/operating-system-experiment/Thread.cpp @@ -2,21 +2,36 @@ #include #include +#include #include namespace cru { Thread::Thread(Thread &&other) noexcept - : joined_(other.joined_), thread_handle_(other.thread_handle_) { + : detached_(other.detached_), joined_(other.joined_), +#ifdef CRU_WINDOWS + thread_handle_(other.thread_handle_) +#else + thread_(std::move(other.thread_)) +#endif +{ other.joined_ = false; +#ifdef CRU_WINDOWS other.thread_handle_ = nullptr; -} +#endif +} // namespace cru Thread &Thread::operator=(Thread &&other) noexcept { if (this != &other) { + detached_ = other.detached_; joined_ = other.joined_; +#ifdef CRU_WINDOWS thread_handle_ = other.thread_handle_; - other.joined_ = false; other.thread_handle_ = nullptr; +#else + thread_ = std::move(other.thread_); +#endif + other.detached_ = false; + other.joined_ = false; } return *this; @@ -25,13 +40,23 @@ Thread &Thread::operator=(Thread &&other) noexcept { Thread::~Thread() { Destroy(); } void Thread::Join() { - assert(thread_handle_); joined_ = true; +#ifdef CRU_WINDOWS + assert(thread_handle_); WaitForSingleObject(thread_handle_, INFINITE); +#else + assert(thread_); + auto c = pthread_join(*thread_, nullptr); + assert(c == 0); +#endif } void Thread::Detach() { +#ifdef CRU_WINDOWS assert(thread_handle_); +#else + assert(thread_); +#endif detached_ = true; } @@ -45,11 +70,22 @@ void Thread::swap(Thread &other) noexcept { } void Thread::Destroy() noexcept { - if (!detached_ && !joined_ && thread_handle_ != nullptr) { + if (!detached_ && !joined_ && +#ifdef CRU_WINDOWS + thread_handle_ != nullptr +#else + thread_ != nullptr +#endif + ) { std::terminate(); } else { + detached_ = false; joined_ = false; +#ifdef CRU_WINDOWS thread_handle_ = nullptr; +#else + thread_ = nullptr; +#endif } } @@ -62,6 +98,13 @@ DWORD WINAPI ThreadProc(_In_ LPVOID lpParameter) { return 0; } #else +void *ThreadProc(void *data) { + auto p = static_cast *>(data); + (*p)(); + delete p; + return nullptr; +} + #endif } // namespace details } // namespace cru \ No newline at end of file diff --git a/works/life/operating-system-experiment/Thread.h b/works/life/operating-system-experiment/Thread.h index c71c11f..79c1728 100644 --- a/works/life/operating-system-experiment/Thread.h +++ b/works/life/operating-system-experiment/Thread.h @@ -3,9 +3,17 @@ #include "Base.h" +#ifdef CRU_WINDOWS +#include +#else +#include +#endif + #ifdef __cplusplus +#include #include +#include #include #include #include @@ -38,6 +46,8 @@ private: #ifdef CRU_WINDOWS DWORD thread_id_ = 0; HANDLE thread_handle_ = nullptr; +#else + std::unique_ptr thread_; #endif }; @@ -45,6 +55,7 @@ namespace details { #ifdef CRU_WINDOWS CRU_API DWORD WINAPI ThreadProc(_In_ LPVOID lpParameter); #else +void *ThreadProc(void *data); #endif } // namespace details @@ -59,6 +70,12 @@ Thread::Thread(Fn &&process, Args &&...args) { #ifdef CRU_WINDOWS thread_handle_ = ::CreateThread(nullptr, 0, &::cru::details::ThreadProc, static_cast(p), 0, &thread_id_); + assert(thread_handle_); +#else + thread_.reset(new pthread_t()); + auto c = pthread_create(thread_.get(), nullptr, details::ThreadProc, + static_cast(p)); + assert(c == 0); #endif }; } // namespace cru -- cgit v1.2.3 From 93d8feccd79b35fc890fc8629d6da2c2baa57762 Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 9 Jun 2021 22:32:01 +0800 Subject: import(life): ... --- works/life/operating-system-experiment/Thread.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'works/life/operating-system-experiment/Thread.cpp') diff --git a/works/life/operating-system-experiment/Thread.cpp b/works/life/operating-system-experiment/Thread.cpp index 8230c1c..9d9f5dd 100644 --- a/works/life/operating-system-experiment/Thread.cpp +++ b/works/life/operating-system-experiment/Thread.cpp @@ -2,7 +2,6 @@ #include #include -#include #include namespace cru { -- cgit v1.2.3 From ef593ba2d445af515214d63bfd3942be9d673467 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 10 Jun 2021 11:12:25 +0800 Subject: import(life): ... --- .../operating-system-experiment/CMakeLists.txt | 8 ++- .../operating-system-experiment/DataRaceDemo.cpp | 27 ++++++++ works/life/operating-system-experiment/Mutex.cpp | 78 ++++++++++++++++++++++ works/life/operating-system-experiment/Mutex.h | 44 ++++++++++++ works/life/operating-system-experiment/Thread.cpp | 31 +++++++++ works/life/operating-system-experiment/Thread.h | 15 ++++- 6 files changed, 199 insertions(+), 4 deletions(-) create mode 100644 works/life/operating-system-experiment/DataRaceDemo.cpp create mode 100644 works/life/operating-system-experiment/Mutex.cpp create mode 100644 works/life/operating-system-experiment/Mutex.h (limited to 'works/life/operating-system-experiment/Thread.cpp') diff --git a/works/life/operating-system-experiment/CMakeLists.txt b/works/life/operating-system-experiment/CMakeLists.txt index 540574b..806ec74 100644 --- a/works/life/operating-system-experiment/CMakeLists.txt +++ b/works/life/operating-system-experiment/CMakeLists.txt @@ -9,13 +9,15 @@ set(CMAKE_CXX_STANDARD 17) find_package(fmt CONFIG REQUIRED) find_package(Microsoft.GSL CONFIG REQUIRED) -add_library(cru_system SHARED Thread.cpp) +add_library(cru_system SHARED Thread.cpp Mutex.cpp) target_link_libraries(cru_system PUBLIC Microsoft.GSL::GSL fmt::fmt) target_compile_definitions(cru_system PUBLIC CRU_EXPORT_API) if(UNIX) target_link_libraries(cru_system PUBLIC pthread) endif() - add_executable(main main.cpp) -target_link_libraries(main PRIVATE cru_system) \ No newline at end of file +target_link_libraries(main PRIVATE cru_system) + +add_executable(data_race_demo DataRaceDemo.cpp) +target_link_libraries(data_race_demo PRIVATE cru_system) diff --git a/works/life/operating-system-experiment/DataRaceDemo.cpp b/works/life/operating-system-experiment/DataRaceDemo.cpp new file mode 100644 index 0000000..9589eb3 --- /dev/null +++ b/works/life/operating-system-experiment/DataRaceDemo.cpp @@ -0,0 +1,27 @@ +#include "Thread.h" + +#include + +int main() { + unsigned data = 0; + + cru::Thread t1([&data] { + for (int i = 0; i < 100000; i++) + data += 10; + }); + + cru::Thread t2([&data] { + for (int i = 0; i < 100000; i++) + data += 10; + }); + + std::cout << "Created thread: " << t1.GetNativeID() << '\n'; + std::cout << "Created thread: " << t2.GetNativeID() << '\n'; + + t1.Join(); + t2.Join(); + std::cout << "Answer is " << data << ", which is " + << (data == 200000 ? "correct" : "false") << '\n'; + + return 0; +} diff --git a/works/life/operating-system-experiment/Mutex.cpp b/works/life/operating-system-experiment/Mutex.cpp new file mode 100644 index 0000000..6a91885 --- /dev/null +++ b/works/life/operating-system-experiment/Mutex.cpp @@ -0,0 +1,78 @@ +#include "Mutex.h" + +#include +#include + +#ifndef CRU_WINDOWS +#include +#endif + +namespace cru { +Mutex::Mutex() { +#ifdef CRU_WINDOWS +#else + mutex_ = std::make_unique(); + + auto c = pthread_mutex_init(mutex_.get(), nullptr); + assert(c == 0); +#endif +} + +Mutex::Mutex(Mutex &&other) +#ifdef CRU_WINDOWS +#else + : mutex_(std::move(other.mutex_)) +#endif +{ +} + +Mutex &Mutex::operator=(Mutex &&other) { + if (this != &other) { + Destroy(); + mutex_ = std::move(other.mutex_); + } + return *this; +} + +Mutex::~Mutex() { Destroy(); } + +void Mutex::Lock() { +#ifdef CRU_WINDOWS +#else + assert(mutex_); + auto c = pthread_mutex_lock(mutex_.get()); + assert(c == 0); +#endif +} + +bool Mutex::TryLock() { +#ifdef CRU_WINDOWS +#else + assert(mutex_); + auto c = pthread_mutex_trylock(mutex_.get()); + assert(c == 0 || c == EBUSY); + return c == 0 ? true : false; +#endif +} + +void Mutex::Unlock() { +#ifdef CRU_WINDOWS +#else + assert(mutex_); + auto c = pthread_mutex_unlock(mutex_.get()); + assert(c == 0); +#endif +} + +void Mutex::Destroy() { +#ifdef CRU_WINDOWS +#else + if (mutex_ != nullptr) { + auto c = pthread_mutex_destroy(mutex_.get()); + assert(c); + mutex_ = nullptr; + } +#endif +} + +} // namespace cru diff --git a/works/life/operating-system-experiment/Mutex.h b/works/life/operating-system-experiment/Mutex.h new file mode 100644 index 0000000..163d9ca --- /dev/null +++ b/works/life/operating-system-experiment/Mutex.h @@ -0,0 +1,44 @@ +#ifndef HEADER_MUTEX_H +#define HEADER_MUTEX_H + +#include "Base.h" + +#include + +#ifdef CRU_WINDOWS +#include +#else +#include +#endif + +namespace cru { +class CRU_API Mutex { +public: + Mutex(); + + Mutex(const Mutex &other) = delete; + Mutex &operator=(const Mutex &other) = delete; + + Mutex(Mutex &&other); + Mutex &operator=(Mutex &&other); + + ~Mutex(); + +public: + void Lock(); + bool TryLock(); + + void Unlock(); + +private: + void Destroy(); + +private: +#ifdef CRU_WINDOWS +#else + std::unique_ptr mutex_; +#endif +}; +} // namespace cru + +#endif \ No newline at end of file diff --git a/works/life/operating-system-experiment/Thread.cpp b/works/life/operating-system-experiment/Thread.cpp index 9d9f5dd..7e3c784 100644 --- a/works/life/operating-system-experiment/Thread.cpp +++ b/works/life/operating-system-experiment/Thread.cpp @@ -59,6 +59,36 @@ void Thread::Detach() { detached_ = true; } +#ifdef CRU_WINDOWS +DWORD +#else +pthread_t +#endif +Thread::GetNativeID() { +#ifdef CRU_WINDOWS + assert(thread_handle_); + return thread_id_; +#else + assert(thread_); + return *thread_; +#endif +} + +#ifdef CRU_WINDOWS +HANDLE +#else +pthread_t +#endif +Thread::GetNativeHandle() { +#ifdef CRU_WINDOWS + assert(thread_handle_); + return thread_handle_; +#else + assert(thread_); + return *thread_; +#endif +} + void Thread::swap(Thread &other) noexcept { #ifdef CRU_WINDOWS Thread temp = std::move(*this); @@ -81,6 +111,7 @@ void Thread::Destroy() noexcept { detached_ = false; joined_ = false; #ifdef CRU_WINDOWS + thread_id_ = 0; thread_handle_ = nullptr; #else thread_ = nullptr; diff --git a/works/life/operating-system-experiment/Thread.h b/works/life/operating-system-experiment/Thread.h index 69a402c..56fdcb0 100644 --- a/works/life/operating-system-experiment/Thread.h +++ b/works/life/operating-system-experiment/Thread.h @@ -18,7 +18,6 @@ #include #include #include -#include namespace cru { class CRU_API Thread { @@ -35,6 +34,20 @@ public: void Join(); void Detach(); +#ifdef CRU_WINDOWS + DWORD +#else + pthread_t +#endif + GetNativeID(); + +#ifdef CRU_WINDOWS + HANDLE +#else + pthread_t +#endif + GetNativeHandle(); + void swap(Thread &other) noexcept; private: -- cgit v1.2.3 From f532667d936500f50447d63333544f603ec06137 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 10 Jun 2021 11:35:29 +0800 Subject: import(life): ... --- .../operating-system-experiment/CMakeLists.txt | 3 ++ .../operating-system-experiment/DataRaceDemo.cpp | 2 +- works/life/operating-system-experiment/Mutex.cpp | 23 +++++++++++- works/life/operating-system-experiment/Mutex.h | 1 + .../MutexAvoidDataRaceDemo.cpp | 42 ++++++++++++++++++++++ works/life/operating-system-experiment/Thread.cpp | 5 ++- 6 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 works/life/operating-system-experiment/MutexAvoidDataRaceDemo.cpp (limited to 'works/life/operating-system-experiment/Thread.cpp') diff --git a/works/life/operating-system-experiment/CMakeLists.txt b/works/life/operating-system-experiment/CMakeLists.txt index 806ec74..139d2ba 100644 --- a/works/life/operating-system-experiment/CMakeLists.txt +++ b/works/life/operating-system-experiment/CMakeLists.txt @@ -21,3 +21,6 @@ target_link_libraries(main PRIVATE cru_system) add_executable(data_race_demo DataRaceDemo.cpp) target_link_libraries(data_race_demo PRIVATE cru_system) + +add_executable(mutex_avoid_data_race_demo MutexAvoidDataRaceDemo.cpp) +target_link_libraries(mutex_avoid_data_race_demo PRIVATE cru_system) diff --git a/works/life/operating-system-experiment/DataRaceDemo.cpp b/works/life/operating-system-experiment/DataRaceDemo.cpp index 9589eb3..a2f98d9 100644 --- a/works/life/operating-system-experiment/DataRaceDemo.cpp +++ b/works/life/operating-system-experiment/DataRaceDemo.cpp @@ -21,7 +21,7 @@ int main() { t1.Join(); t2.Join(); std::cout << "Answer is " << data << ", which is " - << (data == 200000 ? "correct" : "false") << '\n'; + << (data == 2000000 ? "correct" : "false") << '\n'; return 0; } diff --git a/works/life/operating-system-experiment/Mutex.cpp b/works/life/operating-system-experiment/Mutex.cpp index 6a91885..b7d0cb6 100644 --- a/works/life/operating-system-experiment/Mutex.cpp +++ b/works/life/operating-system-experiment/Mutex.cpp @@ -1,7 +1,6 @@ #include "Mutex.h" #include -#include #ifndef CRU_WINDOWS #include @@ -10,6 +9,8 @@ namespace cru { Mutex::Mutex() { #ifdef CRU_WINDOWS + handle_ = CreateMutexW(nullptr, FALSE, nullptr); + assert(handle_); #else mutex_ = std::make_unique(); @@ -20,16 +21,25 @@ Mutex::Mutex() { Mutex::Mutex(Mutex &&other) #ifdef CRU_WINDOWS + : handle_(other.handle_) #else : mutex_(std::move(other.mutex_)) #endif { +#ifdef CRU_WINDOWS + other.handle_ = nullptr; +#endif } Mutex &Mutex::operator=(Mutex &&other) { if (this != &other) { Destroy(); +#ifdef CRU_WINDOWS + handle_ = other.handle_; + other.handle_ = nullptr; +#else mutex_ = std::move(other.mutex_); +#endif } return *this; } @@ -38,6 +48,8 @@ Mutex::~Mutex() { Destroy(); } void Mutex::Lock() { #ifdef CRU_WINDOWS + auto c = WaitForSingleObject(handle_, INFINITE); + assert(c == WAIT_OBJECT_0); #else assert(mutex_); auto c = pthread_mutex_lock(mutex_.get()); @@ -47,6 +59,9 @@ void Mutex::Lock() { bool Mutex::TryLock() { #ifdef CRU_WINDOWS + auto c = WaitForSingleObject(handle_, 0); + assert(c == WAIT_OBJECT_0 || c == WAIT_TIMEOUT); + return c == WAIT_OBJECT_0 ? true : false; #else assert(mutex_); auto c = pthread_mutex_trylock(mutex_.get()); @@ -57,6 +72,8 @@ bool Mutex::TryLock() { void Mutex::Unlock() { #ifdef CRU_WINDOWS + auto c = ReleaseMutex(handle_); + assert(c); #else assert(mutex_); auto c = pthread_mutex_unlock(mutex_.get()); @@ -66,6 +83,10 @@ void Mutex::Unlock() { void Mutex::Destroy() { #ifdef CRU_WINDOWS + if (handle_ != nullptr) { + auto c = CloseHandle(handle_); + assert(c); + } #else if (mutex_ != nullptr) { auto c = pthread_mutex_destroy(mutex_.get()); diff --git a/works/life/operating-system-experiment/Mutex.h b/works/life/operating-system-experiment/Mutex.h index 163d9ca..d561f1a 100644 --- a/works/life/operating-system-experiment/Mutex.h +++ b/works/life/operating-system-experiment/Mutex.h @@ -35,6 +35,7 @@ private: private: #ifdef CRU_WINDOWS + HANDLE handle_; #else std::unique_ptr mutex_; #endif diff --git a/works/life/operating-system-experiment/MutexAvoidDataRaceDemo.cpp b/works/life/operating-system-experiment/MutexAvoidDataRaceDemo.cpp new file mode 100644 index 0000000..81a7aa1 --- /dev/null +++ b/works/life/operating-system-experiment/MutexAvoidDataRaceDemo.cpp @@ -0,0 +1,42 @@ +#include "Mutex.h" +#include "Thread.h" + +#include + +int main() { + + unsigned data = 0; + cru::Mutex mutex; + mutex.Lock(); + + cru::Thread t1([&data, &mutex] { + for (int i = 0; i < 100000; i++) { + mutex.Lock(); + data += 10; + //std::cout << "Data is now: " << data << '\n'; + mutex.Unlock(); + } + }); + + cru::Thread t2([&data, &mutex] { + for (int i = 0; i < 100000; i++) { + mutex.Lock(); + data += 10; + //std::cout << "Data is now: " << data << '\n'; + mutex.Unlock(); + } + }); + + std::cout << "Created thread: " << t1.GetNativeID() << '\n'; + std::cout << "Created thread: " << t2.GetNativeID() << '\n'; + + mutex.Unlock(); + + t1.Join(); + t2.Join(); + + std::cout << "Answer is " << data << ", which is " + << (data == 2000000 ? "correct" : "false") << '\n'; + + return 0; +} diff --git a/works/life/operating-system-experiment/Thread.cpp b/works/life/operating-system-experiment/Thread.cpp index 7e3c784..a5f526d 100644 --- a/works/life/operating-system-experiment/Thread.cpp +++ b/works/life/operating-system-experiment/Thread.cpp @@ -112,7 +112,10 @@ void Thread::Destroy() noexcept { joined_ = false; #ifdef CRU_WINDOWS thread_id_ = 0; - thread_handle_ = nullptr; + if (thread_handle_ != nullptr) { + CloseHandle(thread_handle_); + thread_handle_ = nullptr; + } #else thread_ = nullptr; #endif -- cgit v1.2.3 From 5018c2b40009258ed0691cbbb1dcc4d8ac4a809b Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 10 Jun 2021 11:55:27 +0800 Subject: import(life): ... --- .../operating-system-experiment/CMakeLists.txt | 3 +++ .../operating-system-experiment/Interlocked.cpp | 2 +- .../operating-system-experiment/Interlocked.hpp | 2 +- .../InterlockedAvoidDataRaceDemo.cpp | 28 ++++++++++++++++++++++ works/life/operating-system-experiment/Thread.cpp | 18 ++++++++++++-- works/life/operating-system-experiment/Thread.h | 12 ++-------- 6 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 works/life/operating-system-experiment/InterlockedAvoidDataRaceDemo.cpp (limited to 'works/life/operating-system-experiment/Thread.cpp') diff --git a/works/life/operating-system-experiment/CMakeLists.txt b/works/life/operating-system-experiment/CMakeLists.txt index bd50319..8b4617f 100644 --- a/works/life/operating-system-experiment/CMakeLists.txt +++ b/works/life/operating-system-experiment/CMakeLists.txt @@ -24,3 +24,6 @@ target_link_libraries(data_race_demo PRIVATE cru_system) add_executable(mutex_avoid_data_race_demo MutexAvoidDataRaceDemo.cpp) target_link_libraries(mutex_avoid_data_race_demo PRIVATE cru_system) + +add_executable(interlocked_avoid_data_race_demo InterlockedAvoidDataRaceDemo.cpp) +target_link_libraries(interlocked_avoid_data_race_demo PRIVATE cru_system) diff --git a/works/life/operating-system-experiment/Interlocked.cpp b/works/life/operating-system-experiment/Interlocked.cpp index 1c0f638..7fc8c6b 100644 --- a/works/life/operating-system-experiment/Interlocked.cpp +++ b/works/life/operating-system-experiment/Interlocked.cpp @@ -6,7 +6,7 @@ #endif namespace cru { -void InterlockedAdd(volatile long long *v, long long a) { +void CruInterlockedAdd(volatile long long *v, long long a) { #ifdef CRU_WINDOWS InterlockedAdd64(v, a); #else diff --git a/works/life/operating-system-experiment/Interlocked.hpp b/works/life/operating-system-experiment/Interlocked.hpp index aa5dbfc..7e09b60 100644 --- a/works/life/operating-system-experiment/Interlocked.hpp +++ b/works/life/operating-system-experiment/Interlocked.hpp @@ -4,7 +4,7 @@ #include "Base.h" namespace cru { -CRU_API void InterlockedAdd(volatile long long *v, long long a); +CRU_API void CruInterlockedAdd(volatile long long *v, long long a); } #endif diff --git a/works/life/operating-system-experiment/InterlockedAvoidDataRaceDemo.cpp b/works/life/operating-system-experiment/InterlockedAvoidDataRaceDemo.cpp new file mode 100644 index 0000000..91d6d50 --- /dev/null +++ b/works/life/operating-system-experiment/InterlockedAvoidDataRaceDemo.cpp @@ -0,0 +1,28 @@ +#include "Interlocked.hpp" +#include "Thread.h" + +#include + +int main() { + volatile long long data = 0; + + cru::Thread t1([&data] { + for (int i = 0; i < 100000; i++) + cru::CruInterlockedAdd(&data, 10); + }); + + cru::Thread t2([&data] { + for (int i = 0; i < 100000; i++) + cru::CruInterlockedAdd(&data, 10); + }); + + std::cout << "Created thread: " << t1.GetNativeID() << '\n'; + std::cout << "Created thread: " << t2.GetNativeID() << '\n'; + + t1.Join(); + t2.Join(); + std::cout << "Answer is " << data << ", which is " + << (data == 2000000 ? "correct" : "false") << '\n'; + + return 0; +} diff --git a/works/life/operating-system-experiment/Thread.cpp b/works/life/operating-system-experiment/Thread.cpp index a5f526d..657c69f 100644 --- a/works/life/operating-system-experiment/Thread.cpp +++ b/works/life/operating-system-experiment/Thread.cpp @@ -122,7 +122,7 @@ void Thread::Destroy() noexcept { } } -namespace details { +namespace { #ifdef CRU_WINDOWS DWORD WINAPI ThreadProc(_In_ LPVOID lpParameter) { auto p = static_cast *>(lpParameter); @@ -139,5 +139,19 @@ void *ThreadProc(void *data) { } #endif -} // namespace details +} // namespace + +void Thread::CreateThread(std::function *proc) { +#ifdef CRU_WINDOWS + thread_handle_ = ::CreateThread(nullptr, 0, ThreadProc, + static_cast(proc), 0, &thread_id_); + assert(thread_handle_); +#else + thread_.reset(new pthread_t()); + auto c = pthread_create(thread_.get(), nullptr, ThreadProc, + static_cast(proc)); + assert(c == 0); +#endif +}; + } // namespace cru \ No newline at end of file diff --git a/works/life/operating-system-experiment/Thread.h b/works/life/operating-system-experiment/Thread.h index 56fdcb0..735407c 100644 --- a/works/life/operating-system-experiment/Thread.h +++ b/works/life/operating-system-experiment/Thread.h @@ -52,6 +52,7 @@ public: private: void Destroy() noexcept; + void CreateThread(std::function *proc); private: bool detached_ = false; @@ -81,16 +82,7 @@ Thread::Thread(Fn &&process, Args &&...args) { std::apply(process, std::move(args)); }); -#ifdef CRU_WINDOWS - thread_handle_ = ::CreateThread(nullptr, 0, &::cru::details::ThreadProc, - static_cast(p), 0, &thread_id_); - assert(thread_handle_); -#else - thread_.reset(new pthread_t()); - auto c = pthread_create(thread_.get(), nullptr, details::ThreadProc, - static_cast(p)); - assert(c == 0); -#endif + CreateThread(p); }; } // namespace cru -- cgit v1.2.3 From fabd9692c49bad9f4f2858315f2a16501ad45d21 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 11 Jun 2021 11:02:41 +0800 Subject: import(life): ... --- works/life/operating-system-experiment/Mutex.cpp | 1 + works/life/operating-system-experiment/Semaphore.cpp | 20 ++++++++++++++++++++ works/life/operating-system-experiment/Semaphore.h | 1 + works/life/operating-system-experiment/Thread.cpp | 3 ++- 4 files changed, 24 insertions(+), 1 deletion(-) (limited to 'works/life/operating-system-experiment/Thread.cpp') diff --git a/works/life/operating-system-experiment/Mutex.cpp b/works/life/operating-system-experiment/Mutex.cpp index 4d360f1..8acfdc5 100644 --- a/works/life/operating-system-experiment/Mutex.cpp +++ b/works/life/operating-system-experiment/Mutex.cpp @@ -86,6 +86,7 @@ void Mutex::Destroy() { if (handle_ != nullptr) { auto c = CloseHandle(handle_); assert(c); + handle_ = nullptr; } #else if (mutex_ != nullptr) { diff --git a/works/life/operating-system-experiment/Semaphore.cpp b/works/life/operating-system-experiment/Semaphore.cpp index e8221fd..aceef4d 100644 --- a/works/life/operating-system-experiment/Semaphore.cpp +++ b/works/life/operating-system-experiment/Semaphore.cpp @@ -9,6 +9,8 @@ namespace cru { Semaphore::Semaphore(unsigned init_value) { #ifdef CRU_WINDOWS + handle_ = CreateSemaphoreW(nullptr, init_value, 100, nullptr); + assert(handle_); #else semaphore_ = std::make_unique(); auto c = sem_init(semaphore_.get(), 0, init_value); @@ -18,16 +20,22 @@ Semaphore::Semaphore(unsigned init_value) { Semaphore::Semaphore(Semaphore &&other) #ifdef CRU_WINDOWS + : handle_(other.handle_) #else : semaphore_(std::move(other.semaphore_)) #endif { +#ifdef CRU_WINDOWS + other.handle_ = nullptr; +#endif } Semaphore &Semaphore::operator=(Semaphore &&other) { if (this != &other) { Destroy(); #ifdef CRU_WINDOWS + handle_ = other.handle_; + other.handle_ = nullptr; #else semaphore_ = std::move(other.semaphore_); #endif @@ -42,6 +50,8 @@ void Semaphore::V() { Release(); } void Semaphore::Acquire() { #ifdef CRU_WINDOWS + auto c = WaitForSingleObject(handle_, INFINITE); + assert(c == WAIT_OBJECT_0); #else auto c = sem_wait(semaphore_.get()); assert(c == 0); @@ -50,6 +60,9 @@ void Semaphore::Acquire() { bool Semaphore::TryAcquire() { #ifdef CRU_WINDOWS + auto c = WaitForSingleObject(handle_, 0); + assert(c == WAIT_OBJECT_0 || c == WAIT_TIMEOUT); + return c == WAIT_OBJECT_0 ? true : false; #else auto c = sem_trywait(semaphore_.get()); assert((c == 0) || (c == -1 && errno == EAGAIN)); @@ -59,6 +72,8 @@ bool Semaphore::TryAcquire() { void Semaphore::Release() { #ifdef CRU_WINDOWS + auto c = ReleaseSemaphore(handle_, 1, nullptr); + assert(c); #else auto c = sem_post(semaphore_.get()); assert(c == 0); @@ -67,6 +82,11 @@ void Semaphore::Release() { void Semaphore::Destroy() { #ifdef CRU_WINDOWS + if (handle_ != nullptr) { + auto c = CloseHandle(handle_); + assert(c); + handle_ = nullptr; + } #else if (semaphore_ != nullptr) { auto c = sem_destroy(semaphore_.get()); diff --git a/works/life/operating-system-experiment/Semaphore.h b/works/life/operating-system-experiment/Semaphore.h index 1d49b60..430c036 100644 --- a/works/life/operating-system-experiment/Semaphore.h +++ b/works/life/operating-system-experiment/Semaphore.h @@ -37,6 +37,7 @@ private: private: #ifdef CRU_WINDOWS + HANDLE handle_ = nullptr; #else std::unique_ptr semaphore_; #endif diff --git a/works/life/operating-system-experiment/Thread.cpp b/works/life/operating-system-experiment/Thread.cpp index 657c69f..0bc4c18 100644 --- a/works/life/operating-system-experiment/Thread.cpp +++ b/works/life/operating-system-experiment/Thread.cpp @@ -113,7 +113,8 @@ void Thread::Destroy() noexcept { #ifdef CRU_WINDOWS thread_id_ = 0; if (thread_handle_ != nullptr) { - CloseHandle(thread_handle_); + auto c = CloseHandle(thread_handle_); + assert(c); thread_handle_ = nullptr; } #else -- cgit v1.2.3