Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit40a2309

Browse files
committed
Renamed async_resolver_delegate, and removed some of the framework cruft.
1 parentaf77702 commit40a2309

File tree

9 files changed

+43
-125
lines changed

9 files changed

+43
-125
lines changed

‎http/src/http/v2/client/client.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include<network/http/v2/client/client.hpp>
77
#include<network/http/v2/method.hpp>
8-
#include<network/http/v2/client/connection/async_resolver_delegate.hpp>
8+
#include<network/http/v2/client/connection/async_resolver.hpp>
99
#include<thread>
1010

1111
namespacenetwork {
@@ -23,7 +23,7 @@ namespace network {
2323
boost::asio::io_service io_service_;
2424
std::unique_ptr<boost::asio::io_service::work> sentinel_;
2525
std::thread lifetime_thread_;
26-
async_resolver_delegate resolver_;
26+
async_resolver resolver_;
2727

2828
};
2929

‎http/src/network/http/v2/client/client.hpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,9 @@ namespace network {
225225

226226
};
227227

228+
template<typename Handler,typename Signature>
229+
structhandler_type { };
230+
228231
/**
229232
* \ingroup http_client
230233
* \class client network/http/v2/client/client.hpp

‎http/src/network/http/v2/client/connection.hpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
/**
99
* \file
10-
* \brief
10+
* \brief This file contains a base class for all connections.
1111
*/
1212

1313
#ifndef __NETWORK_HTTP_V2_CLIENT_CONNECTION_INC__
@@ -25,6 +25,10 @@ namespace network {
2525
classrequest;
2626
classrequest_options;
2727

28+
enum {
29+
NETWORK_BUFFER_CHUNK =1024,
30+
};
31+
2832
/**
2933
* \ingroup http_client
3034
* \class connection network/http/v2/client/connection.hpp

‎http/src/network/http/v2/client/connection/async_resolver_delegate.hpp‎renamed to ‎http/src/network/http/v2/client/connection/async_resolver.hpp‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// (See accompanying file LICENSE_1_0.txt or copy at
66
// http://www.boost.org/LICENSE_1_0.txt)
77

8-
#ifndef__NETWORK_HTTP_V2_CLIENT_CONNECTION_ASYNC_RESOLVER_DELEGATE_INC__
9-
#define__NETWORK_HTTP_V2_CLIENT_CONNECTION_ASYNC_RESOLVER_DELEGATE_INC__
8+
#ifndef__NETWORK_HTTP_V2_CLIENT_CONNECTION_ASYNC_RESOLVER_INC__
9+
#define__NETWORK_HTTP_V2_CLIENT_CONNECTION_ASYNC_RESOLVER_INC__
1010

1111
#include<stdexcept>
1212
#include<cstdint>
@@ -17,26 +17,41 @@
1717
#include<boost/asio/ip/tcp.hpp>
1818
#include<boost/algorithm/string/case_conv.hpp>
1919
#include<boost/exception/all.hpp>
20-
#include<network/http/v2/client/connection/resolver_delegate.hpp>
2120

2221
namespacenetwork {
2322
namespacehttp {
2423
namespacev2 {
2524
/**
26-
* \classasync_resolver_delegate network/http/v2/client/connection/async_resolver_delegate.hpp
25+
* \classasync_resolver network/http/v2/client/connection/async_resolver.hpp
2726
* \brief Resolves and maintains a cache of hosts.
2827
*/
29-
classasync_resolver_delegate :publicresolver_delegate {
28+
classasync_resolver {
3029

31-
async_resolver_delegate(constasync_resolver_delegate &) =delete;
32-
async_resolver_delegate &operator = (constasync_resolver_delegate &) =delete;
30+
async_resolver(constasync_resolver &) =delete;
31+
async_resolver &operator = (constasync_resolver &) =delete;
3332

3433
public:
3534

35+
/**
36+
* \brief resolver
37+
*/
38+
typedef boost::asio::ip::tcp::resolver resolver;
39+
40+
/**
41+
* \brief resolver_iterator
42+
*/
43+
typedef resolver::iterator resolver_iterator;
44+
45+
/**
46+
* \brief callback_fn
47+
*/
48+
typedef std::function<void (const boost::system::error_code&,
49+
resolver_iterator)> callback_fn;
50+
3651
/**
3752
* \brief Constructor.
3853
*/
39-
async_resolver_delegate(boost::asio::io_service &service,bool cache_resolved =false)
54+
async_resolver(boost::asio::io_service &service,bool cache_resolved =false)
4055
: resolver_(service)
4156
, resolver_strand_(new boost::asio::io_service::strand(service))
4257
, cache_resolved_(cache_resolved) {
@@ -46,15 +61,15 @@ namespace network {
4661
/**
4762
* \brief Destructor.
4863
*/
49-
virtual~async_resolver_delegate()noexcept {
64+
~async_resolver()noexcept {
5065

5166
}
5267

5368
/**
5469
* \brief Resolves a host asynchronously.
5570
*/
5671

57-
virtualvoidasync_resolve(const std::string &host, std::uint16_t port, callback_fn callback) {
72+
voidasync_resolve(const std::string &host, std::uint16_t port, callback_fn callback) {
5873
if (cache_resolved_) {
5974
endpoint_cache::iterator it = endpoint_cache_.find(boost::to_lower_copy(host));
6075
if (it != endpoint_cache_.end()) {
@@ -104,4 +119,4 @@ namespace network {
104119
}// namespace http
105120
}// namespace network
106121

107-
#endif//__NETWORK_HTTP_V2_CLIENT_CONNECTION_ASYNC_RESOLVER_DELEGATE_INC__
122+
#endif//__NETWORK_HTTP_V2_CLIENT_CONNECTION_ASYNC_RESOLVER_INC__

‎http/src/network/http/v2/client/connection/resolver_delegate.hpp‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎http/src/network/http/v2/client/connection/resolver_delegate_factory.hpp‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎http/test/v2/features/client/async_client.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include<string>
1515
#include<boost/asio.hpp>
1616
#include<boost/bind.hpp>
17-
#include"network/http/v2/client/connection/async_resolver_delegate.hpp"
17+
#include"network/http/v2/client/connection/async_resolver.hpp"
1818

1919
using boost::asio::ip::tcp;
2020

‎http/test/v2/features/client/async_resolver_test.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include<iostream>
77
#include<igloo/igloo_alt.h>
88
#include<boost/asio.hpp>
9-
#include"network/http/v2/client/connection/async_resolver_delegate.hpp"
9+
#include"network/http/v2/client/connection/async_resolver.hpp"
1010

1111
usingnamespaceigloo;
1212
using boost::asio::ip::tcp;
@@ -19,16 +19,16 @@ Describe(async_resolver) {
1919
// maybe execute a script
2020

2121
io_service_.reset(new boost::asio::io_service);
22-
resolver_.reset(newhttp::async_resolver_delegate(*io_service_));
22+
resolver_.reset(newhttp::async_resolver(*io_service_));
2323
}
2424

2525
It(resolves_localhost) {
2626
resolver_->async_resolve("127.0.0.1",80,
2727
[&] (const boost::system::error_code &ec,
28-
http::async_resolver_delegate::resolver_iterator endpoint_iterator) {
28+
http::async_resolver::resolver_iterator endpoint_iterator) {
2929
Assert::That(ec,Equals(boost::system::error_code()));
3030
if (endpoint_iterator !=
31-
http::async_resolver_delegate::resolver_iterator()) {
31+
http::async_resolver::resolver_iterator()) {
3232
tcp::endpoint endpoint = *endpoint_iterator;
3333
Assert::That(endpoint.address().to_string(),Equals("127.0.0.1"));
3434
Assert::That(endpoint.port(),Equals(80));
@@ -38,7 +38,7 @@ Describe(async_resolver) {
3838
}
3939

4040
std::unique_ptr<boost::asio::io_service> io_service_;
41-
std::unique_ptr<http::async_resolver_delegate> resolver_;
41+
std::unique_ptr<http::async_resolver> resolver_;
4242

4343
};
4444

‎http/test/v2/features/client/normal_connection_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Describe(normal_http_connection) {
114114
});
115115

116116
// Read the HTTP response on the socket from the server.
117-
char output[8192];
117+
char output[1024];
118118
std::memset(output,0,sizeof(output));
119119
std::size_t bytes_read =0;
120120
connection_->async_read_some(boost::asio::mutable_buffers_1(output,sizeof(output)),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp