Sync v3.22.1 finally finally (#116)

* Update README.md

* Optimize sources.

* Rename io_service's member transports_dypool_ to transports_pool_

* Tidy sources.

* Update description.

* Fix compile issues for HEADER ONLY support.

* Fix compile issues with YASIO_HAVE_KCP for HEADER ONLY support.

* Sync kcptest.cpp

* Remove unused definations

* Optimize includes for YASIO_HEADER_ONLY

Use inline namespace avoid conflicit on Apple platform.

Author: halx99

README.md

@@ -1,6 +1,6 @@
 # yasio - *Y*et *A*nother *S*ocket *IO* service
 [![Build Status](https://travis-ci.org/halx99/yasio.svg?branch=master)](https://travis-ci.org/halx99/yasio)
-[![Release](https://img.shields.io/badge/release-v3.22.0-blue.svg)](https://github.com/halx99/yasio/releases)
+[![Release](https://img.shields.io/badge/release-v3.22.1-blue.svg)](https://github.com/halx99/yasio/releases)
 [![996.icu](https://img.shields.io/badge/link-996.icu-red.svg)](https://996.icu)
 [![LICENSE](https://img.shields.io/badge/license-Anti%20996-blue.svg)](https://github.com/halx99/yasio/blob/master/LICENSE)
 [![GitHub stars](https://img.shields.io/github/stars/halx99/yasio.svg?label=Stars)](https://github.com/halx99/yasio)

msvc/cpptest/kcptest.cpp

@@ -2,17 +2,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(YASIO_IOCP)
-#  include "yasio/experimental/yasio_iocp.h"
-#elif defined(YASIO_POLL)
-#  include "yasio/experimental/yasio_poll.h"
-#elif defined(YASIO_EPOLL)
-#  include "yasio/experimental/yasio_epoll.h"
-#else
-#  include "yasio/yasio.h"
-#endif
-#include "yasio/ibstream.h"
-#include "yasio/obstream.h"
+#include "yasio/yasio.hpp"
+#include "yasio/ibstream.hpp"
+#include "yasio/obstream.hpp"
 
 #if defined(_WIN32)
 #  include <Shlwapi.h>

version.md

@@ -1,5 +1,3 @@
-yasio-3.22.0
-1. Add kcp support.
-2. Change obsteeam.pop behavoir, see: https://github.com/halx99/yasio/wiki/obstream#Encapsulate-Packet
-3. Remove unused send timeout.
-4. Remove duplicated macro YOPT_CONNECT_TIMEOUT for script bindings.
+yasio-3.22.1
+1. Add -DYASIO_HEADER_ONLY to enable core(c++) implemention header only support.
+2. Other code optimizing.

yasio/detail/config.hpp

@@ -29,14 +29,21 @@ SOFTWARE.
 #ifndef YASIO__CONFIG_HPP
 #define YASIO__CONFIG_HPP
 
-// Uncomment or add -DYASIO__HEADER_ONLY to enable yasio core implementation header only
-// #define YASIO__HEADER_ONLY 1
+// Uncomment or add -DYASIO_HEADER_ONLY to enable yasio core implementation header only
+// #define YASIO_HEADER_ONLY 1
 
-#if defined(YASIO__HEADER_ONLY)
-#define YASIO__DECL inline
+#if defined(YASIO_HEADER_ONLY)
+#  define YASIO__DECL inline
 #else
-#define YASIO__DECL
+#  define YASIO__DECL
 #endif
 
+#if defined(_MSC_VER) && _MSC_VER <= 1800
+#  define YASIO__HAVE_NS_INLINE 0
+#  define YASIO__NS_INLINE
+#else
+#  define YASIO__HAVE_NS_INLINE 1
+#  define YASIO__NS_INLINE inline
 #endif
 
+#endif

yasio/detail/object_pool.cpp

@@ -1,13 +1,40 @@
+//////////////////////////////////////////////////////////////////////////////////////////
+// A cross platform socket APIs, support ios & android & wp8 & window store
+// universal app
+//////////////////////////////////////////////////////////////////////////////////////////
+/*
+The MIT License (MIT)
+
+Copyright (c) 2012-2019 halx99
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
 // object_pool.cpp: a simple & high-performance object pool implementation v1.3
 
-#if !defined(YASIO__OBJECT_POOL_CPP)
-#  define YASIO__OBJECT_POOL_CPP
+#ifndef YASIO__OBJECT_POOL_CPP
+#define YASIO__OBJECT_POOL_CPP
 
-#  if !defined(YASIO_OBJECT_POOL_HEADER_ONLY)
-#    include "object_pool.h"
-#  endif
+#if !defined(YASIO_OBJECT_POOL_HEADER_ONLY)
+#  include "object_pool.h"
+#endif
 
-#  define OBJECT_POOL_PREALLOCATE 1
+#define OBJECT_POOL_PREALLOCATE 1
 
 namespace yasio
 {
@@ -17,19 +44,19 @@ namespace gc
 namespace detail
 {
 
-#  define POOL_FL_BEGIN(chunk) reinterpret_cast<free_link_node *>(chunk->data)
+#define POOL_FL_BEGIN(chunk) reinterpret_cast<free_link_node *>(chunk->data)
 
 object_pool::object_pool(size_t element_size, size_t element_count)
     : free_link_(nullptr), chunk_(nullptr), element_size_(element_size),
       element_count_(element_count)
-#  ifdef _DEBUG
+#ifdef _DEBUG
       ,
       allocated_count_(0)
-#  endif
+#endif
 {
-#  if OBJECT_POOL_PREALLOCATE
+#if OBJECT_POOL_PREALLOCATE
   release(allocate_from_process_heap()); // preallocate 1 chunk
-#  endif
+#endif
 }
 
 object_pool::~object_pool(void) { this->purge(); }
@@ -55,9 +82,9 @@ void object_pool::cleanup(void)
 
   this->free_link_ = POOL_FL_BEGIN(this->chunk_);
 
-#  if defined(_DEBUG)
+#if defined(_DEBUG)
   this->allocated_count_ = 0;
-#  endif
+#endif
 }
 
 void object_pool::purge(void)
@@ -74,9 +101,9 @@ void object_pool::purge(void)
 
   free_link_ = nullptr;
 
-#  if defined(_DEBUG)
+#if defined(_DEBUG)
   allocated_count_ = 0;
-#  endif
+#endif
 }
 
 void *object_pool::get(void)
@@ -95,18 +122,18 @@ void object_pool::release(void *_Ptr)
   ptr->next           = this->free_link_;
   this->free_link_    = ptr;
 
-#  if defined(_DEBUG)
+#if defined(_DEBUG)
   --this->allocated_count_;
-#  endif
+#endif
 }
 
 void *object_pool::allocate_from_process_heap(void)
 {
   chunk_link new_chunk =
       (chunk_link)malloc(sizeof(chunk_link_node) + element_size_ * element_count_);
-#  ifdef _DEBUG
+#ifdef _DEBUG
   ::memset(new_chunk, 0x00, sizeof(chunk_link_node));
-#  endif
+#endif
   tidy_chunk(new_chunk)->next = nullptr;
 
   // link the new_chunk
@@ -117,19 +144,19 @@ void *object_pool::allocate_from_process_heap(void)
   auto ptr         = POOL_FL_BEGIN(new_chunk);
   this->free_link_ = ptr->next;
 
-#  if defined(_DEBUG)
+#if defined(_DEBUG)
   ++this->allocated_count_;
-#  endif
+#endif
   return reinterpret_cast<void *>(ptr);
 }
 
 void *object_pool::allocate_from_chunk(void)
 {
   free_link_node *ptr = this->free_link_;
   this->free_link_    = ptr->next;
-#  if defined(_DEBUG)
+#if defined(_DEBUG)
   ++this->allocated_count_;
-#  endif
+#endif
   return reinterpret_cast<void *>(ptr);
 }
 
@@ -151,8 +178,3 @@ object_pool::free_link_node *object_pool::tidy_chunk(chunk_link chunk)
 } // namespace yasio
 
 #endif // YASIO__OBJECT_POOL_CPP
-/*
- * Copyright (c) 2012-2019 by HALX99,  ALL RIGHTS RESERVED.
- * Consult your license regarding permissions and restrictions.
- * V1.3:2019
- **/