Changeset 69e5838 in mainline

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:

55aa951

Parents:

4bea22a

git-author:

Dzejrou <dzejrou@…> (2018-03-28 20:40:27)

git-committer:

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

Message:

cpp: added timed_mutex

File:

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

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

@@ -72 +72 @@
     {
         public:
-            constexpr recursive_mutex() noexcept;
+            constexpr recursive_mutex() noexcept
+                : mtx_{}, lock_level_{}, owner_{}
+            {
+                aux::threading::mutex::init(mtx_);
+            }
+
             ~recursive_mutex();
 
@@ -95 +100 @@
      */
 
-    // TODO: implement
-    class timed_mutex;
+    class timed_mutex
+    {
+        public:
+            timed_mutex() noexcept;
+            ~timed_mutex();
+
+            timed_mutex(const timed_mutex&) = delete;
+            timed_mutex& operator=(const timed_mutex&) = delete;
+
+            void lock();
+            bool try_lock();
+            void unlock();
+
+            template<class Rep, class Period>
+            bool try_lock_for(const chrono::duration<Rep, Period>& rel_time)
+            {
+                auto time = aux::threading::time::convert(rel_time);
+
+                return aux::threading::mutex::try_lock_for(time);
+            }
+
+            template<class Clock, class Duration>
+            bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time)
+            {
+                auto dur = (abs_time - Clock::now());
+                auto time = aux::threading::time::convert(dur);
+
+                return aux::threading::mutex::try_lock_for(time);
+            }
+
+            using native_handle_type = aux::mutex_t*;
+            native_handle_type native_handle();
+
+        private:
+            aux::mutex_t mtx_;
+    };
 
     /**