Changeset 5ab9df4 in mainline

Timestamp:

2019-07-02T14:19:24Z (6 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

4dfb259

Parents:

72786f38

Message:

cpp: make sure exceptions are stored when we set value at thread exit too

Location:

uspace/lib/cpp/include/__bits/thread

Files:

• packaged_task.hpp (modified) (1 diff)
• promise.hpp (modified) (3 diffs)

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

@@ -191 +191 @@
                 {
                     state_->set_value(invoke(func_, args...), false);
+                    aux::set_state_value_at_thread_exit(this->state_);
                 }
                 catch(const exception& __exception)
                 {
                     state_->set_exception(make_exception_ptr(__exception), false);
-                }
-
-                aux::set_state_value_at_thread_exit(state_);
+                    aux::set_state_exception_at_thread_exit(this->state_);
+                }
             }
 

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

@@ -225 +225 @@
                 }
 
-                this->state_->set_value(val, false);
-                aux::set_state_value_at_thread_exit(state_);
+                try
+                {
+                    state_->set_value(invoke(func_, args...), false);
+                    aux::set_state_value_at_thread_exit(this->state_);
+                }
+                catch(const exception& __exception)
+                {
+                    state_->set_exception(make_exception_ptr(__exception), false);
+                    aux::set_state_exception_at_thread_exit(this->state_);
+                }
             }
 
@@ -240 +248 @@
                 }
 
-                this->state_->set_value(forward<R>(val), false);
-                aux::set_state_value_at_thread_exit(state_);
+                try
+                {
+                    state_->set_value(invoke(func_, args...), false);
+                    aux::set_state_value_at_thread_exit(this->state_);
+                }
+                catch(const exception& __exception)
+                {
+                    state_->set_exception(make_exception_ptr(__exception), false);
+                    aux::set_state_exception_at_thread_exit(this->state_);
+                }
             }
     };
@@ -311 +327 @@
                 }
 
-                this->state_->set_value(&val, false);
-                aux::set_state_value_at_thread_exit(state_);
+                try
+                {
+                    state_->set_value(invoke(func_, args...), false);
+                    aux::set_state_value_at_thread_exit(this->state_);
+                }
+                catch(const exception& __exception)
+                {
+                    state_->set_exception(make_exception_ptr(__exception), false);
+                    aux::set_state_exception_at_thread_exit(this->state_);
+                }
             }
     };