Changeset 9283830 in mainline for uspace/lib/cpp/src

Timestamp:

2018-07-05T21:41:20Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7e7c1aac

Parents:

c4049e6

git-author:

Dzejrou <dzejrou@…> (2018-03-28 14:21:53)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:20)

Message:

cpp: added a threading middle layer

Location:

uspace/lib/cpp/src

Files:

• mutex.cpp (modified) (5 diffs)
• thread.cpp (modified) (7 diffs)

uspace/lib/cpp/src/mutex.cpp

@@ -31 +31 @@
 namespace std
 {
-    constexpr mutex::mutex() noexcept
-        : mtx_{}
-    {
-        fibril_mutex_initialize(&mtx_);
-    }
-
     mutex::~mutex()
-    {
-        if (fibril_mutex_is_locked(&mtx_))
-        {
-            /**
-             * According to the standard, this is
-             * undefined behavior, we could unlock the
-             * mutex, but that could cause issues if we
-             * are not the current owner.
-             */
-            // fibril_mutex_unlock(&mtx_);
-        }
-    }
+    { /* DUMMY BODY */ }
 
     void mutex::lock()
     {
-        fibril_mutex_lock(&mtx_);
+        aux::threading::mutex::lock(mtx_);
     }
 
     bool mutex::try_lock()
     {
-        return fibril_mutex_trylock(&mtx_);
+        return aux::threading::mutex::try_lock(mtx_);
     }
 
     void mutex::unlock()
     {
-        fibril_mutex_unlock(&mtx_);
+        aux::threading::mutex::unlock(mtx_);
     }
 
@@ -74 +57 @@
         : mtx_{}, lock_level_{}, owner_{}
     {
-        fibril_mutex_initialize(&mtx_);
+        aux::threading::mutex::init(mtx_);
     }
 
@@ -84 +67 @@
         if (owner_ != this_thread::get_id())
         {
-            fibril_mutex_lock(&mtx_);
+            aux::threading::mutex::lock(mtx_);
             owner_ = this_thread::get_id();
             lock_level_ = 1;
@@ -96 +79 @@
         if (owner_ != this_thread::get_id())
         {
-            bool res = fibril_mutex_trylock(&mtx_);
+            bool res = aux::threading::mutex::try_lock(mtx_);
             if (res)
             {
@@ -116 +99 @@
             return;
         else if (--lock_level_ == 0)
-            fibril_mutex_unlock(&mtx_);
+            aux::threading::mutex::unlock(mtx_);
     }
 

uspace/lib/cpp/src/thread.cpp

@@ -28 +28 @@
 
 #include <cstdlib>
+#include <exception>
 #include <thread>
 #include <utility>
+
+#include <iostream>
 
 namespace std
@@ -39 +42 @@
     thread::~thread()
     {
-        if (joinable())
-        {
-            // TODO: call std::terminate
-        }
+        // TODO: investigate joinable() in detail
+        //       + std::terminate behaves weirdly on HelenOS
+        if (joinable() && false)
+            std::terminate();
 
+        // TODO: check for finished too?
+        // TODO: WAIT! if it's not detached, then
+        //       we are joinable and std::terminate was called?
+        // TODO: review this entire thing
         if (joinable_wrapper_ && !joinable_wrapper_->detached())
             delete joinable_wrapper_;
@@ -49 +56 @@
 
     thread::thread(thread&& other) noexcept
-        : id_{other.id_}
+        : id_{other.id_}, joinable_wrapper_{other.joinable_wrapper_}
     {
-        other.id_ = fid_t{};
+        other.id_ = aux::thread_t{};
+        other.joinable_wrapper_ = nullptr;
     }
 
@@ -57 +65 @@
     {
         if (joinable())
-        {
-            // TODO: call std::terminate
-        }
+            std::terminate();
 
         id_ = other.id_;
-        other.id_ = fid_t{};
+        other.id_ = aux::thread_t{};
+
+        joinable_wrapper_ = other.joinable_wrapper_;
+        other.joinable_wrapper_ = nullptr;
 
         return *this;
@@ -70 +79 @@
     {
         std::swap(id_, other.id_);
+        std::swap(joinable_wrapper_, other.joinable_wrapper_);
     }
 
     bool thread::joinable() const noexcept
     {
-        return id_ != fid_t{};
+        return id_ != aux::thread_t{};
     }
 
@@ -85 +95 @@
     void thread::detach()
     {
-        id_ = fid_t{};
+        id_ = aux::thread_t{};
 
         if (joinable_wrapper_)
@@ -124 +134 @@
         thread::id get_id() noexcept
         {
-            return thread::id{fibril_get_id()};
+            return thread::id{aux::threading::thread::this_thread()};
         }
 
         void yield() noexcept
         {
-            fibril_yield();
+            aux::threading::thread::yield();
         }
     }