Dec 18, 2013 · Jun 23, 2013 · Jun 23, 2013 · Jun 23, 2013 · Jun 23, 2013 · Jun 23, 2013
diff --git a/http/src/network/http/v2/client/connection/async_resolver.hpp b/http/src/network/http/v2/client/connection/async_resolver.hpp
 #include <stdexcept>
 #include <cstdint>
 #include <string>
 #include <unordered_map>
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/exception/all.hpp>
 #include <network/config.hpp>
 #include <network/http/v2/client/connection/endpoint_cache.hpp>

 namespace network {
  namespace http {
         */
        void async_resolve(const std::string &host, std::uint16_t port, resolve_callback handler) {
          if (cache_resolved_) {
 endpoint_cache::iterator it = endpoint_cache_.find(boost::to_lower_copy(host));
 auto it = endpoint_cache_.find(host);
            if (it != endpoint_cache_.end()) {
              boost::system::error_code ec;
              handler(ec, it->second);
              return;
            }
          }


          resolver::query query(host, std::to_string(port));
          resolver_.async_resolve(query,
              resolver_strand_->wrap(
                    }
                    else {
                      if (cache_resolved_) {
                        endpoint_cache_.insert(std::make_pair(host, endpoint_iterator));
                        endpoint_cache_.insert(host, endpoint_iterator);
                      }
                      handler(ec, endpoint_iterator);
                    }
         * \brief Clears the cache of already resolved endpoints.
         */
        void clear_resolved_cache() {
 endpoint_cache().swap(endpoint_cache_);
 endpoint_cache_.clear();
        }

      private:

        typedef boost::asio::io_service::strand strand;
        typedef std::unordered_map<std::string, resolver_iterator> endpoint_cache;

        resolver resolver_;
        std::unique_ptr<strand> resolver_strand_;
diff --git a/http/src/network/http/v2/client/connection/endpoint_cache.hpp b/http/src/network/http/v2/client/connection/endpoint_cache.hpp
 // Copyright (C) 2013 by Glyn Matthews
 // 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 NETWORK_HTTP_V2_CLIENT_CONNECTION_ENDPOINT_CACHE_INC
 #define NETWORK_HTTP_V2_CLIENT_CONNECTION_ENDPOINT_CACHE_INC

 #include <string>
 #include <unordered_map>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/algorithm/string/case_conv.hpp>

 namespace network {
  namespace http {
    namespace v2 {

      class endpoint_cache {

        typedef boost::asio::ip::tcp::resolver resolver;

        typedef resolver::iterator resolver_iterator;

        typedef std::unordered_map<std::string,
                                   resolver_iterator> cache_type;

      public:

        typedef cache_type::iterator iterator;

        cache_type::iterator begin() {
          return endpoints_.begin();
        }

        cache_type::iterator end() {
          return endpoints_.end();
        }

        void insert(const std::string &host,
                    resolver_iterator endpoint_iterator) {
          endpoints_.insert(std::make_pair(host, endpoint_iterator));
        }

        iterator find(const std::string &host) {
          return endpoints_.find(boost::to_lower_copy(host));
        }

        void clear() {
          endpoint_cache().swap(*this);
        }

        void swap(endpoint_cache &other) noexcept {
          endpoints_.swap(other.endpoints_);
        }

      private:

        cache_type endpoints_;

      };

    } // namespace v2
  } // namespace http
 } // namespace network

 #endif // NETWORK_HTTP_V2_CLIENT_CONNECTION_ENDPOINT_CACHE_INC
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,13 +11,12 @@
		#include <stdexcept>
		#include <cstdint>
		#include <string>
		#include <unordered_map>
		#include <boost/asio/io_service.hpp>
		#include <boost/asio/strand.hpp>
		#include <boost/asio/ip/tcp.hpp>
		#include <boost/algorithm/string/case_conv.hpp>
		#include <boost/exception/all.hpp>
		#include <network/config.hpp>
		#include <network/http/v2/client/connection/endpoint_cache.hpp>

		namespace network {
		namespace http {
Expand DownExpand Up		@@ -74,15 +73,14 @@ namespace network {
		*/
		void async_resolve(const std::string &host, std::uint16_t port, resolve_callback handler) {
		if (cache_resolved_) {
		endpoint_cache::iterator it = endpoint_cache_.find(boost::to_lower_copy(host));
		auto it = endpoint_cache_.find(host);
		if (it != endpoint_cache_.end()) {
		boost::system::error_code ec;
		handler(ec, it->second);
		return;
		}
		}


		resolver::query query(host, std::to_string(port));
		resolver_.async_resolve(query,
		resolver_strand_->wrap(
Expand All		@@ -93,7 +91,7 @@ namespace network {
		}
		else {
		if (cache_resolved_) {
		endpoint_cache_.insert(std::make_pair(host, endpoint_iterator));
		endpoint_cache_.insert(host, endpoint_iterator);
		}
		handler(ec, endpoint_iterator);
		}
Expand All		@@ -104,13 +102,12 @@ namespace network {
		* \brief Clears the cache of already resolved endpoints.
		*/
		void clear_resolved_cache() {
		endpoint_cache().swap(endpoint_cache_);
		endpoint_cache_.clear();
		}

		private:

		typedef boost::asio::io_service::strand strand;
		typedef std::unordered_map<std::string, resolver_iterator> endpoint_cache;

		resolver resolver_;
		std::unique_ptr<strand> resolver_strand_;
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,66 @@
		// Copyright (C) 2013 by Glyn Matthews
		// 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 NETWORK_HTTP_V2_CLIENT_CONNECTION_ENDPOINT_CACHE_INC
		#define NETWORK_HTTP_V2_CLIENT_CONNECTION_ENDPOINT_CACHE_INC

		#include <string>
		#include <unordered_map>
		#include <boost/asio/ip/tcp.hpp>
		#include <boost/algorithm/string/case_conv.hpp>

		namespace network {
		namespace http {
		namespace v2 {

		class endpoint_cache {

		typedef boost::asio::ip::tcp::resolver resolver;

		typedef resolver::iterator resolver_iterator;

		typedef std::unordered_map<std::string,
		resolver_iterator> cache_type;

		public:

		typedef cache_type::iterator iterator;

		cache_type::iterator begin() {
		return endpoints_.begin();
		}

		cache_type::iterator end() {
		return endpoints_.end();
		}

		void insert(const std::string &host,
		resolver_iterator endpoint_iterator) {
		endpoints_.insert(std::make_pair(host, endpoint_iterator));
		}

		iterator find(const std::string &host) {
		return endpoints_.find(boost::to_lower_copy(host));
		}

		void clear() {
		endpoint_cache().swap(*this);
		}

		void swap(endpoint_cache &other) noexcept {
		endpoints_.swap(other.endpoints_);
		}

		private:

		cache_type endpoints_;

		};

		} // namespace v2
		} // namespace http
		} // namespace network

		#endif // NETWORK_HTTP_V2_CLIENT_CONNECTION_ENDPOINT_CACHE_INC