Changeset 857d4cc in mainline for uspace/lib/cpp/src/mutex.cpp

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:

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/src/mutex.cpp (modified) (2 diffs)

uspace/lib/cpp/src/mutex.cpp

@@ -69 +69 @@
     }
 
-    bool recursive_mutex::try_lock()
+    bool recursive_mutex::try_lock() noexcept
     {
         if (owner_ != this_thread::get_id())
@@ -129 +129 @@
         return &mtx_;
     }
+
+    recursive_timed_mutex::~recursive_timed_mutex()
+    { /* DUMMY BODY */ }
+
+    void recursive_timed_mutex::lock()
+    {
+        if (owner_ != this_thread::get_id())
+        {
+            aux::threading::mutex::lock(mtx_);
+            owner_ = this_thread::get_id();
+            lock_level_ = 1;
+        }
+        else
+            ++lock_level_;
+    }
+
+    bool recursive_timed_mutex::try_lock()
+    {
+        if (owner_ != this_thread::get_id())
+        {
+            bool res = aux::threading::mutex::try_lock(mtx_);
+            if (res)
+            {
+                owner_ = this_thread::get_id();
+                lock_level_ = 1;
+            }
+
+            return res;
+        }
+        else
+            ++lock_level_;
+
+        return true;
+    }
+
+    void recursive_timed_mutex::unlock()
+    {
+        if (owner_ != this_thread::get_id())
+            return;
+        else if (--lock_level_ == 0)
+            aux::threading::mutex::unlock(mtx_);
+    }
+
+    recursive_timed_mutex::native_handle_type recursive_timed_mutex::native_handle()
+    {
+        return &mtx_;
+    }
 }