From d42dfdf4b903763997d47b6e2214c2ce33b9bf8e Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 9 Jun 2021 21:59:17 +0800
Subject: import(life): Add operating system experiement.

---
 works/life/operating-system-experiment/Thread.h | 68 +++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 works/life/operating-system-experiment/Thread.h

(limited to 'works/life/operating-system-experiment/Thread.h')

diff --git a/works/life/operating-system-experiment/Thread.h b/works/life/operating-system-experiment/Thread.h
new file mode 100644
index 0000000..c71c11f
--- /dev/null
+++ b/works/life/operating-system-experiment/Thread.h
@@ -0,0 +1,68 @@
+#ifndef HEADER_THREAD_H
+#define HEADER_THREAD_H
+
+#include "Base.h"
+
+#ifdef __cplusplus
+
+#include <functional>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+namespace cru {
+class CRU_API Thread {
+public:
+  Thread() = default;
+  template <typename Fn, typename... Args> Thread(Fn &&process, Args &&...args);
+  Thread(const Thread &other) = delete;
+  Thread(Thread &&other) noexcept;
+  Thread &operator=(const Thread &other) = delete;
+  Thread &operator=(Thread &&other) noexcept;
+  ~Thread();
+
+public:
+  void Join();
+  void Detach();
+
+  void swap(Thread &other) noexcept;
+
+private:
+  void Destroy() noexcept;
+
+private:
+  bool detached_ = false;
+  bool joined_ = false;
+
+#ifdef CRU_WINDOWS
+  DWORD thread_id_ = 0;
+  HANDLE thread_handle_ = nullptr;
+#endif
+};
+
+namespace details {
+#ifdef CRU_WINDOWS
+CRU_API DWORD WINAPI ThreadProc(_In_ LPVOID lpParameter);
+#else
+#endif
+} // namespace details
+
+template <typename Fn, typename... Args>
+Thread::Thread(Fn &&process, Args &&...args) {
+  std::tuple<std::decay_t<Args>...> a{std::forward<Args>(args)...};
+  auto p = new std::function<void()>(
+      [process = std::forward<Fn>(process), args = std::move(a)]() {
+        std::apply(process, std::move(args));
+      });
+
+#ifdef CRU_WINDOWS
+  thread_handle_ = ::CreateThread(nullptr, 0, &::cru::details::ThreadProc,
+                                  static_cast<void *>(p), 0, &thread_id_);
+#endif
+};
+} // namespace cru
+
+#endif
+
+#endif
-- 
cgit v1.2.3


From 8bdb5db67fa3eeda755511f91fd257bde548a18f Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
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.h')

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 <Windows.h>
-#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 <cassert>
 #include <exception>
+#include <pthread.h>
 #include <utility>
 
 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<std::function<void()> *>(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 <Windows.h>
+#else
+#include <pthread.h>
+#endif
+
 #ifdef __cplusplus
 
+#include <cassert>
 #include <functional>
+#include <memory>
 #include <tuple>
 #include <type_traits>
 #include <utility>
@@ -38,6 +46,8 @@ private:
 #ifdef CRU_WINDOWS
   DWORD thread_id_ = 0;
   HANDLE thread_handle_ = nullptr;
+#else
+  std::unique_ptr<pthread_t> 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<void *>(p), 0, &thread_id_);
+  assert(thread_handle_);
+#else
+  thread_.reset(new pthread_t());
+  auto c = pthread_create(thread_.get(), nullptr, details::ThreadProc,
+                          static_cast<void *>(p));
+  assert(c == 0);
 #endif
 };
 } // namespace cru
-- 
cgit v1.2.3


From 8268724a054a42f9446736c42d8f04a0207aa12d Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 9 Jun 2021 22:30:14 +0800
Subject: import(life): ...

---
 works/life/operating-system-experiment/Thread.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'works/life/operating-system-experiment/Thread.h')

