Changeset 771d162 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

da6bcc0

Parents:

4e484b5

git-author:

Dzejrou <dzejrou@…> (2018-03-29 15:25:36)

git-committer:

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

Message:

cpp: changed mutex destructor to default to allow it to be placed in once_flag, implemented call_once

Location:

uspace/lib/cpp

Files:

• include/impl/mutex.hpp (modified) (3 diffs)
• src/mutex.cpp (modified) (1 diff)

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

@@ -30 +30 @@
 #define LIBCPP_MUTEX
 
+#include <functional>
 #include <internal/common.hpp>
 #include <internal/thread.hpp>
@@ -49 +50 @@
             }
 
-            ~mutex();
+            ~mutex() = default;
 
             mutex(const mutex&) = delete;
@@ -712 +713 @@
     struct once_flag
     {
-        constexpr once_flag() noexcept;
+        constexpr once_flag() noexcept
+            : called_{false}, mtx_{}
+        { /* DUMMY BODY */ }
 
         once_flag(const once_flag&) = delete;
         once_flag& operator=(const once_flag&) = delete;
+
+        private:
+            bool called_;
+            mutex mtx_;
+
+            template<class Callable, class... Args>
+            friend void call_once(once_flag&, Callable&&, Args&&...);
     };
 
     template<class Callable, class... Args>
-    void call_once(once_flag& flag, Callable&& func, Args&&... args);
+    void call_once(once_flag& flag, Callable&& func, Args&&... args)
+    {
+        flag.mtx_.lock();
+        if (!flag.called_)
+        {
+            // TODO: exception handling
+
+            aux::invoke(forward<Callable>(func), forward<Args>(args)...);
+            flag.called_ = true;
+        }
+        flag.mtx_.unlock();
+    }
 }
 

uspace/lib/cpp/src/mutex.cpp

@@ -31 +31 @@
 namespace std
 {
-    mutex::~mutex()
-    { /* DUMMY BODY */ }
-
     void mutex::lock()
     {