Changeset 063e0626 in mainline

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:

a75f3e49

Parents:

4fe4ea6

git-author:

Dzejrou <dzejrou@…> (2018-03-02 19:55:30)

git-committer:

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

Message:

cpp: fixed thread lifetime management as per standard

Location:

uspace/lib/cpp

Files:

• include/impl/thread.hpp (modified) (2 diffs)
• src/thread.cpp (modified) (3 diffs)

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

@@ -34 +34 @@
 #include <ostream>
 
+extern "C" {
+    #include <fibril.h>
+    #include <fibril_synch.h>
+}
+
 namespace std
 {
-    extern "C" {
-        #include <fibril.h>
-        #include <fibril_synch.h>
-    }
-
     namespace aux
     {
@@ -200 +200 @@
             (*callable)();
 
-            if (callable->detached()) // No thread owns the wrapper.
+            if (callable->detached())
                 delete callable;
 

uspace/lib/cpp/src/thread.cpp

@@ -39 +39 @@
     thread::~thread()
     {
-        // TODO: Change this to std::terminate when implemented.
         if (joinable())
         {
-            if (joinable_wrapper_ && !joinable_wrapper_->detached())
-            {
-                joinable_wrapper_->join();
-                delete joinable_wrapper_;
-            }
+            // TODO: call std::terminate
+        }
 
-            // TODO: this crashes :(
-            /* fibril_teardown((fibril_t*)id_, false); */
-            /* std::abort(); */
-        }
+        if (joinable_wrapper_ && !joinable_wrapper_->detached())
+            delete joinable_wrapper_;
     }
 
@@ -62 +56 @@
     thread& thread::operator=(thread&& other) noexcept
     {
+        if (joinable())
+        {
+            // TODO: call std::terminate
+        }
+
         id_ = other.id_;
         other.id_ = fid_t{};
@@ -80 +79 @@
     void thread::join()
     {
-        if (joinable_wrapper_)
+        if (joinable() && joinable_wrapper_)
             joinable_wrapper_->join();
     }