Changeset 8e24583 in mainline for uspace/lib/cpp/include/__bits/thread

Timestamp:

2019-07-03T16:59:49Z (6 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

46c66f8

Parents:

96fec16

Message:

cpp: write tests for <future> and fix minor bugs they found

Location:

uspace/lib/cpp/include/__bits/thread

Files:

• future.hpp (modified) (3 diffs)
• packaged_task.hpp (modified) (1 diff)
• promise.hpp (modified) (2 diffs)
• shared_future.hpp (modified) (1 diff)
• shared_state.hpp (modified) (6 diffs)

uspace/lib/cpp/include/__bits/thread/future.hpp

@@ -101 +101 @@
                     state_ = move(rhs.state_);
                     rhs.state_ = nullptr;
+
+                    return *this;
                 }
 
@@ -183 +185 @@
 
             future(future&& rhs) noexcept
-                : aux::future_base<aux::future_inner_t<R>>{move(rhs.state_)}
+                : aux::future_base<aux::future_inner_t<R>>{move(rhs)}
             { /* DUMMY BODY */ }
 
@@ -220 +222 @@
                 }
             }
+
+            /**
+             * Useful for testing as we can check some information
+             * otherwise unavailable to us without waiting, e.g.
+             * to check whether the state is ready, its reference
+             * count etc.
+             */
+            aux::shared_state<aux::future_inner_t<R>>* __state() noexcept
+            {
+                return this->state_;
+            }
     };
 }

uspace/lib/cpp/include/__bits/thread/packaged_task.hpp

@@ -127 +127 @@
                 func_ = move(rhs.func_);
                 state_ = move(rhs.state_);
+                rhs.state_ = nullptr;
 
                 return *this;

uspace/lib/cpp/include/__bits/thread/promise.hpp

@@ -109 +109 @@
                 }
 
+                /**
+                 * Useful for testing as we can check some information
+                 * otherwise unavailable to us without waiting, e.g.
+                 * to check whether the state is ready, its reference
+                 * count etc.
+                 */
+                aux::shared_state<R>* __state()
+                {
+                    return state_;
+                }
+
             protected:
                 void abandon_state_()
@@ -250 +261 @@
                 try
                 {
-                    this->state_->set_value(forward(val), false);
+                    this->state_->set_value(forward<R>(val), false);
                     aux::set_state_value_at_thread_exit(this->state_);
                 }

uspace/lib/cpp/include/__bits/thread/shared_future.hpp

@@ -96 +96 @@
                 }
             }
+
+            /**
+             * Useful for testing as we can check some information
+             * otherwise unavailable to us without waiting, e.g.
+             * to check whether the state is ready, its reference
+             * count etc.
+             */
+            aux::shared_state<aux::future_inner_t<R>>* __state() noexcept
+            {
+                return this->state_;
+            }
     };
 }

uspace/lib/cpp/include/__bits/thread/shared_state.hpp

@@ -115 +115 @@
             wait_for(const chrono::duration<Rep, Period>& rel_time)
             {
+                if (value_set_)
+                    return future_status::ready;
+
                 aux::threading::mutex::lock(mutex_);
                 auto res = timed_wait_(
@@ -128 +131 @@
             wait_until(const chrono::time_point<Clock, Duration>& abs_time)
             {
+                if (value_set_)
+                    return future_status::ready;
+
                 aux::threading::mutex::lock(mutex_);
                 auto res = timed_wait_(
@@ -189 +195 @@
                 aux::threading::mutex::unlock(mutex_);
 
-                aux::threading::condvar::broadcast(condvar_);
+                if (set)
+                    aux::threading::condvar::broadcast(condvar_);
             }
 
@@ -199 +206 @@
                 aux::threading::mutex::unlock(mutex_);
 
-                aux::threading::condvar::broadcast(condvar_);
+                if (set)
+                    aux::threading::condvar::broadcast(condvar_);
             }
 
@@ -293 +301 @@
 
         protected:
-            future_status timed_wait_(aux::time_unit_t) override
+            future_status timed_wait_(aux::time_unit_t time) override
             {
                 /**
@@ -299 +307 @@
                  *       behaviour should be compliant.
                  */
-                return future_status::timeout;
+                aux::threading::time::sleep(time);
+                if (this->value_set_)
+                    return future_status::ready;
+                else
+                    return future_status::timeout;
             }