Changeset 5ea9dd2 in mainline

Timestamp:

2019-07-02T11:17:14Z (5 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

5d71d09

Parents:

09170ab8

Message:

cpp: add allocator support

Location:

uspace/lib/cpp/include/__bits/thread

Files:

• packaged_task.hpp (modified) (2 diffs)
• promise.hpp (modified) (5 diffs)

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

@@ -32 +32 @@
 #include <__bits/exception.hpp>
 #include <__bits/functional/function.hpp>
+#include <__bits/memory/allocator_traits.hpp>
 #include <__bits/thread/future.hpp>
 #include <__bits/thread/future_common.hpp>
@@ -74 +75 @@
             >
             explicit packaged_task(allocator_arg_t, const Allocator& a, F&& f)
-                : packaged_task{forward<F>(f)}
-            {
-                // TODO: use the allocator
+                : func_{forward<F>(f)}, state_{}
+            {
+                auto rebound = allocator_traits<Allocator>::rebind<
+                    aux::shared_state<R>
+                >{a};
+
+                state_ = rebound.allocate(1);
+                rebound.construct(state_);
             }
 

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

@@ -31 +31 @@
 
 #include <__bits/exception.hpp>
+#include <__bits/memory/allocator_traits.hpp>
 #include <__bits/thread/future.hpp>
 #include <__bits/thread/shared_state.hpp>
@@ -54 +55 @@
                 template<class Allocator>
                 promise_base(allocator_arg_t, const Allocator& a)
-                    : promise_base{}
-                {
-                    // TODO: Use the allocator.
+                    : state_{}
+                {
+                    auto rebound = allocator_traits<Allocator>::rebind<
+                        aux::shared_state<R>
+                    >{a};
+
+                    state_ = rebound.allocate(1);
+                    rebound.construct(state_);
                 }
 
@@ -148 +154 @@
 
             template<class Allocator>
-            promise(allocator_arg_t, const Allocator& a)
-                : aux::promise_base<R>{}
-            {
-                // TODO: Use the allocator.
-            }
+            promise(allocator_arg_t tag, const Allocator& a)
+                : aux::promise_base<R>{tag, a}
+            { /* DUMMY BODY */ }
 
             promise(promise&& rhs) noexcept
@@ -250 +254 @@
 
             template<class Allocator>
-            promise(allocator_arg_t, const Allocator& a)
-                : aux::promise_base<R*>{}
-            {
-                // TODO: Use the allocator.
-            }
+            promise(allocator_arg_t tag, const Allocator& a)
+                : aux::promise_base<R*>{tag, a}
+            { /* DUMMY BODY */ }
 
             promise(promise&& rhs) noexcept
@@ -323 +325 @@
 
             template<class Allocator>
-            promise(allocator_arg_t, const Allocator& a)
-                : aux::promise_base<void>{}
-            {
-                // TODO: Use the allocator.
-            }
+            promise(allocator_arg_t tag, const Allocator& a)
+                : aux::promise_base<void>{tag, a}
+            { /* DUMMY BODY */ }
 
             promise(promise&& rhs) noexcept