Changeset 48d9187 in mainline for uspace/lib/cpp/src/thread.cpp

Timestamp:

2018-07-05T21:41:19Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

1df0165

Parents:

ee51635

git-author:

Dzejrou <dzejrou@…> (2018-03-01 22:20:05)

git-committer:

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

Message:

cpp: added generic joinable threads

File:

• uspace/lib/cpp/src/thread.cpp (modified) (3 diffs)

uspace/lib/cpp/src/thread.cpp

@@ -42 +42 @@
         if (joinable())
         {
+            if (joinable_wrapper_)
+            {
+                joinable_wrapper_->join();
+                delete joinable_wrapper_;
+            }
+
             // TODO: this crashes :(
             /* fibril_teardown((fibril_t*)id_, false); */
@@ -69 +75 @@
     bool thread::joinable() const noexcept
     {
-        return get_id() != id{};
+        return id_ != fid_t{};
     }
 
     void thread::join()
     {
-        // TODO:
+        if (joinable_wrapper_)
+        {
+            printf("JOINING\n");
+            joinable_wrapper_->join();
+            printf("JOIN ENDED\n");
+        }
     }
 
@@ -80 +91 @@
     {
         id_ = fid_t{};
+
+        if (joinable_wrapper_)
+        {
+            joinable_wrapper_->detach();
+            joinable_wrapper_ = nullptr;
+        }
     }