Replace 3.39.8 with new release 3.39.9

Small changes since 3.39.7

Author: halx99

.appveyor.yml

@@ -1,7 +1,7 @@
 image:
   - Visual Studio 2013
 
-version: 3.39.8.{build}
+version: 3.39.9.{build}
 
 environment:
     global:

CHANGELOG.md

@@ -1,4 +1,4 @@
-yasio-3.39.8
+yasio-3.39.9
 
   1. Remove unsafe option: `YOPT_S_FORWARD_EVENT`,  may cause internal channel behavior incorrect.
   2. Add forward packet event support, new option: `YOPT_S_FORWARD_PACKET`,  after enable forward packet: 
@@ -8,6 +8,8 @@ yasio-3.39.8
       - No deferred packet
       - No GC alloc
   3. Fix `sort_timers` may cause `std::sort` crash on sort callback when system clock slow  
+  4. Fix typo `YASIO_ENABLE_PASSIVE_EVENT`
+  5. Fix timer queue empty check
 
 yasio-3.39.7
 

yasio.pc

@@ -5,6 +5,6 @@ includedir=${exec_prefix}/include
 
 Name: yasio
 Description:  A multi-platform support c++11 library with focus on asio (asynchronous socket I/O) for any client application. 
-Version: 3.39.8
+Version: 3.39.9
 Libs: -L${libdir} 
 Cflags: -I${includedir}/yasio

yasio/detail/config.hpp

@@ -198,7 +198,7 @@ SOFTWARE.
 /*
 **  The yasio version macros
 */
