passenger 5.3.3 → 5.3.4

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/{task_io_service_operation.hpp → scheduler_operation.hpp}

@@ -1,15 +1,15 @@
 //
-// detail/task_io_service_operation.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// detail/scheduler_operation.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_ASIO_DETAIL_TASK_IO_SERVICE_OPERATION_HPP
-#define BOOST_ASIO_DETAIL_TASK_IO_SERVICE_OPERATION_HPP
+#ifndef BOOST_ASIO_DETAIL_SCHEDULER_OPERATION_HPP
+#define BOOST_ASIO_DETAIL_SCHEDULER_OPERATION_HPP
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 # pragma once
@@ -25,17 +25,19 @@ namespace boost {
 namespace asio {
 namespace detail {
 
-class task_io_service;
+class scheduler;
 
 // Base class for all operations. A function pointer is used instead of virtual
 // functions to avoid the associated overhead.
-class task_io_service_operation BOOST_ASIO_INHERIT_TRACKED_HANDLER
+class scheduler_operation BOOST_ASIO_INHERIT_TRACKED_HANDLER
 {
 public:
-  void complete(task_io_service& owner,
-      const boost::system::error_code& ec, std::size_t bytes_transferred)
+  typedef scheduler_operation operation_type;
+
+  void complete(void* owner, const boost::system::error_code& ec,
+      std::size_t bytes_transferred)
   {
-    func_(&owner, this, ec, bytes_transferred);
+    func_(owner, this, ec, bytes_transferred);
   }
 
   void destroy()
@@ -44,11 +46,11 @@ public:
   }
 
 protected:
-  typedef void (*func_type)(task_io_service*,
-      task_io_service_operation*,
+  typedef void (*func_type)(void*,
+      scheduler_operation*,
       const boost::system::error_code&, std::size_t);
 
-  task_io_service_operation(func_type func)
+  scheduler_operation(func_type func)
     : next_(0),
       func_(func),
       task_result_(0)
@@ -56,16 +58,16 @@ protected:
   }
 
   // Prevents deletion through this type.
-  ~task_io_service_operation()
+  ~scheduler_operation()
   {
   }
 
 private:
   friend class op_queue_access;
-  task_io_service_operation* next_;
+  scheduler_operation* next_;
   func_type func_;
 protected:
-  friend class task_io_service;
+  friend class scheduler;
   unsigned int task_result_; // Passed into bytes transferred.
 };
 
@@ -75,4 +77,4 @@ protected:
 
 #include <boost/asio/detail/pop_options.hpp>
 
-#endif // BOOST_ASIO_DETAIL_TASK_IO_SERVICE_OPERATION_HPP
+#endif // BOOST_ASIO_DETAIL_SCHEDULER_OPERATION_HPP

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/{task_io_service_thread_info.hpp → scheduler_thread_info.hpp}

@@ -1,15 +1,15 @@
 //
-// detail/task_io_service_thread_info.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// detail/scheduler_thread_info.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_ASIO_DETAIL_TASK_IO_SERVICE_THREAD_INFO_HPP
-#define BOOST_ASIO_DETAIL_TASK_IO_SERVICE_THREAD_INFO_HPP
+#ifndef BOOST_ASIO_DETAIL_SCHEDULER_THREAD_INFO_HPP
+#define BOOST_ASIO_DETAIL_SCHEDULER_THREAD_INFO_HPP
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 # pragma once
@@ -24,12 +24,12 @@ namespace boost {
 namespace asio {
 namespace detail {
 
-class task_io_service;
-class task_io_service_operation;
+class scheduler;
+class scheduler_operation;
 
-struct task_io_service_thread_info : public thread_info_base
+struct scheduler_thread_info : public thread_info_base
 {
-  op_queue<task_io_service_operation> private_op_queue;
+  op_queue<scheduler_operation> private_op_queue;
   long private_outstanding_work;
 };
 
@@ -39,4 +39,4 @@ struct task_io_service_thread_info : public thread_info_base
 
 #include <boost/asio/detail/pop_options.hpp>
 
-#endif // BOOST_ASIO_DETAIL_TASK_IO_SERVICE_THREAD_INFO_HPP
+#endif // BOOST_ASIO_DETAIL_SCHEDULER_THREAD_INFO_HPP

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/scoped_lock.hpp

@@ -2,7 +2,7 @@
 // detail/scoped_lock.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/scoped_ptr.hpp

@@ -2,7 +2,7 @@
 // detail/scoped_ptr.hpp
 // ~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -64,6 +64,14 @@ public:
     p_ = p;
   }
 
+  // Release ownership of the pointer.
+  T* release()
+  {
+    T* tmp = p_;
+    p_ = 0;
+    return tmp;
+  }
+
 private:
   // Disallow copying and assignment.
   scoped_ptr(const scoped_ptr&);

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/select_interrupter.hpp

@@ -2,7 +2,7 @@
 // detail/select_interrupter.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/select_reactor.hpp

@@ -2,7 +2,7 @@
 // detail/select_reactor.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -35,7 +35,7 @@
 #include <boost/asio/detail/timer_queue_base.hpp>
 #include <boost/asio/detail/timer_queue_set.hpp>
 #include <boost/asio/detail/wait_op.hpp>
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/execution_context.hpp>
 
 #if defined(BOOST_ASIO_HAS_IOCP)
 # include <boost/asio/detail/thread.hpp>
@@ -48,7 +48,7 @@ namespace asio {
 namespace detail {
 
 class select_reactor
-  : public boost::asio::detail::service_base<select_reactor>
+  : public execution_context_service_base<select_reactor>
 {
 public:
 #if defined(BOOST_ASIO_WINDOWS) || defined(__CYGWIN__)
@@ -65,17 +65,17 @@ public:
   };
 
   // Constructor.
-  BOOST_ASIO_DECL select_reactor(boost::asio::io_service& io_service);
+  BOOST_ASIO_DECL select_reactor(boost::asio::execution_context& ctx);
 
   // Destructor.
   BOOST_ASIO_DECL ~select_reactor();
 
   // Destroy all user-defined handler objects owned by the service.
-  BOOST_ASIO_DECL void shutdown_service();
+  BOOST_ASIO_DECL void shutdown();
 
   // Recreate internal descriptors following a fork.
-  BOOST_ASIO_DECL void fork_service(
-      boost::asio::io_service::fork_event fork_ev);
+  BOOST_ASIO_DECL void notify_fork(
+      boost::asio::execution_context::fork_event fork_ev);
 
   // Initialise the task, but only if the reactor is not in its own thread.
   BOOST_ASIO_DECL void init_task();
@@ -93,7 +93,7 @@ public:
   // Post a reactor operation for immediate completion.
   void post_immediate_completion(reactor_op* op, bool is_continuation)
   {
-    io_service_.post_immediate_completion(op, is_continuation);
+    scheduler_.post_immediate_completion(op, is_continuation);
   }
 
   // Start a new operation. The reactor operation will be performed when the
@@ -107,13 +107,20 @@ public:
   BOOST_ASIO_DECL void cancel_ops(socket_type descriptor, per_descriptor_data&);
 
   // Cancel any operations that are running against the descriptor and remove
-  // its registration from the reactor.
+  // its registration from the reactor. The reactor resources associated with
+  // the descriptor must be released by calling cleanup_descriptor_data.
   BOOST_ASIO_DECL void deregister_descriptor(socket_type descriptor,
       per_descriptor_data&, bool closing);
 
-  // Remote the descriptor's registration from the reactor.
+  // Remove the descriptor's registration from the reactor. The reactor
+  // resources associated with the descriptor must be released by calling
+  // cleanup_descriptor_data.
   BOOST_ASIO_DECL void deregister_internal_descriptor(
-      socket_type descriptor, per_descriptor_data& descriptor_data);
+      socket_type descriptor, per_descriptor_data&);
+
+  // Perform any post-deregistration cleanup tasks associated with the
+  // descriptor data.
+  BOOST_ASIO_DECL void cleanup_descriptor_data(per_descriptor_data&);
 
   // Move descriptor registration from one descriptor_data object to another.
   BOOST_ASIO_DECL void move_descriptor(socket_type descriptor,
@@ -142,8 +149,14 @@ public:
       typename timer_queue<Time_Traits>::per_timer_data& timer,
       std::size_t max_cancelled = (std::numeric_limits<std::size_t>::max)());
 
+  // Move the timer operations associated with the given timer.
+  template <typename Time_Traits>
+  void move_timer(timer_queue<Time_Traits>& queue,
+      typename timer_queue<Time_Traits>::per_timer_data& target,
+      typename timer_queue<Time_Traits>::per_timer_data& source);
+
   // Run select once until interrupted or events are ready to be dispatched.
-  BOOST_ASIO_DECL void run(bool block, op_queue<operation>& ops);
+  BOOST_ASIO_DECL void run(long usec, op_queue<operation>& ops);
 
   // Interrupt the select loop.
   BOOST_ASIO_DECL void interrupt();
@@ -152,9 +165,6 @@ private:
 #if defined(BOOST_ASIO_HAS_IOCP)
   // Run the select loop in the thread.
   BOOST_ASIO_DECL void run_thread();
-
-  // Entry point for the select loop thread.
-  BOOST_ASIO_DECL static void call_run_thread(select_reactor* reactor);
 #endif // defined(BOOST_ASIO_HAS_IOCP)
 
   // Helper function to add a new timer queue.
@@ -164,15 +174,20 @@ private:
   BOOST_ASIO_DECL void do_remove_timer_queue(timer_queue_base& queue);
 
   // Get the timeout value for the select call.
-  BOOST_ASIO_DECL timeval* get_timeout(timeval& tv);
+  BOOST_ASIO_DECL timeval* get_timeout(long usec, timeval& tv);
 
   // Cancel all operations associated with the given descriptor. This function
   // does not acquire the select_reactor's mutex.
   BOOST_ASIO_DECL void cancel_ops_unlocked(socket_type descriptor,
       const boost::system::error_code& ec);
 
-  // The io_service implementation used to post completions.
-  io_service_impl& io_service_;
+  // The scheduler implementation used to post completions.
+# if defined(BOOST_ASIO_HAS_IOCP)
+  typedef class win_iocp_io_context scheduler_type;
+# else // defined(BOOST_ASIO_HAS_IOCP)
+  typedef class scheduler scheduler_type;
+# endif // defined(BOOST_ASIO_HAS_IOCP)
+  scheduler_type& scheduler_;
 
   // Mutex to protect access to internal data.
   boost::asio::detail::mutex mutex_;
@@ -190,6 +205,10 @@ private:
   timer_queue_set timer_queues_;
 
 #if defined(BOOST_ASIO_HAS_IOCP)
+  // Helper class to run the reactor loop in a thread.
+  class thread_function;
+  friend class thread_function;
+
   // Does the reactor loop thread need to stop.
   bool stop_thread_;
 

data/src/cxx_supportlib/vendor-modified/boost/asio/detail/service_registry.hpp

@@ -2,7 +2,7 @@
 // detail/service_registry.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -19,12 +19,16 @@
 #include <typeinfo>
 #include <boost/asio/detail/mutex.hpp>
 #include <boost/asio/detail/noncopyable.hpp>
-#include <boost/asio/io_service.hpp>
+#include <boost/asio/detail/type_traits.hpp>
+#include <boost/asio/execution_context.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
+
+class io_context;
+
 namespace detail {
 
 template <typename T>
@@ -34,27 +38,34 @@ class service_registry
   : private noncopyable
 {
 public:
-  // Constructor. Adds the initial service.
-  template <typename Service, typename Arg>
-  service_registry(boost::asio::io_service& o,
-      Service* initial_service, Arg arg);
+  // Constructor.
+  BOOST_ASIO_DECL service_registry(execution_context& owner);
 
   // Destructor.
   BOOST_ASIO_DECL ~service_registry();
 
+  // Shutdown all services.
+  BOOST_ASIO_DECL void shutdown_services();
+
+  // Destroy all services.
+  BOOST_ASIO_DECL void destroy_services();
+
   // Notify all services of a fork event.
-  BOOST_ASIO_DECL void notify_fork(boost::asio::io_service::fork_event fork_ev);
+  BOOST_ASIO_DECL void notify_fork(execution_context::fork_event fork_ev);
 
-  // Get the first service object cast to the specified type. Called during
-  // io_service construction and so performs no locking or type checking.
+  // Get the service object corresponding to the specified service type. Will
+  // create a new service object automatically if no such object already
+  // exists. Ownership of the service object is not transferred to the caller.
   template <typename Service>
-  Service& first_service();
+  Service& use_service();
 
   // Get the service object corresponding to the specified service type. Will
   // create a new service object automatically if no such object already
   // exists. Ownership of the service object is not transferred to the caller.
+  // This overload is used for backwards compatibility with services that
+  // inherit from io_context::service.
   template <typename Service>
-  Service& use_service();
+  Service& use_service(io_context& owner);
 
   // Add a service object. Throws on error, in which case ownership of the
   // object is retained by the caller.
@@ -66,70 +77,79 @@ public:
   bool has_service() const;
 
 private:
+  // Initalise a service's key when the key_type typedef is not available.
+  template <typename Service>
+  static void init_key(execution_context::service::key& key, ...);
+
+#if !defined(BOOST_ASIO_NO_TYPEID)
+  // Initalise a service's key when the key_type typedef is available.
+  template <typename Service>
+  static void init_key(execution_context::service::key& key,
+      typename enable_if<
+        is_base_of<typename Service::key_type, Service>::value>::type*);
+#endif // !defined(BOOST_ASIO_NO_TYPEID)
+
   // Initialise a service's key based on its id.
-  BOOST_ASIO_DECL static void init_key(
-      boost::asio::io_service::service::key& key,
-      const boost::asio::io_service::id& id);
+  BOOST_ASIO_DECL static void init_key_from_id(
+      execution_context::service::key& key,
+      const execution_context::id& id);
 
 #if !defined(BOOST_ASIO_NO_TYPEID)
   // Initialise a service's key based on its id.
   template <typename Service>
-  static void init_key(boost::asio::io_service::service::key& key,
-      const boost::asio::detail::service_id<Service>& /*id*/);
+  static void init_key_from_id(execution_context::service::key& key,
+      const service_id<Service>& /*id*/);
 #endif // !defined(BOOST_ASIO_NO_TYPEID)
 
   // Check if a service matches the given id.
   BOOST_ASIO_DECL static bool keys_match(
-      const boost::asio::io_service::service::key& key1,
-      const boost::asio::io_service::service::key& key2);
+      const execution_context::service::key& key1,
+      const execution_context::service::key& key2);
 
   // The type of a factory function used for creating a service instance.
-  typedef boost::asio::io_service::service*
-    (*factory_type)(boost::asio::io_service&);
+  typedef execution_context::service*(*factory_type)(void*);
 
   // Factory function for creating a service instance.
-  template <typename Service>
-  static boost::asio::io_service::service* create(
-      boost::asio::io_service& owner);
+  template <typename Service, typename Owner>
+  static execution_context::service* create(void* owner);
 
   // Destroy a service instance.
-  BOOST_ASIO_DECL static void destroy(
-      boost::asio::io_service::service* service);
+  BOOST_ASIO_DECL static void destroy(execution_context::service* service);
 
   // Helper class to manage service pointers.
   struct auto_service_ptr;
   friend struct auto_service_ptr;
   struct auto_service_ptr
   {
-    boost::asio::io_service::service* ptr_;
+    execution_context::service* ptr_;
     ~auto_service_ptr() { destroy(ptr_); }
   };
 
   // Get the service object corresponding to the specified service key. Will
   // create a new service object automatically if no such object already
   // exists. Ownership of the service object is not transferred to the caller.
-  BOOST_ASIO_DECL boost::asio::io_service::service* do_use_service(
-      const boost::asio::io_service::service::key& key,
-      factory_type factory);
+  BOOST_ASIO_DECL execution_context::service* do_use_service(
+      const execution_context::service::key& key,
+      factory_type factory, void* owner);
 
   // Add a service object. Throws on error, in which case ownership of the
   // object is retained by the caller.
   BOOST_ASIO_DECL void do_add_service(
-      const boost::asio::io_service::service::key& key,
-      boost::asio::io_service::service* new_service);
+      const execution_context::service::key& key,
+      execution_context::service* new_service);
 
   // Check whether a service object with the specified key already exists.
   BOOST_ASIO_DECL bool do_has_service(
-      const boost::asio::io_service::service::key& key) const;
+      const execution_context::service::key& key) const;
 
   // Mutex to protect access to internal data.
   mutable boost::asio::detail::mutex mutex_;
 
   // The owner of this service registry and the services it contains.
-  boost::asio::io_service& owner_;
+  execution_context& owner_;
 
   // The first service in the list of contained services.
-  boost::asio::io_service::service* first_service_;
+  execution_context::service* first_service_;
 };
 
 } // namespace detail