walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

clang-format

This commit is contained in:
Tatsuhiro Tsujikawa 2015-12-20 12:48:39 +09:00
parent c5ea2b4ab5
commit dd93b29397
10 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/asio_io_service_pool.cc
View File

@ -92,7 +92,8 @@ boost::asio::io_service &io_service_pool::get_io_service() {
return io_service; return io_service;
} }
const std::vector<std::shared_ptr<boost::asio::io_service>> &io_service_pool::get_io_services() const { const std::vector<std::shared_ptr<boost::asio::io_service>> &
io_service_pool::get_io_services() const {
return io_services_; return io_services_;
} }

3
src/asio_io_service_pool.h
View File

@ -71,7 +71,8 @@ public:
boost::asio::io_service &get_io_service(); boost::asio::io_service &get_io_service();
/// Get access to all io_service objects. /// Get access to all io_service objects.
const std::vector<std::shared_ptr<boost::asio::io_service>> &get_io_services() const; const std::vector<std::shared_ptr<boost::asio::io_service>> &
get_io_services() const;
private: private:
/// The pool of io_services. /// The pool of io_services.

3
src/asio_server.cc
View File

@ -169,7 +169,8 @@ void server::stop() { io_service_pool_.stop(); }
void server::join() { io_service_pool_.join(); } void server::join() { io_service_pool_.join(); }
const std::vector<std::shared_ptr<boost::asio::io_service>> &server::get_io_services() const { const std::vector<std::shared_ptr<boost::asio::io_service>> &
server::get_io_services() const {
return io_service_pool_.get_io_services(); return io_service_pool_.get_io_services();
} }

3
src/asio_server.h
View File

@ -74,7 +74,8 @@ public:
void stop(); void stop();
/// Get access to all io_service objects. /// Get access to all io_service objects.
const std::vector<std::shared_ptr<boost::asio::io_service>> &get_io_services() const; const std::vector<std::shared_ptr<boost::asio::io_service>> &
get_io_services() const;
private: private:
/// Initiate an asynchronous accept operation. /// Initiate an asynchronous accept operation.

3
src/asio_server_http2.cc
View File

@ -77,7 +77,8 @@ void http2::stop() { impl_->stop(); }
void http2::join() { return impl_->join(); } void http2::join() { return impl_->join(); }
const std::vector<std::shared_ptr<boost::asio::io_service>> &http2::get_io_services() const { const std::vector<std::shared_ptr<boost::asio::io_service>> &
http2::get_io_services() const {
return impl_->get_io_services(); return impl_->get_io_services();
} }

3
src/asio_server_http2_impl.cc
View File

@ -59,7 +59,8 @@ void http2_impl::stop() { return server_->stop(); }
void http2_impl::join() { return server_->join(); } void http2_impl::join() { return server_->join(); }
const std::vector<std::shared_ptr<boost::asio::io_service>> &http2_impl::get_io_services() const { const std::vector<std::shared_ptr<boost::asio::io_service>> &
http2_impl::get_io_services() const {
return server_->get_io_services(); return server_->get_io_services();
} }

3
src/asio_server_http2_impl.h
View File

@ -50,7 +50,8 @@ public:
bool handle(std::string pattern, request_cb cb); bool handle(std::string pattern, request_cb cb);
void stop(); void stop();
void join(); void join();
const std::vector<std::shared_ptr<boost::asio::io_service>> &get_io_services() const; const std::vector<std::shared_ptr<boost::asio::io_service>> &
get_io_services() const;
private: private:
std::unique_ptr<server> server_; std::unique_ptr<server> server_;

3
src/includes/nghttp2/asio_http2_server.h
View File

@ -205,7 +205,8 @@ public:
void join(); void join();
// Get access to the io_service objects. // Get access to the io_service objects.
const std::vector<std::shared_ptr<boost::asio::io_service>> &get_io_services() const; const std::vector<std::shared_ptr<boost::asio::io_service>> &
get_io_services() const;
private: private:
std::unique_ptr<http2_impl> impl_; std::unique_ptr<http2_impl> impl_;

3
tests/nghttp2_session_test.c
View File

@ -1449,8 +1449,7 @@ void test_nghttp2_session_server_recv_push_response(void) {
nghttp2_hd_deflate_init(&deflater, mem); nghttp2_hd_deflate_init(&deflater, mem);
nghttp2_session_open_stream(session, 2, NGHTTP2_STREAM_FLAG_NONE, nghttp2_session_open_stream(session, 2, NGHTTP2_STREAM_FLAG_NONE,
&pri_spec_default, &pri_spec_default, NGHTTP2_STREAM_RESERVED, NULL);
NGHTTP2_STREAM_RESERVED, NULL);
nvlen = ARRLEN(resnv); nvlen = ARRLEN(resnv);
nghttp2_nv_array_copy(&nva, resnv, nvlen, mem); nghttp2_nv_array_copy(&nva, resnv, nvlen, mem);