-#define YASIO_VERSION_NUM 0x033908
+#define YASIO_VERSION_NUM 0x033909
 
 /*
 ** The macros used by io_service.

yasio/yasio.cpp

@@ -187,15 +187,10 @@ static yasio__global_state& yasio__shared_globals(const print_fn2_t& prt = nullp
 void highp_timer::async_wait(io_service& service, timer_cb_t cb) { service.schedule_timer(this, std::move(cb)); }
 void highp_timer::cancel(io_service& service)
 {
-  if (!expired(service))
+  if (!expired())
     service.remove_timer(this);
 }
 
-std::chrono::microseconds highp_timer::wait_duration(io_service& service) const
-{
-  return std::chrono::duration_cast<std::chrono::microseconds>(this->expire_time_ - service.time_);
-}
-
 /// io_send_op
 int io_send_op::perform(io_transport* transport, const void* buf, int n, int& error) { return transport->write_cb_(buf, n, nullptr, error); }
 
@@ -894,12 +889,10 @@ void io_service::run()
   // The core event loop
   fd_set_adapter fd_set; // The temp file descriptor set
 
-  // Init time for 1st loop
-  update_time();
-
   do
   {
-    fd_set                = this->fd_set_;
+    fd_set = this->fd_set_;
+
     const auto waitd_usec = get_timeout(this->wait_duration_); // Gets current wait duration
 #if defined(YASIO_HAVE_CARES)
     /**
@@ -940,8 +933,6 @@ void io_service::run()
       }
     }
 
-    update_time();
-
 #if defined(YASIO_HAVE_CARES)
     // process events for name resolution.
     do_ares_process_fds(ares_socks, ares_nfds, fd_set);
@@ -1653,7 +1644,7 @@ bool io_service::do_read(transport_handle_t transport, fd_set_adapter& fd_set)
     int n      = transport->do_read(revent, error, this->wait_duration_);
     if (n >= 0)
     {
-      if (!options_.forward_event_ && !options_.forward_packet_)
+      if (!options_.forward_packet_)
       {
         YASIO_KLOGV("[index: %d] do_read status ok, bytes transferred: %d, buffer used: %d", transport->cindex(), n, n + transport->offset_);
         if (transport->expected_size_ == -1)
@@ -1800,7 +1791,7 @@ void io_service::process_timers()
   while (!this->timer_queue_.empty())
   {
     auto timer_ctl = timer_queue_.back().first;
-    if (timer_ctl->expired(*this))
+    if (timer_ctl->expired())
     {
       // fetch timer
       auto timer_impl = std::move(timer_queue_.back());
@@ -1830,7 +1821,7 @@ highp_time_t io_service::get_timeout(highp_time_t usec)
   if (!this->timer_queue_.empty())
   {
     // microseconds
-    auto duration = timer_queue_.back().first->wait_duration(*this);
+    auto duration = timer_queue_.back().first->wait_duration();
     if (std::chrono::microseconds(usec) > duration)
       usec = duration.count();
   }

yasio/yasio.hpp

@@ -174,7 +174,6 @@ enum
   //  b. IPv6 addresses with ports require square brackets [fe80::1%lo0]:53
   YOPT_S_DNS_LIST,
 
-
   // Set ssl server cert and private key file
   // params:
   //   crtfile: const char*
@@ -400,10 +399,10 @@ class YASIO_API highp_timer {
   void expires_from_now(const std::chrono::microseconds& duration)
   {
     this->duration_    = duration;
-    this->expire_time_ = yasio::steady_clock_t::now() + this->duration_;
+    this->expire_time_ = steady_clock_t::now() + this->duration_;
   }
 
-  void expires_from_now() { this->expire_time_ = yasio::steady_clock_t::now() + this->duration_; }
+  void expires_from_now() { this->expire_time_ = steady_clock_t::now() + this->duration_; }
 
   // Wait timer timeout once.
   void async_wait_once(io_service& service, timerv_cb_t cb)
@@ -428,13 +427,17 @@ class YASIO_API highp_timer {
   YASIO__DECL void cancel(io_service& service);
 
   // Check if timer is expired?
-  bool expired(io_service& service) const { return this->wait_duration(service).count() <= 0; }
+  bool expired() const { return wait_duration().count() <= 0; }
 
   // Gets wait duration of timer.
-  YASIO__DECL std::chrono::microseconds wait_duration(io_service& service) const;
+  std::chrono::microseconds wait_duration() const { return this->wait_duration(steady_clock_t::now()); }
+  std::chrono::microseconds wait_duration(const std::chrono::time_point<steady_clock_t>& now_time) const
+  {
+    return std::chrono::duration_cast<std::chrono::microseconds>(this->expire_time_ - now_time);
+  }
 
-  std::chrono::microseconds duration_                         = {};
-  std::chrono::time_point<yasio::steady_clock_t> expire_time_ = {};
+  std::chrono::microseconds duration_                  = {};
+  std::chrono::time_point<steady_clock_t> expire_time_ = {};
 };
 
 struct YASIO_API io_base {
@@ -1058,8 +1061,11 @@ class YASIO_API io_service // lgtm [cpp/class-many-fields]
   }
   void sort_timers()
   {
-    std::sort(this->timer_queue_.begin(), this->timer_queue_.end(),
-              [](const timer_impl_t& lhs, const timer_impl_t& rhs) { return lhs.first->expire_time_ > rhs.first->expire_time_; });
+    // Must ensure time now stable, otherwise will cause std::sort pass invalid iterator to sort callback
+    const auto now_time = steady_clock_t::now();
+    std::sort(this->timer_queue_.begin(), this->timer_queue_.end(), [&now_time](const timer_impl_t& lhs, const timer_impl_t& rhs) {
+      return lhs.first->wait_duration(now_time) > rhs.first->wait_duration(now_time);
+    });
   }
 
   // Start a async domain name query
@@ -1128,7 +1134,7 @@ class YASIO_API io_service // lgtm [cpp/class-many-fields]
   inline void fire_event(_Types&&... args)
   {
     auto event = cxx14::make_unique<io_event>(std::forward<_Types>(args)...);
-    if (options_.deferred_event_ && !options_.forward_event_)
+    if (options_.deferred_event_)
     {
       if (options_.on_defer_event_ && !options_.on_defer_event_(event))
         return;
@@ -1169,16 +1175,11 @@ class YASIO_API io_service // lgtm [cpp/class-many-fields]
   /* For log macro only */
   inline const print_fn2_t& __get_cprint() const { return options_.print_; }
 
-  void update_time() { this->time_ = yasio::steady_clock_t::now(); }
-
 private:
   state state_ = state::UNINITIALIZED; // The service state
   std::thread worker_;
   std::thread::id worker_id_;
 
-  /* The current time according to the event loop. in msecs. */
-  std::chrono::time_point<yasio::steady_clock_t> time_;
-
   privacy::concurrent_queue<event_ptr, true> events_;
 
   std::vector<io_channel*> channels_;
@@ -1213,7 +1214,6 @@ class YASIO_API io_service // lgtm [cpp/class-many-fields]
     bool deferred_event_ = true;
     defer_event_cb_t on_defer_event_;
 
-    bool forward_event_  = false; // since v3.39.7
     bool forward_packet_ = false; // since v3.39.8
 
     // tcp keepalive settings