Changeset 857d4cc 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:

a97b838

Parents:

befead8

git-author:

Dzejrou <dzejrou@…> (2018-03-29 12:04:13)

git-committer:

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

Message:

cpp: added recursive_timed_mutex

File:

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

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

@@ -84 +84 @@
 
             void lock();
-            bool try_lock();
+            bool try_lock() noexcept;
             void unlock();
 
@@ -141 +141 @@
      */
 
-    // TODO: implement
-    class recursive_timed_mutex;
+    class recursive_timed_mutex
+    {
+        public:
+            recursive_timed_mutex() noexcept
+                : mtx_{}, lock_level_{}, owner_{}
+            {
+                aux::threading::mutex::init(mtx_);
+            }
+
+            ~recursive_timed_mutex();
+
+            recursive_timed_mutex(const recursive_timed_mutex&) = delete;
+            recursive_timed_mutex& operator=(const recursive_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)
+            {
+                if (owner_ == this_thread::get_id())
+                    return true;
+
+                auto time = aux::threading::time::convert(rel_time);
+                auto ret = aux::threading::mutex::try_lock_for(time);
+
+                if (ret)
+                    ++lock_level_;
+                return ret;
+            }
+
+            template<class Clock, class Duration>
+            bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time)
+            {
+                if (owner_ == this_thread::get_id())
+                    return true;
+
+                auto dur = (abs_time - Clock::now());
+                auto time = aux::threading::time::convert(dur);
+                auto ret = aux::threading::mutex::try_lock_for(time);
+
+                if (ret)
+                    ++lock_level_;
+                return ret;
+            }
+
+            using native_handle_type = aux::mutex_t*;
+            native_handle_type native_handle();
+
+        private:
+            aux::mutex_t mtx_;
+            size_t lock_level_;
+            thread::id owner_;
+    };
 
     struct defer_lock_t