boost/fiber
2
0
Fork 0
mirror of https://github.com/boostorg/fiber.git synced 2026-02-20 14:42:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80 from nat-goodspeed/hopless

Browse Source 
Remove 'yield_hop' and the whole allow_hop_ mechanism.
This commit is contained in:
Oliver Kowalke
2016-04-06 19:03:13 +02:00
parent f724e43105 9b3559dd49
commit 918f450027
4 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/callbacks.qbk
View File

@@ -184,7 +184,7 @@ and `future` for two reasons:
`boost::fibers::asio::yield` is a completion token of this kind. `yield` is an
instance of `yield_t`:
[fibers_asio_yield]
[fibers_asio_yield_t]
`yield_t` is in fact only a placeholder, a way to trigger Boost.Asio
customization. It can bind a
@@ -195,7 +195,7 @@ for use by the actual handler.
In fact there are two canonical instances of `yield_t` [mdash] `yield` and
`yield_hop`:
[fibers_asio_yield_and_hop]
[fibers_asio_yield]
We'll get to the differences between these shortly.

18
examples/asio/autoecho.cpp
View File

@@ -236,19 +236,19 @@ int main( int argc, char* argv[]) {
// server
boost::fibers::fiber f(
server, boost::ref( io_svc) );
// client
const unsigned iterations = 20;
const unsigned clients = 3;
boost::fibers::barrier barrier(clients);
for (unsigned c = 0; c < clients; ++c) {
boost::fibers::fiber(
client, boost::ref( io_svc), boost::ref( barrier),
iterations ).detach();
}
// run io_service in two threads
std::thread t([&io_svc](){
boost::fibers::use_scheduling_algorithm< boost::fibers::asio::round_robin >( io_svc);
print( "Thread ", thread_names.lookup(), ": started");
// client
const unsigned iterations = 20;
const unsigned clients = 3;
boost::fibers::barrier barrier(clients);
for (unsigned c = 0; c < clients; ++c) {
boost::fibers::fiber(
client, boost::ref( io_svc), boost::ref( barrier),
iterations ).detach();
}
io_svc.run();
print( "Thread ", thread_names.lookup(), ": stopping");
});

14
examples/asio/detail/yield.hpp
View File

@@ -87,18 +87,10 @@ public:
* yt_.ec_ = ec;
// If ctx_ is still active, e.g. because the async operation
// immediately called its callback (this method!) before the asio
// async function called async_result_base::get(), we must neither
// migrate it nor set it ready.
// async function called async_result_base::get(), we must not set it
// ready.
if ( fibers::context::active() != ctx_ ) {
// Are we permitted to wake up the suspended fiber on this thread, the
// thread that called the completion handler?
if ( ( ! ctx_->is_context( fibers::type::pinned_context) ) && yt_.allow_hop_) {
// We must not migrate a pinned_context to another thread. If this
// isn't a pinned_context, and the application passed yield_hop
// rather than yield, migrate this fiber to the running thread.
fibers::context::active()->migrate( ctx_);
}
// either way, wake the fiber
// wake the fiber
fibers::context::active()->set_ready( ctx_);
}
}

17
examples/asio/yield.hpp
View File

@@ -18,12 +18,10 @@ namespace boost {
namespace fibers {
namespace asio {
//[fibers_asio_yield
//[fibers_asio_yield_t
class yield_t {
public:
yield_t( bool hop) :
allow_hop_( hop) {
}
yield_t() = default;
/**
* @code
@@ -46,17 +44,12 @@ public:
//private:
// ptr to bound error_code instance if any
boost::system::error_code * ec_{ nullptr };
// allow calling fiber to "hop" to another thread if it could resume more
// quickly that way
bool allow_hop_;
};
//]
//[fibers_asio_yield_and_hop
// canonical instance with allow_hop_ == false
thread_local yield_t yield{ false };
// canonical instance with allow_hop_ == true
thread_local yield_t yield_hop{ true };
//[fibers_asio_yield
// canonical instance
thread_local yield_t yield{};
//]
}}}