Changeset 4d68584 in mainline

Timestamp:

2019-07-02T10:59:39Z (5 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

09170ab8

Parents:

239d25b

Message:

cpp: add stub exception support

Location:

uspace/lib/cpp/include/__bits/thread

Files:

• packaged_task.hpp (modified) (3 diffs)
• promise.hpp (modified) (3 diffs)
• shared_state.hpp (modified) (4 diffs)

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

@@ -30 +30 @@
 #define LIBCPP_BITS_THREAD_PACKAGED_TASK
 
+#include <__bits/exception.hpp>
 #include <__bits/functional/function.hpp>
 #include <__bits/thread/future.hpp>
@@ -84 +85 @@
                     if (!state_->is_set())
                     {
-                        // TODO: store future_error
+                        state_->set_exception(make_exception_ptr(
+                            future_error{make_error_code(future_errc::broken_promise)}
+                        ));
                         state_->mark_set(true);
                     }
@@ -162 +165 @@
                     state_->set_value(invoke(func_, args...));
                 }
-                catch(...)
-                {
-                    // TODO: store it
+                catch(const exception& __exception)
+                {
+                    state_->set_exception(make_exception_ptr(__exception));
                 }
             }

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

@@ -30 +30 @@
 #define LIBCPP_BITS_THREAD_PROMISE
 
+#include <__bits/exception.hpp>
 #include <__bits/thread/future.hpp>
 #include <__bits/thread/shared_state.hpp>
@@ -94 +95 @@
                 }
 
-                void set_exception_at_thread_exit(exception_ptr)
-                {
-                    // TODO: No exception handling, no-op at this time.
+                void set_exception_at_thread_exit(exception_ptr ptr)
+                {
+                    assert(state_);
+
+                    state_->set_exception_ptr(ptr, false);
+                    // TODO: Mark it as 'has_exception' when thread terminates.
                 }
 
@@ -117 +121 @@
                     if (!state_->is_set())
                     {
-                        // TODO: Store future_error.
+                        state_->set_exception(make_exception_ptr(
+                            future_error{make_error_code(future_errc::broken_promise)}
+                        ));
                         state_->mark_set(true);
                     }

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

@@ -76 +76 @@
             }
 
-            void set_exception(exception_ptr ptr)
+            void set_exception(exception_ptr ptr, bool set = true)
             {
                 exception_ = ptr;
-                has_exception_ = true;
+                has_exception_ = set;
             }
 
@@ -89 +89 @@
             void throw_stored_exception() const
             {
-                // TODO: implement
+                if (has_exception_)
+                    rethrow_exception(exception_);
             }
 
@@ -266 +267 @@
                             }
                         }
-                        catch(...) // TODO: Any exception.
+                        catch(const exception& __exception)
                         {
-                            // TODO: Store it.
+                            this->set_exception(make_exception_ptr(__exception));
                         }
                     }
@@ -351 +352 @@
                     }
                 }
-                catch(...)
+                catch(const exception& __exception)
                 {
-                    // TODO: Store it.
+                    this->set_exception(make_exception_ptr(__exception));
                 }
             }