Commit 5ecc1906 authored by hyperxor's avatar hyperxor

Reformatted client.cc and http.cc files with clang-format (default options)

parent aa02f308
...@@ -517,9 +517,8 @@ Async::Promise<Response> Connection::perform(const Http::Request &request, ...@@ -517,9 +517,8 @@ Async::Promise<Response> Connection::perform(const Http::Request &request,
}); });
} }
Async::Promise<Response> Async::Promise<Response> Connection::asyncPerform(const Http::Request &request,
Connection::asyncPerform(const Http::Request &request, Connection::OnDone onDone) {
Connection::OnDone onDone) {
return Async::Promise<Response>( return Async::Promise<Response>(
[=](Async::Resolver &resolve, Async::Rejection &reject) { [=](Async::Resolver &resolve, Async::Rejection &reject) {
requestsQueue.push(RequestData(std::move(resolve), std::move(reject), requestsQueue.push(RequestData(std::move(resolve), std::move(reject),
...@@ -555,8 +554,8 @@ void Connection::processRequestQueue() { ...@@ -555,8 +554,8 @@ void Connection::processRequestQueue() {
if (!req) if (!req)
break; break;
performImpl(req->request, std::move(req->resolve), performImpl(req->request, std::move(req->resolve), std::move(req->reject),
std::move(req->reject), std::move(req->onDone)); std::move(req->onDone));
} }
} }
...@@ -762,17 +761,17 @@ Async::Promise<Response> Client::doRequest(Http::Request request) { ...@@ -762,17 +761,17 @@ Async::Promise<Response> Client::doRequest(Http::Request request) {
auto conn = pool.pickConnection(resource.first); auto conn = pool.pickConnection(resource.first);
if (conn == nullptr) { if (conn == nullptr) {
return Async::Promise<Response>( return Async::Promise<Response>([this, resource = std::move(resource),
[this, resource = std::move(resource), request] request](Async::Resolver &resolve,
(Async::Resolver &resolve, Async::Rejection &reject) { Async::Rejection &reject) {
Guard guard(queuesLock); Guard guard(queuesLock);
auto data = std::make_shared<Connection::RequestData>( auto data = std::make_shared<Connection::RequestData>(
std::move(resolve), std::move(reject), std::move(request), nullptr); std::move(resolve), std::move(reject), std::move(request), nullptr);
auto &queue = requestsQueues[resource.first]; auto &queue = requestsQueues[resource.first];
if (!queue.enqueue(data)) if (!queue.enqueue(data))
data->reject(std::runtime_error("Queue is full")); data->reject(std::runtime_error("Queue is full"));
}); });
} else { } else {
if (!conn->hasTransport()) { if (!conn->hasTransport()) {
...@@ -784,25 +783,25 @@ Async::Promise<Response> Client::doRequest(Http::Request request) { ...@@ -784,25 +783,25 @@ Async::Promise<Response> Client::doRequest(Http::Request request) {
} }
if (!conn->isConnected()) { if (!conn->isConnected()) {
std::weak_ptr<Connection> weakConn = conn; std::weak_ptr<Connection> weakConn = conn;
auto res = conn->asyncPerform(request, [this, weakConn]() { auto res = conn->asyncPerform(request, [this, weakConn]() {
auto conn = weakConn.lock(); auto conn = weakConn.lock();
if (conn) { if (conn) {
pool.releaseConnection(conn); pool.releaseConnection(conn);
processRequestQueue(); processRequestQueue();
} }
}); });
conn->connect(helpers::httpAddr(resource.first)); conn->connect(helpers::httpAddr(resource.first));
return res; return res;
} }
std::weak_ptr<Connection> weakConn = conn; std::weak_ptr<Connection> weakConn = conn;
return conn->perform(request, [this, weakConn]() { return conn->perform(request, [this, weakConn]() {
auto conn = weakConn.lock(); auto conn = weakConn.lock();
if (conn) { if (conn) {
pool.releaseConnection(conn); pool.releaseConnection(conn);
processRequestQueue(); processRequestQueue();
} }
}); });
} }
} }
......
...@@ -526,9 +526,7 @@ bool Query::has(const std::string &name) const { ...@@ -526,9 +526,7 @@ bool Query::has(const std::string &name) const {
} // namespace Uri } // namespace Uri
Message::Message(Version version) Message::Message(Version version) : version_(version) {}
: version_(version)
{}
Version Message::version() const { return version_; } Version Message::version() const { return version_; }
...@@ -552,13 +550,9 @@ const Uri::Query &Request::query() const { return query_; } ...@@ -552,13 +550,9 @@ const Uri::Query &Request::query() const { return query_; }
const Address &Request::address() const { return address_; } const Address &Request::address() const { return address_; }
std::chrono::milliseconds Request::timeout() const { std::chrono::milliseconds Request::timeout() const { return timeout_; }
return timeout_;
}
Response::Response(Version version) Response::Response(Version version) : Message(version) {}
: Message(version)
{}
#ifdef LIBSTDCPP_SMARTPTR_LOCK_FIXME #ifdef LIBSTDCPP_SMARTPTR_LOCK_FIXME
std::shared_ptr<Tcp::Peer> Request::peer() const { std::shared_ptr<Tcp::Peer> Request::peer() const {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment