Changeset d350175 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:

2be40c81

Parents:

da6bcc0

git-author:

Dzejrou <dzejrou@…> (2018-03-29 16:04:53)

git-committer:

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

Message:

cpp: added shared_timed_mutex

Location:

uspace/lib/cpp

Files:

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

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

@@ -202 +202 @@
      */
 
-    // TODO: implement
-    class shared_timed_mutex;
+    class shared_timed_mutex
+    {
+        public:
+            shared_timed_mutex() noexcept;
+            ~shared_timed_mutex();
+
+            shared_timed_mutex(const shared_timed_mutex&) = delete;
+            shared_timed_mutex& operator=(const shared_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::shared_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::shared_mutex::try_lock_for(time);
+            }
+
+            void lock_shared();
+            bool try_lock_shared();
+            void unlock_shared();
+
+            template<class Rep, class Period>
+            bool try_lock_shared_for(const chrono::duration<Rep, Period>& rel_time)
+            {
+                auto time = aux::threading::time::convert(rel_time);
+
+                return aux::threading::shared_mutex::try_lock_shared_for(time);
+            }
+
+            template<class Clock, class Duration>
+            bool try_lock_shared_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::shared_mutex::try_lock_shared_for(time);
+            }
+
+            using native_handle_type = aux::shared_mutex_t*;
+            native_handle_type native_handle();
+
+        private:
+            aux::shared_mutex_t mtx_;
+    };
 
     struct defer_lock_t

uspace/lib/cpp/src/mutex.cpp

@@ -173 +173 @@
         return &mtx_;
     }
+
+    shared_timed_mutex::shared_timed_mutex() noexcept
+        : mtx_{}
+    {
+        aux::threading::shared_mutex::init(mtx_);
+    }
+
+    shared_timed_mutex::~shared_timed_mutex()
+    { /* DUMMY BODY */ }
+
+    void shared_timed_mutex::lock()
+    {
+        aux::threading::shared_mutex::lock(mtx_);
+    }
+
+    bool shared_timed_mutex::try_lock()
+    {
+        return aux::threading::shared_mutex::try_lock(mtx_);
+    }
+
+    void shared_timed_mutex::unlock()
+    {
+        aux::threading::shared_mutex::unlock(mtx_);
+    }
+
+    void shared_timed_mutex::lock_shared()
+    {
+        aux::threading::shared_mutex::lock_shared(mtx_);
+    }
+
+    bool shared_timed_mutex::try_lock_shared()
+    {
+        return aux::threading::shared_mutex::try_lock_shared(mtx_);
+    }
+
+    void shared_timed_mutex::unlock_shared()
+    {
+        aux::threading::shared_mutex::unlock_shared(mtx_);
+    }
+
+    shared_timed_mutex::native_handle_type shared_timed_mutex::native_handle()
+    {
+        return &mtx_;
+    }
 }