MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-29 04:08:54 +02:00
Code Issues Releases Wiki Activity

ircd::ctx: Eliminate the shared_ptr in pool::async; minor cleanup.

Browse source
This commit is contained in:
Jason Volk 2018-01-18 06:01:49 -08:00
parent 90ea730a04
commit 78b77f9da8
2 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ircd/ctx/async.h
View file

@ -38,7 +38,7 @@ namespace ircd::ctx
future<typename std::result_of<F (A...)>::type>>::type; future<typename std::result_of<F (A...)>::type>>::type;
template<size_t stack_size = DEFAULT_STACK_SIZE, template<size_t stack_size = DEFAULT_STACK_SIZE,
context::flags flags = (context::flags)0, context::flags flags = context::flags(0),
class F, class F,
class... A> class... A>
future_value<F, A...> async(F&& f, A&&... a); future_value<F, A...> async(F&& f, A&&... a);

26
include/ircd/ctx/pool.h
View file

@ -90,18 +90,15 @@ ircd::ctx::pool::async(F&& f,
std::bind(std::forward<F>(f), std::forward<A>(a)...) std::bind(std::forward<F>(f), std::forward<A>(a)...)
}; };
auto p promise<R> p;
{ future<R> ret{p};
std::make_shared<promise<R>>() (*this)([p(std::move(p)), func(std::move(func))]
};
(*this)([p, func(std::move(func))]
() -> void () -> void
{ {
p->set_value(func()); p.set_value(func());
}); });
return future<R>(*p); return ret;
} }
template<class F, template<class F,
@ -117,17 +114,14 @@ ircd::ctx::pool::async(F&& f,
std::bind(std::forward<F>(f), std::forward<A>(a)...) std::bind(std::forward<F>(f), std::forward<A>(a)...)
}; };
auto p promise<R> p;
{ future<R> ret{p};
std::make_shared<promise<R>>() (*this)([p(std::move(p)), func(std::move(func))]
};
(*this)([p, func(std::move(func))]
() -> void () -> void
{ {
func(); func();
p->set_value(); p.set_value();
}); });
return future<R>(*p); return ret;
} }