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

d350175

Parents:

771d162

git-author:

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

git-committer:

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

Message:

cpp: added shared_mutex into the fibril threading wrapper

File:

• uspace/lib/cpp/include/internal/thread.hpp (modified) (3 diffs)

uspace/lib/cpp/include/internal/thread.hpp

@@ -54 +54 @@
     struct threading_policy<fibril_tag>
     {
-        using mutex_type   = fibril_mutex_t;
-        using thread_type  = fid_t;
-        using condvar_type = fibril_condvar_t;
-        using time_unit    = suseconds_t;
+        using mutex_type        = fibril_mutex_t;
+        using thread_type       = fid_t;
+        using condvar_type      = fibril_condvar_t;
+        using time_unit         = suseconds_t;
+        using shared_mutex_type = fibril_rwlock_t;
 
         struct thread
@@ -159 +160 @@
             }
         };
+
+        struct shared_mutex
+        {
+            static void init(shared_mutex_type& mtx)
+            {
+                fibril_rwlock_initialize(&mtx);
+            }
+
+            static void lock(shared_mutex_type& mtx)
+            {
+                fibril_rwlock_write_lock(&mtx);
+            }
+
+            static void unlock(shared_mutex_type& mtx)
+            {
+                fibril_rwlock_write_unlock(&mtx);
+            }
+
+            static void lock_shared(shared_mutex_type& mtx)
+            {
+                fibril_rwlock_read_lock(&mtx);
+            }
+
+            static void unlock_shared(shared_mutex_type& mtx)
+            {
+                fibril_rwlock_read_unlock(&mtx);
+            }
+
+            static bool try_lock(shared_mutex_type& mtx)
+            {
+                // TODO: rwlocks don't have try locking capabilities
+                lock(mtx);
+
+                return true;
+            }
+
+            static bool try_lock_shared(shared_mutex_type& mtx)
+            {
+                lock(mtx);
+
+                return true;
+            }
+
+            static bool try_lock_for(shared_mutex_type& mtx, time_unit timeout)
+            {
+                return try_lock(mtx);
+            }
+
+            static bool try_lock_shared_for(shared_mutex_type& mtx, time_unit timeout)
+            {
+                return try_lock(mtx);
+            }
+        };
     };
 
@@ -170 +224 @@
     using threading = threading_policy<default_tag>;
 
-    using thread_t    = typename threading::thread_type;
-    using mutex_t     = typename threading::mutex_type;
-    using condvar_t   = typename threading::condvar_type;
-    using time_unit_t = typename threading::time_unit;
+    using thread_t       = typename threading::thread_type;
+    using mutex_t        = typename threading::mutex_type;
+    using condvar_t      = typename threading::condvar_type;
+    using time_unit_t    = typename threading::time_unit;
+    using shared_mutex_t = typename threading::shared_mutex_type;
 }