Changeset 9283830 in mainline for uspace/lib/cpp/include/impl/mutex.hpp

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

File:

• uspace/lib/cpp/include/impl/mutex.hpp (modified) (4 diffs)

uspace/lib/cpp/include/impl/mutex.hpp

@@ -31 +31 @@
 
 #include <internal/common.hpp>
+#include <internal/thread.hpp>
 #include <thread>
 
 namespace std
 {
-    extern "C" {
-        #include <fibril.h>
-        #include <fibril_synch.h>
-    }
-
     /**
      * 20.4.1.2.1, class mutex:
@@ -47 +43 @@
     {
         public:
-            constexpr mutex() noexcept;
+            constexpr mutex() noexcept
+                : mtx_{}
+            {
+                aux::threading::mutex::init(mtx_);
+            }
+
             ~mutex();
 
@@ -57 +58 @@
             void unlock();
 
-            using native_handle_type = fibril_mutex_t*;
+            using native_handle_type = aux::mutex_t*;
             native_handle_type native_handle();
 
         private:
-            native_handle_type mtx_;
+            aux::mutex_t mtx_;
     };
 
@@ -81 +82 @@
             void unlock();
 
-            using native_handle_type = fibril_mutex_t*;
+            using native_handle_type = aux::mutex_t*;
             native_handle_type native_handle();
 
         private:
-            native_handle_type mtx_;
+            aux::mutex_t mtx_;
             size_t lock_level_;
             thread::id owner_;