update boost on linux
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
// detail/impl/kqueue_reactor.ipp
|
||||
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
//
|
||||
// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
|
||||
// Copyright (c) 2003-2019 Christopher M. Kohlhoff (chris at kohlhoff dot com)
|
||||
// Copyright (c) 2005 Stefan Arentz (stefan at soze dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
@@ -21,6 +21,7 @@
|
||||
#if defined(BOOST_ASIO_HAS_KQUEUE)
|
||||
|
||||
#include <boost/asio/detail/kqueue_reactor.hpp>
|
||||
#include <boost/asio/detail/scheduler.hpp>
|
||||
#include <boost/asio/detail/throw_error.hpp>
|
||||
#include <boost/asio/error.hpp>
|
||||
|
||||
@@ -39,13 +40,15 @@ namespace boost {
|
||||
namespace asio {
|
||||
namespace detail {
|
||||
|
||||
kqueue_reactor::kqueue_reactor(boost::asio::io_service& io_service)
|
||||
: boost::asio::detail::service_base<kqueue_reactor>(io_service),
|
||||
io_service_(use_service<io_service_impl>(io_service)),
|
||||
mutex_(),
|
||||
kqueue_reactor::kqueue_reactor(boost::asio::execution_context& ctx)
|
||||
: execution_context_service_base<kqueue_reactor>(ctx),
|
||||
scheduler_(use_service<scheduler>(ctx)),
|
||||
mutex_(BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
|
||||
REACTOR_REGISTRATION, scheduler_.concurrency_hint())),
|
||||
kqueue_fd_(do_kqueue_create()),
|
||||
interrupter_(),
|
||||
shutdown_(false)
|
||||
shutdown_(false),
|
||||
registered_descriptors_mutex_(mutex_.enabled())
|
||||
{
|
||||
struct kevent events[1];
|
||||
BOOST_ASIO_KQUEUE_EV_SET(&events[0], interrupter_.read_descriptor(),
|
||||
@@ -63,7 +66,7 @@ kqueue_reactor::~kqueue_reactor()
|
||||
close(kqueue_fd_);
|
||||
}
|
||||
|
||||
void kqueue_reactor::shutdown_service()
|
||||
void kqueue_reactor::shutdown()
|
||||
{
|
||||
mutex::scoped_lock lock(mutex_);
|
||||
shutdown_ = true;
|
||||
@@ -81,12 +84,13 @@ void kqueue_reactor::shutdown_service()
|
||||
|
||||
timer_queues_.get_all_timers(ops);
|
||||
|
||||
io_service_.abandon_operations(ops);
|
||||
scheduler_.abandon_operations(ops);
|
||||
}
|
||||
|
||||
void kqueue_reactor::fork_service(boost::asio::io_service::fork_event fork_ev)
|
||||
void kqueue_reactor::notify_fork(
|
||||
boost::asio::execution_context::fork_event fork_ev)
|
||||
{
|
||||
if (fork_ev == boost::asio::io_service::fork_child)
|
||||
if (fork_ev == boost::asio::execution_context::fork_child)
|
||||
{
|
||||
// The kqueue descriptor is automatically closed in the child.
|
||||
kqueue_fd_ = -1;
|
||||
@@ -128,7 +132,7 @@ void kqueue_reactor::fork_service(boost::asio::io_service::fork_event fork_ev)
|
||||
|
||||
void kqueue_reactor::init_task()
|
||||
{
|
||||
io_service_.init_task();
|
||||
scheduler_.init_task();
|
||||
}
|
||||
|
||||
int kqueue_reactor::register_descriptor(socket_type descriptor,
|
||||
@@ -136,6 +140,10 @@ int kqueue_reactor::register_descriptor(socket_type descriptor,
|
||||
{
|
||||
descriptor_data = allocate_descriptor_state();
|
||||
|
||||
BOOST_ASIO_HANDLER_REACTOR_REGISTRATION((
|
||||
context(), static_cast<uintmax_t>(descriptor),
|
||||
reinterpret_cast<uintmax_t>(descriptor_data)));
|
||||
|
||||
mutex::scoped_lock lock(descriptor_data->mutex_);
|
||||
|
||||
descriptor_data->descriptor_ = descriptor;
|
||||
@@ -151,6 +159,10 @@ int kqueue_reactor::register_internal_descriptor(
|
||||
{
|
||||
descriptor_data = allocate_descriptor_state();
|
||||
|
||||
BOOST_ASIO_HANDLER_REACTOR_REGISTRATION((
|
||||
context(), static_cast<uintmax_t>(descriptor),
|
||||
reinterpret_cast<uintmax_t>(descriptor_data)));
|
||||
|
||||
mutex::scoped_lock lock(descriptor_data->mutex_);
|
||||
|
||||
descriptor_data->descriptor_ = descriptor;
|
||||
@@ -205,7 +217,7 @@ void kqueue_reactor::start_op(int op_type, socket_type descriptor,
|
||||
if (op->perform())
|
||||
{
|
||||
descriptor_lock.unlock();
|
||||
io_service_.post_immediate_completion(op, is_continuation);
|
||||
scheduler_.post_immediate_completion(op, is_continuation);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -224,7 +236,7 @@ void kqueue_reactor::start_op(int op_type, socket_type descriptor,
|
||||
{
|
||||
op->ec_ = boost::system::error_code(errno,
|
||||
boost::asio::error::get_system_category());
|
||||
io_service_.post_immediate_completion(op, is_continuation);
|
||||
scheduler_.post_immediate_completion(op, is_continuation);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -244,7 +256,7 @@ void kqueue_reactor::start_op(int op_type, socket_type descriptor,
|
||||
}
|
||||
|
||||
descriptor_data->op_queue_[op_type].push(op);
|
||||
io_service_.work_started();
|
||||
scheduler_.work_started();
|
||||
}
|
||||
|
||||
void kqueue_reactor::cancel_ops(socket_type,
|
||||
@@ -268,7 +280,7 @@ void kqueue_reactor::cancel_ops(socket_type,
|
||||
|
||||
descriptor_lock.unlock();
|
||||
|
||||
io_service_.post_deferred_completions(ops);
|
||||
scheduler_.post_deferred_completions(ops);
|
||||
}
|
||||
|
||||
void kqueue_reactor::deregister_descriptor(socket_type descriptor,
|
||||
@@ -312,10 +324,20 @@ void kqueue_reactor::deregister_descriptor(socket_type descriptor,
|
||||
|
||||
descriptor_lock.unlock();
|
||||
|
||||
free_descriptor_state(descriptor_data);
|
||||
descriptor_data = 0;
|
||||
BOOST_ASIO_HANDLER_REACTOR_DEREGISTRATION((
|
||||
context(), static_cast<uintmax_t>(descriptor),
|
||||
reinterpret_cast<uintmax_t>(descriptor_data)));
|
||||
|
||||
io_service_.post_deferred_completions(ops);
|
||||
scheduler_.post_deferred_completions(ops);
|
||||
|
||||
// Leave descriptor_data set so that it will be freed by the subsequent
|
||||
// call to cleanup_descriptor_data.
|
||||
}
|
||||
else
|
||||
{
|
||||
// We are shutting down, so prevent cleanup_descriptor_data from freeing
|
||||
// the descriptor_data object and let the destructor free it instead.
|
||||
descriptor_data = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -345,18 +367,38 @@ void kqueue_reactor::deregister_internal_descriptor(socket_type descriptor,
|
||||
|
||||
descriptor_lock.unlock();
|
||||
|
||||
BOOST_ASIO_HANDLER_REACTOR_DEREGISTRATION((
|
||||
context(), static_cast<uintmax_t>(descriptor),
|
||||
reinterpret_cast<uintmax_t>(descriptor_data)));
|
||||
|
||||
// Leave descriptor_data set so that it will be freed by the subsequent
|
||||
// call to cleanup_descriptor_data.
|
||||
}
|
||||
else
|
||||
{
|
||||
// We are shutting down, so prevent cleanup_descriptor_data from freeing
|
||||
// the descriptor_data object and let the destructor free it instead.
|
||||
descriptor_data = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void kqueue_reactor::cleanup_descriptor_data(
|
||||
per_descriptor_data& descriptor_data)
|
||||
{
|
||||
if (descriptor_data)
|
||||
{
|
||||
free_descriptor_state(descriptor_data);
|
||||
descriptor_data = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void kqueue_reactor::run(bool block, op_queue<operation>& ops)
|
||||
void kqueue_reactor::run(long usec, op_queue<operation>& ops)
|
||||
{
|
||||
mutex::scoped_lock lock(mutex_);
|
||||
|
||||
// Determine how long to block while waiting for events.
|
||||
timespec timeout_buf = { 0, 0 };
|
||||
timespec* timeout = block ? get_timeout(timeout_buf) : &timeout_buf;
|
||||
timespec* timeout = usec ? get_timeout(usec, timeout_buf) : &timeout_buf;
|
||||
|
||||
lock.unlock();
|
||||
|
||||
@@ -364,6 +406,31 @@ void kqueue_reactor::run(bool block, op_queue<operation>& ops)
|
||||
struct kevent events[128];
|
||||
int num_events = kevent(kqueue_fd_, 0, 0, events, 128, timeout);
|
||||
|
||||
#if defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
|
||||
// Trace the waiting events.
|
||||
for (int i = 0; i < num_events; ++i)
|
||||
{
|
||||
void* ptr = reinterpret_cast<void*>(events[i].udata);
|
||||
if (ptr != &interrupter_)
|
||||
{
|
||||
unsigned event_mask = 0;
|
||||
switch (events[i].filter)
|
||||
{
|
||||
case EVFILT_READ:
|
||||
event_mask |= BOOST_ASIO_HANDLER_REACTOR_READ_EVENT;
|
||||
break;
|
||||
case EVFILT_WRITE:
|
||||
event_mask |= BOOST_ASIO_HANDLER_REACTOR_WRITE_EVENT;
|
||||
break;
|
||||
}
|
||||
if ((events[i].flags & (EV_ERROR | EV_OOBAND)) != 0)
|
||||
event_mask |= BOOST_ASIO_HANDLER_REACTOR_ERROR_EVENT;
|
||||
BOOST_ASIO_HANDLER_REACTOR_EVENTS((context(),
|
||||
reinterpret_cast<uintmax_t>(ptr), event_mask));
|
||||
}
|
||||
}
|
||||
#endif // defined(BOOST_ASIO_ENABLE_HANDLER_TRACKING)
|
||||
|
||||
// Dispatch the waiting events.
|
||||
for (int i = 0; i < num_events; ++i)
|
||||
{
|
||||
@@ -454,7 +521,8 @@ int kqueue_reactor::do_kqueue_create()
|
||||
kqueue_reactor::descriptor_state* kqueue_reactor::allocate_descriptor_state()
|
||||
{
|
||||
mutex::scoped_lock descriptors_lock(registered_descriptors_mutex_);
|
||||
return registered_descriptors_.alloc();
|
||||
return registered_descriptors_.alloc(BOOST_ASIO_CONCURRENCY_HINT_IS_LOCKING(
|
||||
REACTOR_IO, scheduler_.concurrency_hint()));
|
||||
}
|
||||
|
||||
void kqueue_reactor::free_descriptor_state(kqueue_reactor::descriptor_state* s)
|
||||
@@ -475,11 +543,13 @@ void kqueue_reactor::do_remove_timer_queue(timer_queue_base& queue)
|
||||
timer_queues_.erase(&queue);
|
||||
}
|
||||
|
||||
timespec* kqueue_reactor::get_timeout(timespec& ts)
|
||||
timespec* kqueue_reactor::get_timeout(long usec, timespec& ts)
|
||||
{
|
||||
// By default we will wait no longer than 5 minutes. This will ensure that
|
||||
// any changes to the system clock are detected after no longer than this.
|
||||
long usec = timer_queues_.wait_duration_usec(5 * 60 * 1000 * 1000);
|
||||
const long max_usec = 5 * 60 * 1000 * 1000;
|
||||
usec = timer_queues_.wait_duration_usec(
|
||||
(usec < 0 || max_usec < usec) ? max_usec : usec);
|
||||
ts.tv_sec = usec / 1000000;
|
||||
ts.tv_nsec = (usec % 1000000) * 1000;
|
||||
return &ts;
|
||||
|
||||
Reference in New Issue
Block a user