Added an endpoint_cache class; refactored async_resolver.

glynos · glynos · commit 416fe040e62a · 2013-12-07T17:28:48.000+01:00
diff --git a/http/src/network/http/v2/client/connection/async_resolver.hpp b/http/src/network/http/v2/client/connection/async_resolver.hpp
@@ -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 {
@@ -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(
@@ -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);
                     }
@@ -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_;
diff --git a/http/src/network/http/v2/client/connection/endpoint_cache.hpp b/http/src/network/http/v2/client/connection/endpoint_cache.hpp
@@ -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
