Changeset 9283830 in mainline for uspace/lib/cpp/include/impl

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:

7e7c1aac

Parents:

c4049e6

git-author:

Dzejrou <dzejrou@…> (2018-03-28 14:21:53)

git-committer:

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

Message:

cpp: added a threading middle layer

Location:

uspace/lib/cpp/include/impl

Files:

• mutex.hpp (modified) (4 diffs)
• ratio.hpp (modified) (1 diff)
• thread.hpp (modified) (9 diffs)

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

@@ -31 +31 @@
 
 #include <internal/common.hpp>
+#include <internal/thread.hpp>
 #include <thread>
 
 namespace std
 {
-    extern "C" {
-        #include <fibril.h>
-        #include <fibril_synch.h>
-    }
-
     /**
      * 20.4.1.2.1, class mutex:
@@ -47 +43 @@
     {
         public:
-            constexpr mutex() noexcept;
+            constexpr mutex() noexcept
+                : mtx_{}
+            {
+                aux::threading::mutex::init(mtx_);
+            }
+
             ~mutex();
 
@@ -57 +58 @@
             void unlock();
 
-            using native_handle_type = fibril_mutex_t*;
+            using native_handle_type = aux::mutex_t*;
             native_handle_type native_handle();
 
         private:
-            native_handle_type mtx_;
+            aux::mutex_t mtx_;
     };
 
@@ -81 +82 @@
             void unlock();
 
-            using native_handle_type = fibril_mutex_t*;
+            using native_handle_type = aux::mutex_t*;
             native_handle_type native_handle();
 
         private:
-            native_handle_type mtx_;
+            aux::mutex_t mtx_;
             size_t lock_level_;
             thread::id owner_;

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

@@ -89 +89 @@
     {
         public:
-            static_assert(D != 0, "ratio with denominator == 0");
+            /* static_assert(D != 0, "ratio with denominator == 0"); */
 
             static constexpr intmax_t num = aux::sign_v<N> * aux::sign_v<D>

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

@@ -32 +32 @@
 #include <chrono>
 #include <internal/common.hpp>
+#include <internal/thread.hpp>
 #include <ostream>
 
 namespace std
 {
-    extern "C" {
-        #include <fibril.h>
-        #include <fibril_synch.h>
-    }
-
     namespace aux
     {
@@ -59 +55 @@
                       finished_{false}, detached_{false}
                 {
-                    fibril_mutex_initialize(&join_mtx_);
-                    fibril_condvar_initialize(&join_cv_);
+                    aux::threading::mutex::init(join_mtx_);
+                    aux::threading::condvar::init(join_cv_);
                 }
 
                 void join()
                 {
-                    fibril_mutex_lock(&join_mtx_);
+                    aux::threading::mutex::lock(join_mtx_);
                     while (!finished_)
-                        fibril_condvar_wait(&join_cv_, &join_mtx_);
-                    fibril_mutex_unlock(&join_mtx_);
+                        aux::threading::condvar::wait(join_cv_, join_mtx_);
+                    aux::threading::mutex::unlock(join_mtx_);
                 }
 
@@ -87 +83 @@
 
             protected:
-                fibril_mutex_t join_mtx_;
-                fibril_condvar_t join_cv_;
+                aux::mutex_t join_mtx_;
+                aux::condvar_t join_cv_;
                 bool finished_;
                 bool detached_;
@@ -105 +101 @@
                     callable_();
 
-                    fibril_mutex_lock(&join_mtx_);
+                    aux::threading::mutex::lock(join_mtx_);
                     finished_ = true;
-                    fibril_mutex_unlock(&join_mtx_);
-
-                    fibril_condvar_broadcast(&join_cv_);
+                    aux::threading::mutex::unlock(join_mtx_);
+
+                    aux::threading::condvar::broadcast(join_cv_);
                 }
 
@@ -126 +122 @@
             class id;
 
-            using native_handle_type = fibril_t*;
+            using native_handle_type = aux::thread_t*;
 
             /**
@@ -150 +146 @@
                 joinable_wrapper_ = static_cast<aux::joinable_wrapper*>(callable_wrapper);
 
-                id_ = fibril_create(
-                        aux::thread_main<decltype(callable_wrapper)>,
-                        static_cast<void*>(callable_wrapper)
+                id_ = aux::threading::thread::create(
+                    aux::thread_main<decltype(callable_wrapper)>,
+                    *callable_wrapper
                 );
-                fibril_add_ready(id_);
+
+                aux::threading::thread::start(id_);
+                // TODO: fibrils are weird here, 2 returns with same thread ids
             }
 
@@ -182 +180 @@
 
         private:
-            fid_t id_;
+            aux::thread_t id_;
             aux::joinable_wrapper* joinable_wrapper_{nullptr};
 
@@ -223 +221 @@
         {
             auto now = Clock::now();
-            auto usecs = chrono::duration_cast<chrono::duration<typename Duration::rep, micro>>(abs_time - now);
-
-            fibril_usleep(usecs.count());
+
+            auto time = aux::threading::time::convert(abs_time - now);
+            aux::threading::time::sleep(time);
         }
 
@@ -235 +233 @@
 
             // TODO: timeouts?
-            auto usecs = chrono::duration_cast<chrono::duration<Rep, micro>>(rel_time);
-            fibril_usleep(usecs.count());
+            auto time = aux::threading::time::convert(rel_time);
+            aux::threading::time::sleep(time);
         }
     }