Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply style from .clang-format to all files. #44

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Apply style from .clang-format to all files. #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0203800
Apply .clang-format to all files.
MichaelGrupp Sep 17, 2018
3f14388
Merge branch 'master' into clang-format
MichaelGrupp Sep 19, 2018
43d0a79
Flaky test?
MichaelGrupp Sep 25, 2018
8c7ca35
Merge branch 'master' into clang-format
MichaelGrupp Jan 15, 2019
03c6b82
Ran clang-format.
gaschler Jul 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions async_grpc/client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@
#include "async_grpc/retry.h"
#include "async_grpc/rpc_handler_interface.h"
#include "async_grpc/rpc_service_method_traits.h"

#include "glog/logging.h"
#include "grpc++/grpc++.h"
#include "grpc++/impl/codegen/client_unary_call.h"
#include "grpc++/impl/codegen/proto_utils.h"
#include "grpc++/impl/codegen/sync_stream.h"

#include "glog/logging.h"

namespace async_grpc {

// Wraps a method invocation for all rpc types, unary, client streaming,
Expand Down
6 changes: 3 additions & 3 deletions async_grpc/completion_queue_pool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
* limitations under the License.
*/

#include "async_grpc/completion_queue_pool.h"

#include <cstdlib>

#include "async_grpc/async_client.h"
#include "async_grpc/completion_queue_pool.h"
#include "common/make_unique.h"
#include "glog/logging.h"

Expand Down Expand Up @@ -89,8 +90,7 @@ void CompletionQueuePool::Shutdown() {
}

CompletionQueuePool::CompletionQueuePool()
: number_completion_queues_(kDefaultNumberCompletionQueues) {
}
: number_completion_queues_(kDefaultNumberCompletionQueues) {}

CompletionQueuePool::~CompletionQueuePool() {
LOG(INFO) << "~CompletionQueuePool";
Expand Down
1 change: 1 addition & 0 deletions async_grpc/completion_queue_thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#define CPP_GRPC_COMMON_COMPLETION_QUEUE_THREAD_H_

#include <grpc++/grpc++.h>

#include <memory>
#include <thread>

Expand Down
3 changes: 2 additions & 1 deletion async_grpc/opencensus_span.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ void OpencensusSpan::End() { span_.End(); }

OpencensusSpan::OpencensusSpan(const std::string& name,
const OpencensusSpan* parent)
: span_(opencensus::trace::Span::StartSpan(name, parent ? &parent->span_: nullptr)) {}
: span_(opencensus::trace::Span::StartSpan(
name, parent ? &parent->span_ : nullptr)) {}

} // namespace async_grpc

Expand Down
15 changes: 8 additions & 7 deletions async_grpc/retry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,20 @@
* limitations under the License.
*/

#include "async_grpc/retry.h"

#include <chrono>
#include <cmath>
#include <thread>

#include "async_grpc/retry.h"
#include "glog/logging.h"

namespace async_grpc {

RetryStrategy CreateRetryStrategy(RetryIndicator retry_indicator,
RetryDelayCalculator retry_delay_calculator) {
return [retry_indicator, retry_delay_calculator](
int failed_attempts, const ::grpc::Status &status) {
int failed_attempts, const ::grpc::Status& status) {
if (!retry_indicator(failed_attempts, status)) {
return optional<Duration>();
}
Expand All @@ -35,19 +36,19 @@ RetryStrategy CreateRetryStrategy(RetryIndicator retry_indicator,
}

RetryIndicator CreateLimitedRetryIndicator(int max_attempts) {
return [max_attempts](int failed_attempts, const ::grpc::Status &status) {
return [max_attempts](int failed_attempts, const ::grpc::Status& status) {
return failed_attempts < max_attempts;
};
}

RetryIndicator CreateUnlimitedRetryIndicator() {
return [](int failed_attempts, const ::grpc::Status &status) { return true; };
return [](int failed_attempts, const ::grpc::Status& status) { return true; };
}

RetryIndicator CreateUnlimitedRetryIndicator(
const std::set<::grpc::StatusCode> &unrecoverable_codes) {
const std::set<::grpc::StatusCode>& unrecoverable_codes) {
return
[unrecoverable_codes](int failed_attempts, const ::grpc::Status &status) {
[unrecoverable_codes](int failed_attempts, const ::grpc::Status& status) {
return unrecoverable_codes.count(status.error_code()) <= 0;
};
}
Expand Down Expand Up @@ -81,7 +82,7 @@ RetryStrategy CreateUnlimitedConstantDelayStrategy(Duration delay) {
}

RetryStrategy CreateUnlimitedConstantDelayStrategy(
Duration delay, const std::set<::grpc::StatusCode> &unrecoverable_codes) {
Duration delay, const std::set<::grpc::StatusCode>& unrecoverable_codes) {
return CreateRetryStrategy(CreateUnlimitedRetryIndicator(unrecoverable_codes),
CreateConstantDelayCalculator(delay));
}
Expand Down
8 changes: 4 additions & 4 deletions async_grpc/retry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ using common::Duration;
using common::optional;

using RetryStrategy = std::function<optional<Duration>(
int /* failed_attempts */, const ::grpc::Status &)>;
int /* failed_attempts */, const ::grpc::Status&)>;
using RetryIndicator =
std::function<bool(int /* failed_attempts */, const ::grpc::Status &)>;
std::function<bool(int /* failed_attempts */, const ::grpc::Status&)>;
using RetryDelayCalculator = std::function<Duration(int /* failed_attempts */)>;

RetryStrategy CreateRetryStrategy(RetryIndicator retry_indicator,
Expand All @@ -40,7 +40,7 @@ RetryStrategy CreateRetryStrategy(RetryIndicator retry_indicator,
RetryIndicator CreateLimitedRetryIndicator(int max_attempts);
RetryIndicator CreateUnlimitedRetryIndicator();
RetryIndicator CreateUnlimitedRetryIndicator(
const std::set<::grpc::StatusCode> &unrecoverable_codes);
const std::set<::grpc::StatusCode>& unrecoverable_codes);
RetryDelayCalculator CreateBackoffDelayCalculator(Duration min_delay,
float backoff_factor);
RetryDelayCalculator CreateConstantDelayCalculator(Duration delay);
Expand All @@ -49,7 +49,7 @@ RetryStrategy CreateLimitedBackoffStrategy(Duration min_delay,
int max_attempts);
RetryStrategy CreateUnlimitedConstantDelayStrategy(Duration delay);
RetryStrategy CreateUnlimitedConstantDelayStrategy(
Duration delay, const std::set<::grpc::StatusCode> &unrecoverable_codes);
Duration delay, const std::set<::grpc::StatusCode>& unrecoverable_codes);

bool RetryWithStrategy(RetryStrategy retry_strategy,
std::function<::grpc::Status()> op,
Expand Down
2 changes: 1 addition & 1 deletion async_grpc/rpc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

#include "async_grpc/rpc.h"
#include "async_grpc/service.h"

#include "async_grpc/common/make_unique.h"
#include "async_grpc/service.h"
#include "glog/logging.h"

namespace async_grpc {
Expand Down
17 changes: 9 additions & 8 deletions async_grpc/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,14 @@ void Server::Builder::SetServerAddress(const std::string& server_address) {
}

void Server::Builder::SetMaxReceiveMessageSize(int max_receive_message_size) {
CHECK_GT(max_receive_message_size, 0) << "max_receive_message_size must be larger than 0.";
CHECK_GT(max_receive_message_size, 0)
<< "max_receive_message_size must be larger than 0.";
options_.max_receive_message_size = max_receive_message_size;
}

void Server::Builder::SetMaxSendMessageSize(int max_send_message_size) {
CHECK_GT(max_send_message_size, 0) << "max_send_message_size must be larger than 0.";
CHECK_GT(max_send_message_size, 0)
<< "max_send_message_size must be larger than 0.";
options_.max_send_message_size = max_send_message_size;
}

Expand All @@ -63,19 +65,19 @@ void Server::Builder::EnableTracing() {
#endif
}

void Server::Builder::DisableTracing() {
options_.enable_tracing = false;
}
void Server::Builder::DisableTracing() { options_.enable_tracing = false; }

void Server::Builder::SetTracingSamplerProbability(double tracing_sampler_probability) {
void Server::Builder::SetTracingSamplerProbability(
double tracing_sampler_probability) {
options_.tracing_sampler_probability = tracing_sampler_probability;
}

void Server::Builder::SetTracingTaskName(const std::string& tracing_task_name) {
options_.tracing_task_name = tracing_task_name;
}

void Server::Builder::SetTracingGcpProjectId(const std::string& tracing_gcp_project_id) {
void Server::Builder::SetTracingGcpProjectId(
const std::string& tracing_gcp_project_id) {
options_.tracing_gcp_project_id = tracing_gcp_project_id;
}

Expand Down Expand Up @@ -178,7 +180,6 @@ void Server::Start() {
}
#endif


// Start the gRPC server process.
server_ = server_builder_.BuildAndStart();

Expand Down
3 changes: 1 addition & 2 deletions async_grpc/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@
#include "async_grpc/rpc_handler.h"
#include "async_grpc/rpc_service_method_traits.h"
#include "async_grpc/service.h"

#include "grpc++/grpc++.h"

namespace async_grpc {
namespace {

constexpr int kDefaultMaxMessageSize = 10 * 1024 * 1024; // 10 MB
constexpr int kDefaultMaxMessageSize = 10 * 1024 * 1024; // 10 MB
constexpr double kDefaultTracingSamplerProbability = 0.01; // 1 Percent

} // namespace
Expand Down
3 changes: 1 addition & 2 deletions async_grpc/service.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
* limitations under the License.
*/

#include "async_grpc/server.h"

#include <cstdlib>

#include "async_grpc/server.h"
#include "glog/logging.h"
#include "grpc++/impl/codegen/proto_utils.h"

Expand Down