diff --git a/works/life/operating-system-experiment/Thread.h b/works/life/operating-system-experiment/Thread.h
index c71c11f..cdeecac 100644
--- a/works/life/operating-system-experiment/Thread.h
+++ b/works/life/operating-system-experiment/Thread.h
@@ -10,6 +10,7 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
+#include <tuple>
 
 namespace cru {
 class CRU_API Thread {
-- 
cgit v1.2.3


From ef593ba2d445af515214d63bfd3942be9d673467 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
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.h')

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 <iostream>
+
+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 <cassert>
+#include <pthread.h>
+
+#ifndef CRU_WINDOWS
+#include <errno.h>
+#endif
+
+namespace cru {
+Mutex::Mutex() {
+#ifdef CRU_WINDOWS
+#else
+  mutex_ = std::make_unique<pthread_mutex_t>();
+
+  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 <memory>
+
+#ifdef CRU_WINDOWS
+#include <Windows.h>
+#else
+#include <pthread.h>
+#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<pthread_mutex_t> 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 <type_traits>
 #include <utility>
 #include <vector>
-#include <tuple>
 
 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 5018c2b40009258ed0691cbbb1dcc4d8ac4a809b Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
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.h')

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 <iostream>
+
+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<std::function<void()> *>(lpParameter);
@@ -139,5 +139,19 @@ void *ThreadProc(void *data) {
 }
 
 #endif
-} // namespace details
+} // namespace
+
+void Thread::CreateThread(std::function<void()> *proc) {
+#ifdef CRU_WINDOWS
+  thread_handle_ = ::CreateThread(nullptr, 0, ThreadProc,
+                                  static_cast<void *>(proc), 0, &thread_id_);
+  assert(thread_handle_);
+#else
+  thread_.reset(new pthread_t());
+  auto c = pthread_create(thread_.get(), nullptr, ThreadProc,
+                          static_cast<void *>(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<void()> *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<void *>(p), 0, &thread_id_);
-  assert(thread_handle_);
-#else
-  thread_.reset(new pthread_t());
-  auto c = pthread_create(thread_.get(), nullptr, details::ThreadProc,
-                          static_cast<void *>(p));
-  assert(c == 0);
-#endif
+  CreateThread(p);
 };
 } // namespace cru
 
-- 
cgit v1.2.3


From dc0dfeec23158268268da5a16364abb1f0de5a06 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sat, 12 Jun 2021 23:20:15 +0800
Subject: import(life): ...

---
 .../operating-system-experiment/CMakeLists.txt     |  2 ++
 .../DeadLockDetectionDemo.cpp                      | 25 ++++++++++++++++++++++
 .../ParallelCalculationDemo.cpp                    |  2 ++
 works/life/operating-system-experiment/Thread.h    |  8 -------
 4 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 works/life/operating-system-experiment/DeadLockDetectionDemo.cpp

(limited to 'works/life/operating-system-experiment/Thread.h')

diff --git a/works/life/operating-system-experiment/CMakeLists.txt b/works/life/operating-system-experiment/CMakeLists.txt
index 5671b4a..79fe786 100644
--- a/works/life/operating-system-experiment/CMakeLists.txt
+++ b/works/life/operating-system-experiment/CMakeLists.txt
@@ -33,3 +33,5 @@ target_link_libraries(semaphore_avoid_data_race_demo PRIVATE cru_system)
 
 add_executable(parallel_calculation_demo ParallelCalculationDemo.cpp)
 target_link_libraries(parallel_calculation_demo PRIVATE cru_system)
+
+add_executable(dead_lock_detection_demo DeadLockDetectionDemo.cpp)
diff --git a/works/life/operating-system-experiment/DeadLockDetectionDemo.cpp b/works/life/operating-system-experiment/DeadLockDetectionDemo.cpp
new file mode 100644
index 0000000..b22549e
--- /dev/null
+++ b/works/life/operating-system-experiment/DeadLockDetectionDemo.cpp
@@ -0,0 +1,25 @@
+#include <fstream>
+#include <iostream>
+#include <vector>
+
+int main() {
+  std::vector<int> ns;
+
+  while (!std::cin.eof() || std::cin) {
+    int n;
+    std::cin >> n;
+    ns.push_back(n);
+  }
+
+  if (!std::cin.eof()) {
+    std::cerr << "Failed to parse input.\n";
+    return -1;
+  }
+
+  if (ns.size() % 2 != 0) {
+    std::cerr << "Input integer number must be even.\n";
+    return -1;
+  }
+
+  
+}
diff --git a/works/life/operating-system-experiment/ParallelCalculationDemo.cpp b/works/life/operating-system-experiment/ParallelCalculationDemo.cpp
index 7340da8..0174c55 100644
--- a/works/life/operating-system-experiment/ParallelCalculationDemo.cpp
+++ b/works/life/operating-system-experiment/ParallelCalculationDemo.cpp
@@ -12,9 +12,11 @@ int main(int argc, char **argv) {
     thread_number = std::atoi(argv[1]);
     if (thread_number <= 0) {
       std::cerr << "Argument must be a positive integer.\n";
+      return -1;
     }
   } else {
     std::cerr << "Too many arguments.\n";
+    return -1;
   }
 
   std::cout << "Use " << thread_number << " threads to calculate sum of 1-" << N
diff --git a/works/life/operating-system-experiment/Thread.h b/works/life/operating-system-experiment/Thread.h
index 735407c..4ad1ef4 100644
--- a/works/life/operating-system-experiment/Thread.h
+++ b/works/life/operating-system-experiment/Thread.h
@@ -66,14 +66,6 @@ private:
 #endif
 };
 
-namespace details {
-#ifdef CRU_WINDOWS
-CRU_API DWORD WINAPI ThreadProc(_In_ LPVOID lpParameter);
-#else
-void *ThreadProc(void *data);
-#endif
-} // namespace details
-
 template <typename Fn, typename... Args>
 Thread::Thread(Fn &&process, Args &&...args) {
   std::tuple<std::decay_t<Args>...> a{std::forward<Args>(args)...};
-- 
cgit v1.2.3