From 89219162dd613b58da8f3cd418f4825a5d566da5 Mon Sep 17 00:00:00 2001 From: Nicolas Noble Date: Tue, 7 Apr 2015 18:01:18 -0700 Subject: [PATCH 01/19] Refactoring std::chrono out. --- include/grpc++/client_context.h | 23 +++++++++++------- include/grpc++/completion_queue.h | 13 ++++++---- include/grpc++/credentials.h | 5 ++-- include/grpc++/server_context.h | 13 ++++++---- {src/cpp/util => include/grpc++}/time.h | 30 ++++++++++++++++++++++++ src/cpp/client/channel.cc | 3 +-- src/cpp/client/client_context.cc | 15 ++---------- src/cpp/client/secure_credentials.cc | 12 +++++----- src/cpp/common/completion_queue.cc | 9 +------ src/cpp/server/server.cc | 4 ++-- src/cpp/server/server_context.cc | 8 +++---- src/cpp/util/time.cc | 7 +++++- test/cpp/client/credentials_test.cc | 2 +- test/cpp/end2end/async_end2end_test.cc | 4 ++-- test/cpp/end2end/end2end_test.cc | 16 ++++++------- test/cpp/end2end/generic_end2end_test.cc | 2 +- test/cpp/interop/client.cc | 5 ++-- test/cpp/util/time_test.cc | 3 +-- 18 files changed, 101 insertions(+), 73 deletions(-) rename {src/cpp/util => include/grpc++}/time.h (77%) diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h index 4e7f5a7be0e..19630c9b544 100644 --- a/include/grpc++/client_context.h +++ b/include/grpc++/client_context.h @@ -34,15 +34,13 @@ #ifndef GRPCXX_CLIENT_CONTEXT_H #define GRPCXX_CLIENT_CONTEXT_H -#include #include #include #include #include #include - -using std::chrono::system_clock; +#include struct grpc_call; struct grpc_completion_queue; @@ -87,8 +85,19 @@ class ClientContext { return trailing_metadata_; } - void set_absolute_deadline(const system_clock::time_point& deadline); - system_clock::time_point absolute_deadline(); + template + void set_deadline(const T& deadline) { + TimePoint deadline_tp(deadline); + deadline_ = deadline_tp.raw_time(); + } + +#ifndef GRPC_CXX0X_NO_CHRONO + std::chrono::system_clock::time_point deadline() { + return Timespec2Timepoint(deadline_); + } +#endif // !GRPC_CXX0X_NO_CHRONO + + gpr_timespec raw_deadline() { return deadline_; } void set_authority(const grpc::string& authority) { authority_ = authority; } @@ -125,14 +134,12 @@ class ClientContext { grpc_completion_queue* cq() { return cq_; } void set_cq(grpc_completion_queue* cq) { cq_ = cq; } - gpr_timespec RawDeadline() { return absolute_deadline_; } - grpc::string authority() { return authority_; } bool initial_metadata_received_; grpc_call* call_; grpc_completion_queue* cq_; - gpr_timespec absolute_deadline_; + gpr_timespec deadline_; grpc::string authority_; std::multimap send_initial_metadata_; std::multimap recv_initial_metadata_; diff --git a/include/grpc++/completion_queue.h b/include/grpc++/completion_queue.h index e6a8c6fe552..ba390c96e9d 100644 --- a/include/grpc++/completion_queue.h +++ b/include/grpc++/completion_queue.h @@ -34,9 +34,9 @@ #ifndef GRPCXX_COMPLETION_QUEUE_H #define GRPCXX_COMPLETION_QUEUE_H -#include -#include #include +#include +#include struct grpc_completion_queue; @@ -82,10 +82,13 @@ class CompletionQueue { // Nonblocking (until deadline) read from queue. // Cannot rely on result of tag or ok if return is TIMEOUT - NextStatus AsyncNext(void** tag, bool* ok, - std::chrono::system_clock::time_point deadline); + template + NextStatus AsyncNext(void** tag, bool* ok, const T& deadline) { + TimePoint deadline_tp(deadline); + return AsyncNextInternal(tag, ok, deadline_tp.raw_time()); + } - // Blocking (until deadline) read from queue. + // Blocking read from queue. // Returns false if the queue is ready for destruction, true if event bool Next(void** tag, bool* ok) { diff --git a/include/grpc++/credentials.h b/include/grpc++/credentials.h index 2ac3eec95cd..15bfef55ab7 100644 --- a/include/grpc++/credentials.h +++ b/include/grpc++/credentials.h @@ -34,7 +34,6 @@ #ifndef GRPCXX_CREDENTIALS_H #define GRPCXX_CREDENTIALS_H -#include #include #include @@ -103,7 +102,7 @@ std::unique_ptr ComputeEngineCredentials(); // grpc_max_auth_token_lifetime or will be cropped to this value. std::unique_ptr ServiceAccountCredentials( const grpc::string& json_key, const grpc::string& scope, - std::chrono::seconds token_lifetime); + long token_lifetime); // Builds JWT credentials. // json_key is the JSON key string containing the client's private key. @@ -111,7 +110,7 @@ std::unique_ptr ServiceAccountCredentials( // this credentials. It should not exceed grpc_max_auth_token_lifetime or // will be cropped to this value. std::unique_ptr JWTCredentials( - const grpc::string& json_key, std::chrono::seconds token_lifetime); + const grpc::string& json_key, long token_lifetime); // Builds refresh token credentials. // json_refresh_token is the JSON string containing the refresh token along diff --git a/include/grpc++/server_context.h b/include/grpc++/server_context.h index 9e3b80c6411..a62babd9316 100644 --- a/include/grpc++/server_context.h +++ b/include/grpc++/server_context.h @@ -34,10 +34,11 @@ #ifndef GRPCXX_SERVER_CONTEXT_H #define GRPCXX_SERVER_CONTEXT_H -#include #include +#include #include +#include struct gpr_timespec; struct grpc_metadata; @@ -71,9 +72,13 @@ class ServerContext { ServerContext(); // for async calls ~ServerContext(); - std::chrono::system_clock::time_point absolute_deadline() { - return deadline_; +#ifndef GRPC_CXX0X_NO_CHRONO + std::chrono::system_clock::time_point deadline() { + return Timespec2Timepoint(deadline_); } +#endif // !GRPC_CXX0X_NO_CHRONO + + gpr_timespec raw_deadline() { return deadline_; } void AddInitialMetadata(const grpc::string& key, const grpc::string& value); void AddTrailingMetadata(const grpc::string& key, const grpc::string& value); @@ -110,7 +115,7 @@ class ServerContext { CompletionOp* completion_op_; - std::chrono::system_clock::time_point deadline_; + gpr_timespec deadline_; grpc_call* call_; CompletionQueue* cq_; bool sent_initial_metadata_; diff --git a/src/cpp/util/time.h b/include/grpc++/time.h similarity index 77% rename from src/cpp/util/time.h rename to include/grpc++/time.h index 8b7fcf55f78..470471ab8b4 100644 --- a/src/cpp/util/time.h +++ b/include/grpc++/time.h @@ -34,6 +34,23 @@ #ifndef GRPC_INTERNAL_CPP_UTIL_TIME_H #define GRPC_INTERNAL_CPP_UTIL_TIME_H +#include + +namespace grpc { + +template +class TimePoint { + public: + TimePoint(const T& time) : time_(time) { } + gpr_timespec raw_time() const { return time_; } + private: + gpr_timespec time_; +}; + +} // namespace grpc + +#ifndef GRPC_CXX0X_NO_CHRONO + #include #include @@ -46,6 +63,19 @@ void Timepoint2Timespec(const std::chrono::system_clock::time_point& from, std::chrono::system_clock::time_point Timespec2Timepoint(gpr_timespec t); +template <> +class TimePoint { + public: + TimePoint(const std::chrono::system_clock::time_point& time) { + Timepoint2Timespec(time, &time_); + } + gpr_timespec raw_time() const { return time_; } + private: + gpr_timespec time_; +}; + } // namespace grpc +#endif // !GRPC_CXX0X_NO_CHRONO + #endif // GRPC_INTERNAL_CPP_UTIL_TIME_H diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc index 5380d3a232c..aaad0420260 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel.cc @@ -33,7 +33,6 @@ #include "src/cpp/client/channel.h" -#include #include #include @@ -64,7 +63,7 @@ Call Channel::CreateCall(const RpcMethod& method, ClientContext* context, context->authority().empty() ? target_.c_str() : context->authority().c_str(), - context->RawDeadline()); + context->raw_deadline()); context->set_call(c_call); return Call(c_call, this, cq); } diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index de9f8c7201d..70c9cb4c3b4 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -34,9 +34,7 @@ #include #include -#include "src/cpp/util/time.h" - -using std::chrono::system_clock; +#include namespace grpc { @@ -44,7 +42,7 @@ ClientContext::ClientContext() : initial_metadata_received_(false), call_(nullptr), cq_(nullptr), - absolute_deadline_(gpr_inf_future) {} + deadline_(gpr_inf_future) {} ClientContext::~ClientContext() { if (call_) { @@ -64,15 +62,6 @@ ClientContext::~ClientContext() { } } -void ClientContext::set_absolute_deadline( - const system_clock::time_point& deadline) { - Timepoint2Timespec(deadline, &absolute_deadline_); -} - -system_clock::time_point ClientContext::absolute_deadline() { - return Timespec2Timepoint(absolute_deadline_); -} - void ClientContext::AddMetadata(const grpc::string& meta_key, const grpc::string& meta_value) { send_initial_metadata_.insert(std::make_pair(meta_key, meta_value)); diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index d6f9acc6755..85785ed2756 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -96,27 +96,27 @@ std::unique_ptr ComputeEngineCredentials() { // Builds service account credentials. std::unique_ptr ServiceAccountCredentials( const grpc::string& json_key, const grpc::string& scope, - std::chrono::seconds token_lifetime) { - if (token_lifetime.count() <= 0) { + long token_lifetime) { + if (token_lifetime <= 0) { gpr_log(GPR_ERROR, "Trying to create ServiceAccountCredentials " "with non-positive lifetime"); return WrapCredentials(nullptr); } - gpr_timespec lifetime = gpr_time_from_seconds(token_lifetime.count()); + gpr_timespec lifetime = gpr_time_from_seconds(token_lifetime); return WrapCredentials(grpc_service_account_credentials_create( json_key.c_str(), scope.c_str(), lifetime)); } // Builds JWT credentials. std::unique_ptr JWTCredentials( - const grpc::string& json_key, std::chrono::seconds token_lifetime) { - if (token_lifetime.count() <= 0) { + const grpc::string& json_key, long token_lifetime) { + if (token_lifetime <= 0) { gpr_log(GPR_ERROR, "Trying to create JWTCredentials with non-positive lifetime"); return WrapCredentials(nullptr); } - gpr_timespec lifetime = gpr_time_from_seconds(token_lifetime.count()); + gpr_timespec lifetime = gpr_time_from_seconds(token_lifetime); return WrapCredentials( grpc_jwt_credentials_create(json_key.c_str(), lifetime)); } diff --git a/src/cpp/common/completion_queue.cc b/src/cpp/common/completion_queue.cc index cea2d24831c..3c37e91e1fc 100644 --- a/src/cpp/common/completion_queue.cc +++ b/src/cpp/common/completion_queue.cc @@ -36,7 +36,7 @@ #include #include -#include "src/cpp/util/time.h" +#include namespace grpc { @@ -77,13 +77,6 @@ CompletionQueue::NextStatus CompletionQueue::AsyncNextInternal( } } -CompletionQueue::NextStatus CompletionQueue::AsyncNext( - void** tag, bool* ok, std::chrono::system_clock::time_point deadline) { - gpr_timespec gpr_deadline; - Timepoint2Timespec(deadline, &gpr_deadline); - return AsyncNextInternal(tag, ok, gpr_deadline); -} - bool CompletionQueue::Pluck(CompletionQueueTag* tag) { std::unique_ptr ev; diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc index 046133c5eb1..2833f78a755 100644 --- a/src/cpp/server/server.cc +++ b/src/cpp/server/server.cc @@ -45,9 +45,9 @@ #include #include #include +#include #include "src/cpp/proto/proto_utils.h" -#include "src/cpp/util/time.h" namespace grpc { @@ -348,7 +348,7 @@ class Server::AsyncRequest GRPC_FINAL : public CompletionQueueTag { ServerContext* ctx = ctx_ ? ctx_ : generic_ctx_; GPR_ASSERT(ctx); if (*status) { - ctx->deadline_ = Timespec2Timepoint(call_details_.deadline); + ctx->deadline_ = call_details_.deadline; for (size_t i = 0; i < array_.count; i++) { ctx->client_metadata_.insert(std::make_pair( grpc::string(array_.metadata[i].key), diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index ffd6d30d5d4..6b5e41d0a82 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -33,11 +33,11 @@ #include -#include -#include #include #include -#include "src/cpp/util/time.h" +#include +#include +#include namespace grpc { @@ -99,7 +99,7 @@ ServerContext::ServerContext() ServerContext::ServerContext(gpr_timespec deadline, grpc_metadata* metadata, size_t metadata_count) : completion_op_(nullptr), - deadline_(Timespec2Timepoint(deadline)), + deadline_(deadline), call_(nullptr), cq_(nullptr), sent_initial_metadata_(false) { diff --git a/src/cpp/util/time.cc b/src/cpp/util/time.cc index 059ea72abf6..1fef2a56def 100644 --- a/src/cpp/util/time.cc +++ b/src/cpp/util/time.cc @@ -31,9 +31,12 @@ * */ -#include "src/cpp/util/time.h" +#include + +#ifndef GRPC_CXX0X_NO_CHRONO #include +#include using std::chrono::duration_cast; using std::chrono::nanoseconds; @@ -68,3 +71,5 @@ system_clock::time_point Timespec2Timepoint(gpr_timespec t) { } } // namespace grpc + +#endif // !GRPC_CXX0X_NO_CHRONO diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc index 24251f297be..d7ea09a5f1f 100644 --- a/test/cpp/client/credentials_test.cc +++ b/test/cpp/client/credentials_test.cc @@ -47,7 +47,7 @@ class CredentialsTest : public ::testing::Test { TEST_F(CredentialsTest, InvalidServiceAccountCreds) { std::unique_ptr bad1 = - ServiceAccountCredentials("", "", std::chrono::seconds(1)); + ServiceAccountCredentials("", "", 1); EXPECT_EQ(nullptr, bad1.get()); } diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index 9938fcf12eb..4fa4382211d 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -35,9 +35,9 @@ #include #include "test/core/util/test_config.h" +#include "test/core/util/port.h" #include "test/cpp/util/echo_duplicate.pb.h" #include "test/cpp/util/echo.pb.h" -#include "src/cpp/util/time.h" #include #include #include @@ -50,7 +50,7 @@ #include #include #include -#include "test/core/util/port.h" +#include #include #include diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 0d5db046df4..2fa3f0a32fc 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -34,10 +34,10 @@ #include #include +#include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/util/echo_duplicate.pb.h" #include "test/cpp/util/echo.pb.h" -#include "src/cpp/util/time.h" #include "src/cpp/server/thread_pool.h" #include #include @@ -50,7 +50,7 @@ #include #include #include -#include "test/core/util/port.h" +#include #include #include @@ -72,8 +72,8 @@ void MaybeEchoDeadline(ServerContext* context, const EchoRequest* request, EchoResponse* response) { if (request->has_param() && request->param().echo_deadline()) { gpr_timespec deadline = gpr_inf_future; - if (context->absolute_deadline() != system_clock::time_point::max()) { - Timepoint2Timespec(context->absolute_deadline(), &deadline); + if (context->deadline() != system_clock::time_point::max()) { + Timepoint2Timespec(context->deadline(), &deadline); } response->mutable_param()->set_request_deadline(deadline.tv_sec); } @@ -245,7 +245,7 @@ TEST_F(End2endTest, RpcDeadlineExpires) { ClientContext context; std::chrono::system_clock::time_point deadline = std::chrono::system_clock::now() + std::chrono::microseconds(10); - context.set_absolute_deadline(deadline); + context.set_deadline(deadline); Status s = stub_->Echo(&context, request, &response); EXPECT_EQ(StatusCode::DEADLINE_EXCEEDED, s.code()); } @@ -260,7 +260,7 @@ TEST_F(End2endTest, RpcLongDeadline) { ClientContext context; std::chrono::system_clock::time_point deadline = std::chrono::system_clock::now() + std::chrono::hours(1); - context.set_absolute_deadline(deadline); + context.set_deadline(deadline); Status s = stub_->Echo(&context, request, &response); EXPECT_EQ(response.message(), request.message()); EXPECT_TRUE(s.IsOk()); @@ -277,7 +277,7 @@ TEST_F(End2endTest, EchoDeadline) { ClientContext context; std::chrono::system_clock::time_point deadline = std::chrono::system_clock::now() + std::chrono::seconds(100); - context.set_absolute_deadline(deadline); + context.set_deadline(deadline); Status s = stub_->Echo(&context, request, &response); EXPECT_EQ(response.message(), request.message()); EXPECT_TRUE(s.IsOk()); @@ -428,7 +428,7 @@ TEST_F(End2endTest, DiffPackageServices) { // rpc and stream should fail on bad credentials. TEST_F(End2endTest, BadCredentials) { std::unique_ptr bad_creds = - ServiceAccountCredentials("", "", std::chrono::seconds(1)); + ServiceAccountCredentials("", "", 1); EXPECT_EQ(nullptr, bad_creds.get()); std::shared_ptr channel = CreateChannel(server_address_.str(), bad_creds, ChannelArguments()); diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index 9cdd8c94d12..25f2c990bc3 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.cc @@ -35,7 +35,6 @@ #include #include "src/cpp/proto/proto_utils.h" -#include "src/cpp/util/time.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" #include "test/cpp/util/echo.pb.h" @@ -55,6 +54,7 @@ #include #include #include +#include #include #include diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index de6c6b7b77e..5971dc1aeab 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -138,8 +138,7 @@ std::shared_ptr CreateChannelForTestCase( std::unique_ptr creds; GPR_ASSERT(FLAGS_enable_ssl); grpc::string json_key = GetServiceAccountJsonKey(); - creds = ServiceAccountCredentials(json_key, FLAGS_oauth_scope, - std::chrono::hours(1)); + creds = ServiceAccountCredentials(json_key, FLAGS_oauth_scope, 3600); return CreateTestChannel(host_port, FLAGS_server_host_override, FLAGS_enable_ssl, FLAGS_use_prod_roots, creds); } else if (test_case == "compute_engine_creds") { @@ -152,7 +151,7 @@ std::shared_ptr CreateChannelForTestCase( std::unique_ptr creds; GPR_ASSERT(FLAGS_enable_ssl); grpc::string json_key = GetServiceAccountJsonKey(); - creds = JWTCredentials(json_key, std::chrono::hours(1)); + creds = JWTCredentials(json_key, 3600); return CreateTestChannel(host_port, FLAGS_server_host_override, FLAGS_enable_ssl, FLAGS_use_prod_roots, creds); } else { diff --git a/test/cpp/util/time_test.cc b/test/cpp/util/time_test.cc index 4641fdb4dae..767cb51c925 100644 --- a/test/cpp/util/time_test.cc +++ b/test/cpp/util/time_test.cc @@ -31,11 +31,10 @@ * */ -#include "src/cpp/util/time.h" - #include #include +#include #include using std::chrono::duration_cast; From a05b8b7b25511b2a5c9312579be4897e9fab0a97 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Wed, 8 Apr 2015 09:07:20 +0200 Subject: [PATCH 02/19] Removing a few more references to #include --- examples/pubsub/main.cc | 1 - test/cpp/end2end/async_end2end_test.cc | 1 - test/cpp/end2end/end2end_test.cc | 1 - test/cpp/end2end/generic_end2end_test.cc | 1 - test/cpp/interop/client.cc | 1 - test/cpp/util/time_test.cc | 2 -- 6 files changed, 7 deletions(-) diff --git a/examples/pubsub/main.cc b/examples/pubsub/main.cc index cc5076f0a55..3d1f89d96c8 100644 --- a/examples/pubsub/main.cc +++ b/examples/pubsub/main.cc @@ -31,7 +31,6 @@ * */ -#include #include #include #include diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc index 4fa4382211d..698f1bb5473 100644 --- a/test/cpp/end2end/async_end2end_test.cc +++ b/test/cpp/end2end/async_end2end_test.cc @@ -31,7 +31,6 @@ * */ -#include #include #include "test/core/util/test_config.h" diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index 2fa3f0a32fc..0e79e21ee0e 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -31,7 +31,6 @@ * */ -#include #include #include "test/core/util/port.h" diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc index 25f2c990bc3..3551251d1d6 100644 --- a/test/cpp/end2end/generic_end2end_test.cc +++ b/test/cpp/end2end/generic_end2end_test.cc @@ -31,7 +31,6 @@ * */ -#include #include #include "src/cpp/proto/proto_utils.h" diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc index 5971dc1aeab..a4641b667e7 100644 --- a/test/cpp/interop/client.cc +++ b/test/cpp/interop/client.cc @@ -31,7 +31,6 @@ * */ -#include #include #include #include diff --git a/test/cpp/util/time_test.cc b/test/cpp/util/time_test.cc index 767cb51c925..a3cfb1c961c 100644 --- a/test/cpp/util/time_test.cc +++ b/test/cpp/util/time_test.cc @@ -31,8 +31,6 @@ * */ -#include - #include #include #include From b7bbffe9f6a57d5eddc52be200adf4ab7f247ca5 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Wed, 8 Apr 2015 20:26:49 +0200 Subject: [PATCH 03/19] Addressing github comments. --- include/grpc++/credentials.h | 16 ++++++++-------- include/grpc++/time.h | 26 ++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/include/grpc++/credentials.h b/include/grpc++/credentials.h index 15bfef55ab7..a193bba2c74 100644 --- a/include/grpc++/credentials.h +++ b/include/grpc++/credentials.h @@ -97,20 +97,20 @@ std::unique_ptr ComputeEngineCredentials(); // Builds service account credentials. // json_key is the JSON key string containing the client's private key. // scope is a space-delimited list of the requested permissions. -// token_lifetime is the lifetime of each token acquired through this service -// account credentials. It should be positive and should not exceed -// grpc_max_auth_token_lifetime or will be cropped to this value. +// token_lifetime_seconds is the lifetime in seconds of each token acquired +// through this service account credentials. It should be positive and should +// not exceed grpc_max_auth_token_lifetime or will be cropped to this value. std::unique_ptr ServiceAccountCredentials( const grpc::string& json_key, const grpc::string& scope, - long token_lifetime); + long token_lifetime_seconds); // Builds JWT credentials. // json_key is the JSON key string containing the client's private key. -// token_lifetime is the lifetime of each Json Web Token (JWT) created with -// this credentials. It should not exceed grpc_max_auth_token_lifetime or -// will be cropped to this value. +// token_lifetime_seconds is the lifetime in seconds of each Json Web Token +// (JWT) created with this credentials. It should not exceed +// grpc_max_auth_token_lifetime or will be cropped to this value. std::unique_ptr JWTCredentials( - const grpc::string& json_key, long token_lifetime); + const grpc::string& json_key, long token_lifetime_seconds); // Builds refresh token credentials. // json_refresh_token is the JSON string containing the refresh token along diff --git a/include/grpc++/time.h b/include/grpc++/time.h index 470471ab8b4..995e550f4b9 100644 --- a/include/grpc++/time.h +++ b/include/grpc++/time.h @@ -38,11 +38,33 @@ namespace grpc { +/* If you are trying to use CompletionQueue::AsyncNext with a time class that + isn't either gpr_timespec or std::chrono::system_clock::time_point, you + will most likely be looking at that comment as your compiler will have + fired the static_assert below. In order to fix that issue, you have two + potential solutions: + + 1. Use gpr_timespec or std::chrono::system_clock::time_point instead + 2. Specialize the TimePoint class with whichever time class that you + want to use here. See below for two examples of how to do that. + */ + template class TimePoint { public: - TimePoint(const T& time) : time_(time) { } - gpr_timespec raw_time() const { return time_; } + TimePoint(const T& time) { + static_assert(false, "You need a specialization of TimePoint"); + } + gpr_timespec raw_time() { + static_assert(false, "You need a specialization of TimePoint"); + } +}; + +template<> +class TimePoint { + public: + TimePoint(const gpr_timespec& time) : time_(time) { } + gpr_timespec raw_time() { return time_; } private: gpr_timespec time_; }; From 27a0dc0208e90b6463049df16da6c35216eab0aa Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sat, 11 Apr 2015 01:25:22 +0200 Subject: [PATCH 04/19] Adjusting build.json. --- Makefile | 2 ++ build.json | 6 +++--- vsprojects/vs2010/grpc++.vcxproj | 2 +- vsprojects/vs2010/grpc++.vcxproj.filters | 6 +++--- vsprojects/vs2013/grpc++.vcxproj | 2 +- vsprojects/vs2013/grpc++.vcxproj.filters | 6 +++--- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 903e497b776..929452b0845 100644 --- a/Makefile +++ b/Makefile @@ -3283,6 +3283,7 @@ PUBLIC_HEADERS_CXX += \ include/grpc++/status_code_enum.h \ include/grpc++/stream.h \ include/grpc++/thread_pool_interface.h \ + include/grpc++/time.h \ LIBGRPC++_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_SRC)))) @@ -3534,6 +3535,7 @@ PUBLIC_HEADERS_CXX += \ include/grpc++/status_code_enum.h \ include/grpc++/stream.h \ include/grpc++/thread_pool_interface.h \ + include/grpc++/time.h \ LIBGRPC++_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_UNSECURE_SRC)))) diff --git a/build.json b/build.json index d814e4c6bd8..80f2c5cef7d 100644 --- a/build.json +++ b/build.json @@ -37,13 +37,13 @@ "include/grpc++/status.h", "include/grpc++/status_code_enum.h", "include/grpc++/stream.h", - "include/grpc++/thread_pool_interface.h" + "include/grpc++/thread_pool_interface.h", + "include/grpc++/time.h" ], "headers": [ "src/cpp/client/channel.h", "src/cpp/proto/proto_utils.h", - "src/cpp/server/thread_pool.h", - "src/cpp/util/time.h" + "src/cpp/server/thread_pool.h" ], "src": [ "src/cpp/client/channel.cc", diff --git a/vsprojects/vs2010/grpc++.vcxproj b/vsprojects/vs2010/grpc++.vcxproj index 0ee433163c8..1ef4a5158ba 100644 --- a/vsprojects/vs2010/grpc++.vcxproj +++ b/vsprojects/vs2010/grpc++.vcxproj @@ -102,12 +102,12 @@ + - diff --git a/vsprojects/vs2010/grpc++.vcxproj.filters b/vsprojects/vs2010/grpc++.vcxproj.filters index ed93daee044..284e31fae17 100644 --- a/vsprojects/vs2010/grpc++.vcxproj.filters +++ b/vsprojects/vs2010/grpc++.vcxproj.filters @@ -159,6 +159,9 @@ include\grpc++ + + include\grpc++ + @@ -170,9 +173,6 @@ src\cpp\server - - src\cpp\util - diff --git a/vsprojects/vs2013/grpc++.vcxproj b/vsprojects/vs2013/grpc++.vcxproj index d545a949cb3..c85cb9414e8 100644 --- a/vsprojects/vs2013/grpc++.vcxproj +++ b/vsprojects/vs2013/grpc++.vcxproj @@ -104,12 +104,12 @@ + - diff --git a/vsprojects/vs2013/grpc++.vcxproj.filters b/vsprojects/vs2013/grpc++.vcxproj.filters index ed93daee044..284e31fae17 100644 --- a/vsprojects/vs2013/grpc++.vcxproj.filters +++ b/vsprojects/vs2013/grpc++.vcxproj.filters @@ -159,6 +159,9 @@ include\grpc++ + + include\grpc++ + @@ -170,9 +173,6 @@ src\cpp\server - - src\cpp\util - From e24dde5736ea833b95765f8ddefb737538dec223 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Fri, 24 Apr 2015 00:43:09 +0200 Subject: [PATCH 05/19] Adressing comments. --- include/grpc++/time.h | 6 +++--- src/cpp/client/secure_credentials.cc | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/grpc++/time.h b/include/grpc++/time.h index 1fc4ad799c6..ffcba4e35aa 100644 --- a/include/grpc++/time.h +++ b/include/grpc++/time.h @@ -40,13 +40,13 @@ namespace grpc { /* If you are trying to use CompletionQueue::AsyncNext with a time class that isn't either gpr_timespec or std::chrono::system_clock::time_point, you - will most likely be looking at that comment as your compiler will have - fired an error below. In order to fix that issue, you have two potential + will most likely be looking at this comment as your compiler will have + fired an error below. In order to fix this issue, you have two potential solutions: 1. Use gpr_timespec or std::chrono::system_clock::time_point instead 2. Specialize the TimePoint class with whichever time class that you - want to use here. See below for two examples of how to do that. + want to use here. See below for two examples of how to do this. */ template diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index 9e83ac8dcdf..48bf7430b27 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -81,27 +81,27 @@ std::unique_ptr ComputeEngineCredentials() { // Builds service account credentials. std::unique_ptr ServiceAccountCredentials( const grpc::string& json_key, const grpc::string& scope, - long token_lifetime) { - if (token_lifetime <= 0) { + long token_lifetime_seconds) { + if (token_lifetime_seconds <= 0) { gpr_log(GPR_ERROR, "Trying to create ServiceAccountCredentials " "with non-positive lifetime"); return WrapCredentials(nullptr); } - gpr_timespec lifetime = gpr_time_from_seconds(token_lifetime); + gpr_timespec lifetime = gpr_time_from_seconds(token_lifetime_seconds); return WrapCredentials(grpc_service_account_credentials_create( json_key.c_str(), scope.c_str(), lifetime)); } // Builds JWT credentials. std::unique_ptr JWTCredentials( - const grpc::string& json_key, long token_lifetime) { - if (token_lifetime <= 0) { + const grpc::string& json_key, long token_lifetime_seconds) { + if (token_lifetime_seconds <= 0) { gpr_log(GPR_ERROR, "Trying to create JWTCredentials with non-positive lifetime"); return WrapCredentials(nullptr); } - gpr_timespec lifetime = gpr_time_from_seconds(token_lifetime); + gpr_timespec lifetime = gpr_time_from_seconds(token_lifetime_seconds); return WrapCredentials( grpc_jwt_credentials_create(json_key.c_str(), lifetime)); } From 76e49fd80557c33595508686f3450982e63f0fce Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Fri, 24 Apr 2015 01:12:18 +0200 Subject: [PATCH 06/19] Forgot to rename header guard. --- include/grpc++/time.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/grpc++/time.h b/include/grpc++/time.h index ffcba4e35aa..f9b2ce5cab1 100644 --- a/include/grpc++/time.h +++ b/include/grpc++/time.h @@ -31,8 +31,8 @@ * */ -#ifndef GRPC_INTERNAL_CPP_UTIL_TIME_H -#define GRPC_INTERNAL_CPP_UTIL_TIME_H +#ifndef GRPCXX_TIME_H +#define GRPCXX_TIME_H #include @@ -103,4 +103,4 @@ class TimePoint { #endif // !GRPC_CXX0X_NO_CHRONO -#endif // GRPC_INTERNAL_CPP_UTIL_TIME_H +#endif // GRPCXX_TIME_H From 9a7d30cf89adfdecff08b1eeb82775e9046189da Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 23 Apr 2015 16:12:55 -0700 Subject: [PATCH 07/19] improved C# support in run_tests.py --- tools/run_tests/build_csharp.sh | 9 ++++++++- tools/run_tests/run_csharp.sh | 17 +++++++++++------ tools/run_tests/run_tests.py | 11 ++++++++--- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/tools/run_tests/build_csharp.sh b/tools/run_tests/build_csharp.sh index 8227ad37bca..546e88db1c8 100755 --- a/tools/run_tests/build_csharp.sh +++ b/tools/run_tests/build_csharp.sh @@ -30,9 +30,16 @@ set -ex +if [ "$CONFIG" = "dbg" ] +then + MSBUILD_CONFIG="Debug" +else + MSBUILD_CONFIG="Release" +fi + # change to gRPC repo root cd $(dirname $0)/../.. root=`pwd` -xbuild src/csharp/Grpc.sln +xbuild /p:Configuration=$MSBUILD_CONFIG src/csharp/Grpc.sln diff --git a/tools/run_tests/run_csharp.sh b/tools/run_tests/run_csharp.sh index d10a41ae9f4..752e83ef705 100755 --- a/tools/run_tests/run_csharp.sh +++ b/tools/run_tests/run_csharp.sh @@ -30,17 +30,22 @@ set -ex +CONFIG=${CONFIG:-opt} + +if [ "$CONFIG" = "dbg" ] +then + MSBUILD_CONFIG="Debug" +else + MSBUILD_CONFIG="Release" +fi + # change to gRPC repo root cd $(dirname $0)/../.. root=`pwd` cd src/csharp -# TODO: All the tests run pretty fast. In the future, we might need to teach -# run_tests.py about separate tests to make them run in parallel. -for assembly_name in Grpc.Core.Tests Grpc.Examples.Tests Grpc.IntegrationTesting -do - LD_LIBRARY_PATH=$root/libs/dbg nunit-console -labels $assembly_name/bin/Debug/$assembly_name.dll -done +export LD_LIBRARY_PATH=$root/libs/$CONFIG +nunit-console -labels "$1/bin/$MSBUILD_CONFIG/$1.dll" diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 5165983d970..50fdec7f5f2 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -61,7 +61,7 @@ class SimpleConfig(object): self.environ = environ self.environ['CONFIG'] = config - def job_spec(self, cmdline, hash_targets): + def job_spec(self, cmdline, hash_targets, shortname=None): """Construct a jobset.JobSpec for a test under this config Args: @@ -74,6 +74,7 @@ class SimpleConfig(object): be listed """ return jobset.JobSpec(cmdline=cmdline, + shortname=shortname, environ=self.environ, hash_targets=hash_targets if self.allow_hashing else None) @@ -218,9 +219,13 @@ class RubyLanguage(object): class CSharpLanguage(object): - def test_specs(self, config, travis): - return [config.job_spec('tools/run_tests/run_csharp.sh', None)] + assemblies = ['Grpc.Core.Tests', + 'Grpc.Examples.Tests', + 'Grpc.IntegrationTesting'] + return [config.job_spec(['tools/run_tests/run_csharp.sh', assembly], + None, shortname=assembly) + for assembly in assemblies ] def make_targets(self): return ['grpc_csharp_ext'] From e79e2f54e82a4a59ae858c9a04690dea69c90060 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Thu, 23 Apr 2015 16:13:31 -0700 Subject: [PATCH 08/19] adding csharp tests to travis --- .travis.yml | 7 +++++++ tools/run_tests/build_csharp.sh | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7d8634506c3..f1839ac174a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,19 @@ language: cpp before_install: - sudo add-apt-repository ppa:yjwong/gflags -y - sudo add-apt-repository ppa:h-rayflood/llvm -y + - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF + - echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list + - echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list - sudo apt-get update -qq - sudo apt-get install -qq libgtest-dev libgflags-dev python-virtualenv clang-3.5 - sudo pip install cpp-coveralls mako simplejson + - sudo apt-get install -qq mono-devel nunit + - wget www.nuget.org/NuGet.exe -O nuget.exe env: global: - RUBY_VERSION=2.1 - COVERALLS_PARALLEL=true + - NUGET="mono nuget.exe" matrix: - CONFIG=opt TEST=sanity - CONFIG=dbg TEST=c @@ -18,6 +24,7 @@ env: - CONFIG=opt TEST=node - CONFIG=opt TEST=ruby - CONFIG=opt TEST=python + - CONFIG=opt TEST=csharp - CONFIG=gcov TEST=c - CONFIG=gcov TEST=c++ - USE_GCC=4.4 CONFIG=opt TEST=build diff --git a/tools/run_tests/build_csharp.sh b/tools/run_tests/build_csharp.sh index 546e88db1c8..eae7bd50405 100755 --- a/tools/run_tests/build_csharp.sh +++ b/tools/run_tests/build_csharp.sh @@ -42,4 +42,9 @@ cd $(dirname $0)/../.. root=`pwd` +if [ -n "$NUGET" ] +then + $NUGET restore src/csharp/Grpc.sln +fi + xbuild /p:Configuration=$MSBUILD_CONFIG src/csharp/Grpc.sln From d896fa5640a7b43fd8bb289ff3fe5cd67fbf3bc1 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 24 Apr 2015 14:30:09 -0700 Subject: [PATCH 09/19] Remove some useless lines in the Makefile --- Makefile | 776 ++++++++++++++++++------------------ templates/Makefile.template | 2 +- 2 files changed, 389 insertions(+), 389 deletions(-) diff --git a/Makefile b/Makefile index 3e7930b9c36..e8ab321ff75 100644 --- a/Makefile +++ b/Makefile @@ -3101,41 +3101,41 @@ ifneq ($(NO_DEPS),true) -include $(LIBGPR_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/src/core/support/alloc.o: -$(OBJDIR)/$(CONFIG)/src/core/support/cancellable.o: -$(OBJDIR)/$(CONFIG)/src/core/support/cmdline.o: -$(OBJDIR)/$(CONFIG)/src/core/support/cpu_iphone.o: -$(OBJDIR)/$(CONFIG)/src/core/support/cpu_linux.o: -$(OBJDIR)/$(CONFIG)/src/core/support/cpu_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/support/cpu_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/support/env_linux.o: -$(OBJDIR)/$(CONFIG)/src/core/support/env_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/support/env_win32.o: -$(OBJDIR)/$(CONFIG)/src/core/support/file.o: -$(OBJDIR)/$(CONFIG)/src/core/support/file_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/support/file_win32.o: -$(OBJDIR)/$(CONFIG)/src/core/support/histogram.o: -$(OBJDIR)/$(CONFIG)/src/core/support/host_port.o: -$(OBJDIR)/$(CONFIG)/src/core/support/log.o: -$(OBJDIR)/$(CONFIG)/src/core/support/log_android.o: -$(OBJDIR)/$(CONFIG)/src/core/support/log_linux.o: -$(OBJDIR)/$(CONFIG)/src/core/support/log_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/support/log_win32.o: -$(OBJDIR)/$(CONFIG)/src/core/support/murmur_hash.o: -$(OBJDIR)/$(CONFIG)/src/core/support/slice.o: -$(OBJDIR)/$(CONFIG)/src/core/support/slice_buffer.o: -$(OBJDIR)/$(CONFIG)/src/core/support/string.o: -$(OBJDIR)/$(CONFIG)/src/core/support/string_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/support/string_win32.o: -$(OBJDIR)/$(CONFIG)/src/core/support/sync.o: -$(OBJDIR)/$(CONFIG)/src/core/support/sync_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/support/sync_win32.o: -$(OBJDIR)/$(CONFIG)/src/core/support/thd.o: -$(OBJDIR)/$(CONFIG)/src/core/support/thd_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/support/thd_win32.o: -$(OBJDIR)/$(CONFIG)/src/core/support/time.o: -$(OBJDIR)/$(CONFIG)/src/core/support/time_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/support/time_win32.o: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LIBGPR_TEST_UTIL_SRC = \ @@ -3160,7 +3160,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBGPR_TEST_UTIL_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/util/test_config.o: + LIBGRPC_SRC = \ @@ -3351,123 +3351,123 @@ ifneq ($(NO_DEPS),true) endif endif -$(OBJDIR)/$(CONFIG)/src/core/httpcli/format_request.o: -$(OBJDIR)/$(CONFIG)/src/core/httpcli/httpcli.o: -$(OBJDIR)/$(CONFIG)/src/core/httpcli/httpcli_security_connector.o: -$(OBJDIR)/$(CONFIG)/src/core/httpcli/parser.o: -$(OBJDIR)/$(CONFIG)/src/core/security/auth.o: -$(OBJDIR)/$(CONFIG)/src/core/security/base64.o: -$(OBJDIR)/$(CONFIG)/src/core/security/credentials.o: -$(OBJDIR)/$(CONFIG)/src/core/security/credentials_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/security/credentials_win32.o: -$(OBJDIR)/$(CONFIG)/src/core/security/google_default_credentials.o: -$(OBJDIR)/$(CONFIG)/src/core/security/json_token.o: -$(OBJDIR)/$(CONFIG)/src/core/security/secure_endpoint.o: -$(OBJDIR)/$(CONFIG)/src/core/security/secure_transport_setup.o: -$(OBJDIR)/$(CONFIG)/src/core/security/security_connector.o: -$(OBJDIR)/$(CONFIG)/src/core/security/server_secure_chttp2.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/init_secure.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/secure_channel_create.o: -$(OBJDIR)/$(CONFIG)/src/core/tsi/fake_transport_security.o: -$(OBJDIR)/$(CONFIG)/src/core/tsi/ssl_transport_security.o: -$(OBJDIR)/$(CONFIG)/src/core/tsi/transport_security.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/call_op_string.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/census_filter.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/channel_args.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/channel_stack.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/child_channel.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/client_channel.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/client_setup.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/connected_channel.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/http_client_filter.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/http_filter.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/http_server_filter.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/noop_filter.o: -$(OBJDIR)/$(CONFIG)/src/core/compression/algorithm.o: -$(OBJDIR)/$(CONFIG)/src/core/compression/message_compress.o: -$(OBJDIR)/$(CONFIG)/src/core/debug/trace.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm_heap.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/fd_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/iocp_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_kick.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_epoll.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/sockaddr_utils.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_linux.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_eventfd.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_nospecial.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_pipe.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/json/json.o: -$(OBJDIR)/$(CONFIG)/src/core/json/json_reader.o: -$(OBJDIR)/$(CONFIG)/src/core/json/json_string.o: -$(OBJDIR)/$(CONFIG)/src/core/json/json_writer.o: -$(OBJDIR)/$(CONFIG)/src/core/profiling/timers.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/census_init.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/census_log.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/census_rpc_stats.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/census_tracing.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/hash_table.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/window_stats.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_queue.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_reader.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/call.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/call_details.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/call_log_batch.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/channel.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/channel_create.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/client.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/completion_queue.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/event_string.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/init.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/lame_client.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/metadata_array.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/server.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/server_chttp2.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/server_create.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/surface_trace.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/alpn.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/bin_encoder.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_data.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_goaway.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_ping.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_rst_stream.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_settings.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_window_update.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_parser.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_table.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/huffsyms.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/status_conversion.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_encoder.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_map.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/timeout_encoding.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/varint.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2_transport.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/metadata.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/stream_op.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/transport.o: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LIBGRPC_TEST_UTIL_SRC = \ @@ -3517,17 +3517,17 @@ ifneq ($(NO_DEPS),true) endif endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_cert.o: -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_key.o: -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/test_root_cert.o: -$(OBJDIR)/$(CONFIG)/test/core/end2end/cq_verifier.o: -$(OBJDIR)/$(CONFIG)/test/core/iomgr/endpoint_tests.o: -$(OBJDIR)/$(CONFIG)/test/core/statistics/census_log_tests.o: -$(OBJDIR)/$(CONFIG)/test/core/util/grpc_profiler.o: -$(OBJDIR)/$(CONFIG)/test/core/util/parse_hexstring.o: -$(OBJDIR)/$(CONFIG)/test/core/util/port_posix.o: -$(OBJDIR)/$(CONFIG)/test/core/util/port_windows.o: -$(OBJDIR)/$(CONFIG)/test/core/util/slice_splitter.o: + + + + + + + + + + + LIBGRPC_TEST_UTIL_UNSECURE_SRC = \ @@ -3560,14 +3560,14 @@ ifneq ($(NO_DEPS),true) -include $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/cq_verifier.o: -$(OBJDIR)/$(CONFIG)/test/core/iomgr/endpoint_tests.o: -$(OBJDIR)/$(CONFIG)/test/core/statistics/census_log_tests.o: -$(OBJDIR)/$(CONFIG)/test/core/util/grpc_profiler.o: -$(OBJDIR)/$(CONFIG)/test/core/util/parse_hexstring.o: -$(OBJDIR)/$(CONFIG)/test/core/util/port_posix.o: -$(OBJDIR)/$(CONFIG)/test/core/util/port_windows.o: -$(OBJDIR)/$(CONFIG)/test/core/util/slice_splitter.o: + + + + + + + + LIBGRPC_UNSECURE_SRC = \ @@ -3712,104 +3712,104 @@ ifneq ($(NO_DEPS),true) -include $(LIBGRPC_UNSECURE_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/src/core/surface/init_unsecure.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/call_op_string.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/census_filter.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/channel_args.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/channel_stack.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/child_channel.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/client_channel.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/client_setup.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/connected_channel.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/http_client_filter.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/http_filter.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/http_server_filter.o: -$(OBJDIR)/$(CONFIG)/src/core/channel/noop_filter.o: -$(OBJDIR)/$(CONFIG)/src/core/compression/algorithm.o: -$(OBJDIR)/$(CONFIG)/src/core/compression/message_compress.o: -$(OBJDIR)/$(CONFIG)/src/core/debug/trace.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm_heap.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/fd_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/iocp_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_kick.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_epoll.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/sockaddr_utils.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_linux.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_windows.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_eventfd.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_nospecial.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_pipe.o: -$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_posix.o: -$(OBJDIR)/$(CONFIG)/src/core/json/json.o: -$(OBJDIR)/$(CONFIG)/src/core/json/json_reader.o: -$(OBJDIR)/$(CONFIG)/src/core/json/json_string.o: -$(OBJDIR)/$(CONFIG)/src/core/json/json_writer.o: -$(OBJDIR)/$(CONFIG)/src/core/profiling/timers.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/census_init.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/census_log.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/census_rpc_stats.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/census_tracing.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/hash_table.o: -$(OBJDIR)/$(CONFIG)/src/core/statistics/window_stats.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_queue.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_reader.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/call.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/call_details.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/call_log_batch.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/channel.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/channel_create.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/client.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/completion_queue.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/event_string.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/init.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/lame_client.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/metadata_array.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/server.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/server_chttp2.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/server_create.o: -$(OBJDIR)/$(CONFIG)/src/core/surface/surface_trace.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/alpn.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/bin_encoder.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_data.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_goaway.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_ping.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_rst_stream.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_settings.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_window_update.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_parser.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_table.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/huffsyms.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/status_conversion.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_encoder.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_map.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/timeout_encoding.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/varint.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2_transport.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/metadata.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/stream_op.o: -$(OBJDIR)/$(CONFIG)/src/core/transport/transport.o: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LIBGRPC++_SRC = \ @@ -3943,32 +3943,32 @@ ifneq ($(NO_DEPS),true) endif endif -$(OBJDIR)/$(CONFIG)/src/cpp/client/secure_credentials.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/secure_server_credentials.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/channel.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/channel_arguments.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/client_context.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/client_unary_call.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/create_channel.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/credentials.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/generic_stub.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/insecure_credentials.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/internal_stub.o: -$(OBJDIR)/$(CONFIG)/src/cpp/common/call.o: -$(OBJDIR)/$(CONFIG)/src/cpp/common/completion_queue.o: -$(OBJDIR)/$(CONFIG)/src/cpp/common/rpc_method.o: -$(OBJDIR)/$(CONFIG)/src/cpp/proto/proto_utils.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/async_generic_service.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/insecure_server_credentials.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/server.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/server_builder.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/server_context.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/server_credentials.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/thread_pool.o: -$(OBJDIR)/$(CONFIG)/src/cpp/util/byte_buffer.o: -$(OBJDIR)/$(CONFIG)/src/cpp/util/slice.o: -$(OBJDIR)/$(CONFIG)/src/cpp/util/status.o: -$(OBJDIR)/$(CONFIG)/src/cpp/util/time.o: + + + + + + + + + + + + + + + + + + + + + + + + + + LIBGRPC++_TEST_CONFIG_SRC = \ @@ -4017,7 +4017,7 @@ ifneq ($(NO_DEPS),true) endif endif -$(OBJDIR)/$(CONFIG)/test/cpp/util/test_config.o: + LIBGRPC++_TEST_UTIL_SRC = \ @@ -4188,30 +4188,30 @@ ifneq ($(NO_DEPS),true) -include $(LIBGRPC++_UNSECURE_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/src/cpp/client/channel.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/channel_arguments.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/client_context.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/client_unary_call.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/create_channel.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/credentials.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/generic_stub.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/insecure_credentials.o: -$(OBJDIR)/$(CONFIG)/src/cpp/client/internal_stub.o: -$(OBJDIR)/$(CONFIG)/src/cpp/common/call.o: -$(OBJDIR)/$(CONFIG)/src/cpp/common/completion_queue.o: -$(OBJDIR)/$(CONFIG)/src/cpp/common/rpc_method.o: -$(OBJDIR)/$(CONFIG)/src/cpp/proto/proto_utils.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/async_generic_service.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/insecure_server_credentials.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/server.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/server_builder.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/server_context.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/server_credentials.o: -$(OBJDIR)/$(CONFIG)/src/cpp/server/thread_pool.o: -$(OBJDIR)/$(CONFIG)/src/cpp/util/byte_buffer.o: -$(OBJDIR)/$(CONFIG)/src/cpp/util/slice.o: -$(OBJDIR)/$(CONFIG)/src/cpp/util/status.o: -$(OBJDIR)/$(CONFIG)/src/cpp/util/time.o: + + + + + + + + + + + + + + + + + + + + + + + + LIBGRPC_PLUGIN_SUPPORT_SRC = \ @@ -4250,10 +4250,10 @@ ifneq ($(NO_DEPS),true) -include $(LIBGRPC_PLUGIN_SUPPORT_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/src/compiler/cpp_generator.o: -$(OBJDIR)/$(CONFIG)/src/compiler/objective_c_generator.o: -$(OBJDIR)/$(CONFIG)/src/compiler/python_generator.o: -$(OBJDIR)/$(CONFIG)/src/compiler/ruby_generator.o: + + + + LIBINTEROP_CLIENT_HELPER_SRC = \ @@ -4302,7 +4302,7 @@ ifneq ($(NO_DEPS),true) endif endif -$(OBJDIR)/$(CONFIG)/test/cpp/interop/client_helper.o: + LIBINTEROP_CLIENT_MAIN_SRC = \ @@ -4408,7 +4408,7 @@ ifneq ($(NO_DEPS),true) endif endif -$(OBJDIR)/$(CONFIG)/test/cpp/interop/server_helper.o: + LIBINTEROP_SERVER_MAIN_SRC = \ @@ -4646,7 +4646,7 @@ ifneq ($(NO_DEPS),true) endif endif -$(OBJDIR)/$(CONFIG)/src/csharp/ext/grpc_csharp_ext.o: + LIBEND2END_FIXTURE_CHTTP2_FAKE_SECURITY_SRC = \ @@ -4685,7 +4685,7 @@ ifneq ($(NO_DEPS),true) endif endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_fake_security.o: + LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_SRC = \ @@ -4710,7 +4710,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_fullstack.o: + LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_UDS_SRC = \ @@ -4735,7 +4735,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_UDS_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_fullstack_uds.o: + LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_FULLSTACK_SRC = \ @@ -4774,7 +4774,7 @@ ifneq ($(NO_DEPS),true) endif endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.o: + LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_SRC = \ @@ -4813,7 +4813,7 @@ ifneq ($(NO_DEPS),true) endif endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.o: + LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_SRC = \ @@ -4838,7 +4838,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_socket_pair.o: + LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_SRC = \ @@ -4863,7 +4863,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_socket_pair_one_byte_at_a_time.o: + LIBEND2END_TEST_BAD_HOSTNAME_SRC = \ @@ -4888,7 +4888,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_BAD_HOSTNAME_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/bad_hostname.o: + LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_SRC = \ @@ -4913,7 +4913,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept.o: + LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_SRC = \ @@ -4938,7 +4938,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept_and_writes_closed.o: + LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_LEGACY_SRC = \ @@ -4963,7 +4963,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept_and_writes_closed_legacy.o: + LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_LEGACY_SRC = \ @@ -4988,7 +4988,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept_legacy.o: + LIBEND2END_TEST_CANCEL_AFTER_INVOKE_SRC = \ @@ -5013,7 +5013,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CANCEL_AFTER_INVOKE_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_invoke.o: + LIBEND2END_TEST_CANCEL_AFTER_INVOKE_LEGACY_SRC = \ @@ -5038,7 +5038,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CANCEL_AFTER_INVOKE_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_invoke_legacy.o: + LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_SRC = \ @@ -5063,7 +5063,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_before_invoke.o: + LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_LEGACY_SRC = \ @@ -5088,7 +5088,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_before_invoke_legacy.o: + LIBEND2END_TEST_CANCEL_IN_A_VACUUM_SRC = \ @@ -5113,7 +5113,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CANCEL_IN_A_VACUUM_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_in_a_vacuum.o: + LIBEND2END_TEST_CANCEL_IN_A_VACUUM_LEGACY_SRC = \ @@ -5138,7 +5138,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CANCEL_IN_A_VACUUM_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_in_a_vacuum_legacy.o: + LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_SRC = \ @@ -5163,7 +5163,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/census_simple_request.o: + LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_LEGACY_SRC = \ @@ -5188,7 +5188,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/census_simple_request_legacy.o: + LIBEND2END_TEST_DISAPPEARING_SERVER_SRC = \ @@ -5213,7 +5213,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_DISAPPEARING_SERVER_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/disappearing_server.o: + LIBEND2END_TEST_DISAPPEARING_SERVER_LEGACY_SRC = \ @@ -5238,7 +5238,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_DISAPPEARING_SERVER_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/disappearing_server_legacy.o: + LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_SRC = \ @@ -5263,7 +5263,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.o: + LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_LEGACY_SRC = \ @@ -5288,7 +5288,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls_legacy.o: + LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_SRC = \ @@ -5313,7 +5313,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_tags.o: + LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_LEGACY_SRC = \ @@ -5338,7 +5338,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_tags_legacy.o: + LIBEND2END_TEST_EMPTY_BATCH_SRC = \ @@ -5363,7 +5363,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_EMPTY_BATCH_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/empty_batch.o: + LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_SRC = \ @@ -5388,7 +5388,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/graceful_server_shutdown.o: + LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_LEGACY_SRC = \ @@ -5413,7 +5413,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/graceful_server_shutdown_legacy.o: + LIBEND2END_TEST_INVOKE_LARGE_REQUEST_SRC = \ @@ -5438,7 +5438,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_INVOKE_LARGE_REQUEST_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/invoke_large_request.o: + LIBEND2END_TEST_INVOKE_LARGE_REQUEST_LEGACY_SRC = \ @@ -5463,7 +5463,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_INVOKE_LARGE_REQUEST_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/invoke_large_request_legacy.o: + LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_SRC = \ @@ -5488,7 +5488,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/max_concurrent_streams.o: + LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_LEGACY_SRC = \ @@ -5513,7 +5513,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/max_concurrent_streams_legacy.o: + LIBEND2END_TEST_NO_OP_SRC = \ @@ -5538,7 +5538,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_NO_OP_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/no_op.o: + LIBEND2END_TEST_NO_OP_LEGACY_SRC = \ @@ -5563,7 +5563,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_NO_OP_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/no_op_legacy.o: + LIBEND2END_TEST_PING_PONG_STREAMING_SRC = \ @@ -5588,7 +5588,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_PING_PONG_STREAMING_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/ping_pong_streaming.o: + LIBEND2END_TEST_PING_PONG_STREAMING_LEGACY_SRC = \ @@ -5613,7 +5613,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_PING_PONG_STREAMING_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/ping_pong_streaming_legacy.o: + LIBEND2END_TEST_REGISTERED_CALL_SRC = \ @@ -5638,7 +5638,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REGISTERED_CALL_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/registered_call.o: + LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_SRC = \ @@ -5663,7 +5663,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_binary_metadata_and_payload.o: + LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_LEGACY_SRC = \ @@ -5688,7 +5688,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_binary_metadata_and_payload_legacy.o: + LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_SRC = \ @@ -5713,7 +5713,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_metadata_and_payload.o: + LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_LEGACY_SRC = \ @@ -5738,7 +5738,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_metadata_and_payload_legacy.o: + LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_SRC = \ @@ -5763,7 +5763,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_payload.o: + LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_LEGACY_SRC = \ @@ -5788,7 +5788,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_payload_legacy.o: + LIBEND2END_TEST_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_LEGACY_SRC = \ @@ -5813,7 +5813,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload_legacy.o: + LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_SRC = \ @@ -5838,7 +5838,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_large_metadata.o: + LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_LEGACY_SRC = \ @@ -5863,7 +5863,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_large_metadata_legacy.o: + LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_SRC = \ @@ -5888,7 +5888,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_payload.o: + LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_LEGACY_SRC = \ @@ -5913,7 +5913,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_payload_legacy.o: + LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_SRC = \ @@ -5938,7 +5938,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_delayed_request.o: + LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_LEGACY_SRC = \ @@ -5963,7 +5963,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_delayed_request_legacy.o: + LIBEND2END_TEST_SIMPLE_REQUEST_SRC = \ @@ -5988,7 +5988,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_SIMPLE_REQUEST_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_request.o: + LIBEND2END_TEST_SIMPLE_REQUEST_LEGACY_SRC = \ @@ -6013,7 +6013,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_SIMPLE_REQUEST_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_request_legacy.o: + LIBEND2END_TEST_THREAD_STRESS_SRC = \ @@ -6038,7 +6038,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_THREAD_STRESS_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/thread_stress.o: + LIBEND2END_TEST_THREAD_STRESS_LEGACY_SRC = \ @@ -6063,7 +6063,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_THREAD_STRESS_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/thread_stress_legacy.o: + LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_SRC = \ @@ -6088,7 +6088,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/writes_done_hangs_with_pending_read.o: + LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_LEGACY_SRC = \ @@ -6113,7 +6113,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_LEGACY_OBJS:.o=.dep) endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/writes_done_hangs_with_pending_read_legacy.o: + LIBEND2END_CERTS_SRC = \ @@ -6154,9 +6154,9 @@ ifneq ($(NO_DEPS),true) endif endif -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/test_root_cert.o: -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_cert.o: -$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_key.o: + + + diff --git a/templates/Makefile.template b/templates/Makefile.template index 9ca55f4f246..f78639b240d 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1210,7 +1210,7 @@ endif % endif % for src in lib.src: -% if not proto_re.match(src): +% if not proto_re.match(src) and any(proto_re.match(src2) for src2 in lib.src): $(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: \ % for src2 in lib.src: % if proto_re.match(src2): From 2660ebcff0caaf426f2dec8682316d84b7817ecb Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 24 Apr 2015 14:31:30 -0700 Subject: [PATCH 10/19] Actually remove them --- Makefile | 500 +----------------------------------- templates/Makefile.template | 2 - 2 files changed, 4 insertions(+), 498 deletions(-) diff --git a/Makefile b/Makefile index e8ab321ff75..ea4c50f237e 100644 --- a/Makefile +++ b/Makefile @@ -3102,42 +3102,6 @@ ifneq ($(NO_DEPS),true) endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LIBGPR_TEST_UTIL_SRC = \ test/core/util/test_config.c \ @@ -3161,8 +3125,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBGRPC_SRC = \ src/core/httpcli/format_request.c \ src/core/httpcli/httpcli.c \ @@ -3352,124 +3314,6 @@ endif endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LIBGRPC_TEST_UTIL_SRC = \ test/core/end2end/data/server1_cert.c \ test/core/end2end/data/server1_key.c \ @@ -3518,18 +3362,6 @@ endif endif - - - - - - - - - - - - LIBGRPC_TEST_UTIL_UNSECURE_SRC = \ test/core/end2end/cq_verifier.c \ test/core/iomgr/endpoint_tests.c \ @@ -3561,15 +3393,6 @@ ifneq ($(NO_DEPS),true) endif - - - - - - - - - LIBGRPC_UNSECURE_SRC = \ src/core/surface/init_unsecure.c \ src/core/channel/call_op_string.c \ @@ -3713,105 +3536,6 @@ ifneq ($(NO_DEPS),true) endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LIBGRPC++_SRC = \ src/cpp/client/secure_credentials.cc \ src/cpp/server/secure_server_credentials.cc \ @@ -3944,33 +3668,6 @@ endif endif - - - - - - - - - - - - - - - - - - - - - - - - - - - LIBGRPC++_TEST_CONFIG_SRC = \ test/cpp/util/test_config.cc \ @@ -4018,8 +3715,6 @@ endif endif - - LIBGRPC++_TEST_UTIL_SRC = \ $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc \ $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc \ @@ -4069,13 +3764,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBGRPC++_TEST_UTIL_OBJS:.o=.dep) endif endif - - - - -$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc -$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc - +$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc LIBGRPC++_UNSECURE_SRC = \ src/cpp/client/channel.cc \ @@ -4189,31 +3878,6 @@ ifneq ($(NO_DEPS),true) endif - - - - - - - - - - - - - - - - - - - - - - - - - LIBGRPC_PLUGIN_SUPPORT_SRC = \ src/compiler/cpp_generator.cc \ src/compiler/objective_c_generator.cc \ @@ -4251,11 +3915,6 @@ ifneq ($(NO_DEPS),true) endif - - - - - LIBINTEROP_CLIENT_HELPER_SRC = \ test/cpp/interop/client_helper.cc \ @@ -4303,8 +3962,6 @@ endif endif - - LIBINTEROP_CLIENT_MAIN_SRC = \ $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc \ $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc \ @@ -4354,13 +4011,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBINTEROP_CLIENT_MAIN_OBJS:.o=.dep) endif endif - - - - -$(OBJDIR)/$(CONFIG)/test/cpp/interop/client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc -$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc - +$(OBJDIR)/$(CONFIG)/test/cpp/interop/client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc LIBINTEROP_SERVER_HELPER_SRC = \ test/cpp/interop/server_helper.cc \ @@ -4409,8 +4060,6 @@ endif endif - - LIBINTEROP_SERVER_MAIN_SRC = \ $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc \ $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc \ @@ -4459,13 +4108,8 @@ ifneq ($(NO_DEPS),true) -include $(LIBINTEROP_SERVER_MAIN_OBJS:.o=.dep) endif endif - - - - $(OBJDIR)/$(CONFIG)/test/cpp/interop/server.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc - LIBPUBSUB_CLIENT_LIB_SRC = \ $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc \ $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc \ @@ -4515,13 +4159,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBPUBSUB_CLIENT_LIB_OBJS:.o=.dep) endif endif - - - - -$(OBJDIR)/$(CONFIG)/examples/pubsub/publisher.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc -$(OBJDIR)/$(CONFIG)/examples/pubsub/subscriber.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc - +$(OBJDIR)/$(CONFIG)/examples/pubsub/publisher.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc$(OBJDIR)/$(CONFIG)/examples/pubsub/subscriber.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc LIBQPS_SRC = \ $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc \ @@ -4576,17 +4214,7 @@ ifneq ($(NO_DEPS),true) -include $(LIBQPS_OBJS:.o=.dep) endif endif - - -$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc -$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc -$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc -$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc -$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc -$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc -$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc -$(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc - +$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc LIBGRPC_CSHARP_EXT_SRC = \ src/csharp/ext/grpc_csharp_ext.c \ @@ -4647,8 +4275,6 @@ endif endif - - LIBEND2END_FIXTURE_CHTTP2_FAKE_SECURITY_SRC = \ test/core/end2end/fixtures/chttp2_fake_security.c \ @@ -4686,8 +4312,6 @@ endif endif - - LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_SRC = \ test/core/end2end/fixtures/chttp2_fullstack.c \ @@ -4711,8 +4335,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_UDS_SRC = \ test/core/end2end/fixtures/chttp2_fullstack_uds.c \ @@ -4736,8 +4358,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_FULLSTACK_SRC = \ test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.c \ @@ -4775,8 +4395,6 @@ endif endif - - LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_SRC = \ test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c \ @@ -4814,8 +4432,6 @@ endif endif - - LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_SRC = \ test/core/end2end/fixtures/chttp2_socket_pair.c \ @@ -4839,8 +4455,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_SRC = \ test/core/end2end/fixtures/chttp2_socket_pair_one_byte_at_a_time.c \ @@ -4864,8 +4478,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_BAD_HOSTNAME_SRC = \ test/core/end2end/tests/bad_hostname.c \ @@ -4889,8 +4501,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_SRC = \ test/core/end2end/tests/cancel_after_accept.c \ @@ -4914,8 +4524,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_SRC = \ test/core/end2end/tests/cancel_after_accept_and_writes_closed.c \ @@ -4939,8 +4547,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_LEGACY_SRC = \ test/core/end2end/tests/cancel_after_accept_and_writes_closed_legacy.c \ @@ -4964,8 +4570,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_LEGACY_SRC = \ test/core/end2end/tests/cancel_after_accept_legacy.c \ @@ -4989,8 +4593,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CANCEL_AFTER_INVOKE_SRC = \ test/core/end2end/tests/cancel_after_invoke.c \ @@ -5014,8 +4616,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CANCEL_AFTER_INVOKE_LEGACY_SRC = \ test/core/end2end/tests/cancel_after_invoke_legacy.c \ @@ -5039,8 +4639,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_SRC = \ test/core/end2end/tests/cancel_before_invoke.c \ @@ -5064,8 +4662,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_LEGACY_SRC = \ test/core/end2end/tests/cancel_before_invoke_legacy.c \ @@ -5089,8 +4685,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CANCEL_IN_A_VACUUM_SRC = \ test/core/end2end/tests/cancel_in_a_vacuum.c \ @@ -5114,8 +4708,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CANCEL_IN_A_VACUUM_LEGACY_SRC = \ test/core/end2end/tests/cancel_in_a_vacuum_legacy.c \ @@ -5139,8 +4731,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_SRC = \ test/core/end2end/tests/census_simple_request.c \ @@ -5164,8 +4754,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_LEGACY_SRC = \ test/core/end2end/tests/census_simple_request_legacy.c \ @@ -5189,8 +4777,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_DISAPPEARING_SERVER_SRC = \ test/core/end2end/tests/disappearing_server.c \ @@ -5214,8 +4800,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_DISAPPEARING_SERVER_LEGACY_SRC = \ test/core/end2end/tests/disappearing_server_legacy.c \ @@ -5239,8 +4823,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_SRC = \ test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c \ @@ -5264,8 +4846,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_LEGACY_SRC = \ test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls_legacy.c \ @@ -5289,8 +4869,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_SRC = \ test/core/end2end/tests/early_server_shutdown_finishes_tags.c \ @@ -5314,8 +4892,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_LEGACY_SRC = \ test/core/end2end/tests/early_server_shutdown_finishes_tags_legacy.c \ @@ -5339,8 +4915,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_EMPTY_BATCH_SRC = \ test/core/end2end/tests/empty_batch.c \ @@ -5364,8 +4938,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_SRC = \ test/core/end2end/tests/graceful_server_shutdown.c \ @@ -5389,8 +4961,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_LEGACY_SRC = \ test/core/end2end/tests/graceful_server_shutdown_legacy.c \ @@ -5414,8 +4984,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_INVOKE_LARGE_REQUEST_SRC = \ test/core/end2end/tests/invoke_large_request.c \ @@ -5439,8 +5007,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_INVOKE_LARGE_REQUEST_LEGACY_SRC = \ test/core/end2end/tests/invoke_large_request_legacy.c \ @@ -5464,8 +5030,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_SRC = \ test/core/end2end/tests/max_concurrent_streams.c \ @@ -5489,8 +5053,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_LEGACY_SRC = \ test/core/end2end/tests/max_concurrent_streams_legacy.c \ @@ -5514,8 +5076,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_NO_OP_SRC = \ test/core/end2end/tests/no_op.c \ @@ -5539,8 +5099,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_NO_OP_LEGACY_SRC = \ test/core/end2end/tests/no_op_legacy.c \ @@ -5564,8 +5122,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_PING_PONG_STREAMING_SRC = \ test/core/end2end/tests/ping_pong_streaming.c \ @@ -5589,8 +5145,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_PING_PONG_STREAMING_LEGACY_SRC = \ test/core/end2end/tests/ping_pong_streaming_legacy.c \ @@ -5614,8 +5168,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REGISTERED_CALL_SRC = \ test/core/end2end/tests/registered_call.c \ @@ -5639,8 +5191,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_SRC = \ test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c \ @@ -5664,8 +5214,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_LEGACY_SRC = \ test/core/end2end/tests/request_response_with_binary_metadata_and_payload_legacy.c \ @@ -5689,8 +5237,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_SRC = \ test/core/end2end/tests/request_response_with_metadata_and_payload.c \ @@ -5714,8 +5260,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_LEGACY_SRC = \ test/core/end2end/tests/request_response_with_metadata_and_payload_legacy.c \ @@ -5739,8 +5283,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_SRC = \ test/core/end2end/tests/request_response_with_payload.c \ @@ -5764,8 +5306,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_LEGACY_SRC = \ test/core/end2end/tests/request_response_with_payload_legacy.c \ @@ -5789,8 +5329,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_LEGACY_SRC = \ test/core/end2end/tests/request_response_with_trailing_metadata_and_payload_legacy.c \ @@ -5814,8 +5352,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_SRC = \ test/core/end2end/tests/request_with_large_metadata.c \ @@ -5839,8 +5375,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_LEGACY_SRC = \ test/core/end2end/tests/request_with_large_metadata_legacy.c \ @@ -5864,8 +5398,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_SRC = \ test/core/end2end/tests/request_with_payload.c \ @@ -5889,8 +5421,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_LEGACY_SRC = \ test/core/end2end/tests/request_with_payload_legacy.c \ @@ -5914,8 +5444,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_SRC = \ test/core/end2end/tests/simple_delayed_request.c \ @@ -5939,8 +5467,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_LEGACY_SRC = \ test/core/end2end/tests/simple_delayed_request_legacy.c \ @@ -5964,8 +5490,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_SIMPLE_REQUEST_SRC = \ test/core/end2end/tests/simple_request.c \ @@ -5989,8 +5513,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_SIMPLE_REQUEST_LEGACY_SRC = \ test/core/end2end/tests/simple_request_legacy.c \ @@ -6014,8 +5536,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_THREAD_STRESS_SRC = \ test/core/end2end/tests/thread_stress.c \ @@ -6039,8 +5559,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_THREAD_STRESS_LEGACY_SRC = \ test/core/end2end/tests/thread_stress_legacy.c \ @@ -6064,8 +5582,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_SRC = \ test/core/end2end/tests/writes_done_hangs_with_pending_read.c \ @@ -6089,8 +5605,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_LEGACY_SRC = \ test/core/end2end/tests/writes_done_hangs_with_pending_read_legacy.c \ @@ -6114,8 +5628,6 @@ ifneq ($(NO_DEPS),true) endif - - LIBEND2END_CERTS_SRC = \ test/core/end2end/data/test_root_cert.c \ test/core/end2end/data/server1_cert.c \ @@ -6156,10 +5668,6 @@ endif - - - - # All of the test targets, and protoc plugins diff --git a/templates/Makefile.template b/templates/Makefile.template index f78639b240d..cfab872819c 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1208,7 +1208,6 @@ endif % if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check': endif % endif - % for src in lib.src: % if not proto_re.match(src) and any(proto_re.match(src2) for src2 in lib.src): $(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: \ @@ -1218,7 +1217,6 @@ $(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: \ % endif % endfor % endif - % endfor From 04f8156f658b06166f1e0111a9da0245b03a1de6 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 24 Apr 2015 14:34:30 -0700 Subject: [PATCH 11/19] Cleanup --- Makefile | 25 ++++++++++++++++++++----- templates/Makefile.template | 7 +------ 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index ea4c50f237e..d735b3b37f4 100644 --- a/Makefile +++ b/Makefile @@ -3764,7 +3764,9 @@ ifneq ($(NO_DEPS),true) -include $(LIBGRPC++_TEST_UTIL_OBJS:.o=.dep) endif endif -$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc + LIBGRPC++_UNSECURE_SRC = \ src/cpp/client/channel.cc \ @@ -4011,7 +4013,9 @@ ifneq ($(NO_DEPS),true) -include $(LIBINTEROP_CLIENT_MAIN_OBJS:.o=.dep) endif endif -$(OBJDIR)/$(CONFIG)/test/cpp/interop/client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/interop/client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc + LIBINTEROP_SERVER_HELPER_SRC = \ test/cpp/interop/server_helper.cc \ @@ -4108,7 +4112,8 @@ ifneq ($(NO_DEPS),true) -include $(LIBINTEROP_SERVER_MAIN_OBJS:.o=.dep) endif endif -$(OBJDIR)/$(CONFIG)/test/cpp/interop/server.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/interop/server.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc + LIBPUBSUB_CLIENT_LIB_SRC = \ $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc \ @@ -4159,7 +4164,9 @@ ifneq ($(NO_DEPS),true) -include $(LIBPUBSUB_CLIENT_LIB_OBJS:.o=.dep) endif endif -$(OBJDIR)/$(CONFIG)/examples/pubsub/publisher.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc$(OBJDIR)/$(CONFIG)/examples/pubsub/subscriber.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/examples/pubsub/publisher.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/examples/pubsub/subscriber.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc + LIBQPS_SRC = \ $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc \ @@ -4214,7 +4221,15 @@ ifneq ($(NO_DEPS),true) -include $(LIBQPS_OBJS:.o=.dep) endif endif -$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc +$(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc + LIBGRPC_CSHARP_EXT_SRC = \ src/csharp/ext/grpc_csharp_ext.c \ diff --git a/templates/Makefile.template b/templates/Makefile.template index cfab872819c..ab137a86577 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1210,12 +1210,7 @@ endif % endif % for src in lib.src: % if not proto_re.match(src) and any(proto_re.match(src2) for src2 in lib.src): -$(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: \ -% for src2 in lib.src: -% if proto_re.match(src2): - ${proto_to_cc(src2)}\ -% endif -% endfor +$(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: ${' '.join(proto_to_cc(src2) for src2 in lib.src if proto_re.match(src2))} % endif % endfor From 0dee28e95a4b1b7169320e05a4378af07d58c838 Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Fri, 24 Apr 2015 16:10:00 -0700 Subject: [PATCH 12/19] Renamed make variables for protoc presence and version checking. --- Makefile | 10 +++++----- templates/Makefile.template | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 8cd71600ade..4d18c4ad183 100644 --- a/Makefile +++ b/Makefile @@ -348,8 +348,8 @@ OPENSSL_ALPN_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/ope ZLIB_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/zlib.c -lz $(LDFLAGS) PERFTOOLS_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/perftools.c -lprofiler $(LDFLAGS) PROTOBUF_CHECK_CMD = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/protobuf.cc -lprotobuf $(LDFLAGS) -PROTOC_CMD = which protoc > /dev/null -PROTOC_CHECK_CMD = protoc --version | grep -q libprotoc.3 +PROTOC_CHECK_CMD = which protoc > /dev/null +PROTOC_CHECK_VERSION_CMD = protoc --version | grep -q libprotoc.3 ifeq ($(OPENSSL_REQUIRES_DL),true) OPENSSL_ALPN_CHECK_CMD += -ldl @@ -375,9 +375,9 @@ HAS_SYSTEM_ZLIB = false HAS_SYSTEM_PROTOBUF = false endif -HAS_PROTOC = $(shell $(PROTOC_CMD) 2> /dev/null && echo true || echo false) +HAS_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false) ifeq ($(HAS_PROTOC),true) -HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false) +HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_VERSION_CMD) 2> /dev/null && echo true || echo false) else HAS_VALID_PROTOC = false endif @@ -1212,7 +1212,7 @@ run_dep_checks: $(ZLIB_CHECK_CMD) || true $(PERFTOOLS_CHECK_CMD) || true $(PROTOBUF_CHECK_CMD) || true - $(PROTOC_CHECK_CMD) || true + $(PROTOC_CHECK_VERSION_CMD) || true $(LIBDIR)/$(CONFIG)/zlib/libz.a: $(E) "[MAKE] Building zlib" diff --git a/templates/Makefile.template b/templates/Makefile.template index 9ca55f4f246..21c29454c3e 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -362,8 +362,8 @@ OPENSSL_ALPN_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/ope ZLIB_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/zlib.c -lz $(LDFLAGS) PERFTOOLS_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/perftools.c -lprofiler $(LDFLAGS) PROTOBUF_CHECK_CMD = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/protobuf.cc -lprotobuf $(LDFLAGS) -PROTOC_CMD = which protoc > /dev/null -PROTOC_CHECK_CMD = protoc --version | grep -q libprotoc.3 +PROTOC_CHECK_CMD = which protoc > /dev/null +PROTOC_CHECK_VERSION_CMD = protoc --version | grep -q libprotoc.3 ifeq ($(OPENSSL_REQUIRES_DL),true) OPENSSL_ALPN_CHECK_CMD += -ldl @@ -389,9 +389,9 @@ HAS_SYSTEM_ZLIB = false HAS_SYSTEM_PROTOBUF = false endif -HAS_PROTOC = $(shell $(PROTOC_CMD) 2> /dev/null && echo true || echo false) +HAS_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false) ifeq ($(HAS_PROTOC),true) -HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false) +HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_VERSION_CMD) 2> /dev/null && echo true || echo false) else HAS_VALID_PROTOC = false endif @@ -587,7 +587,7 @@ run_dep_checks: $(ZLIB_CHECK_CMD) || true $(PERFTOOLS_CHECK_CMD) || true $(PROTOBUF_CHECK_CMD) || true - $(PROTOC_CHECK_CMD) || true + $(PROTOC_CHECK_VERSION_CMD) || true $(LIBDIR)/$(CONFIG)/zlib/libz.a: $(E) "[MAKE] Building zlib" From 49185a8f7865ff62f64338bfec944f31534842ae Mon Sep 17 00:00:00 2001 From: wkubiak Date: Mon, 27 Apr 2015 15:20:34 +0200 Subject: [PATCH 13/19] removed unused variables --- src/core/iomgr/resolve_address_windows.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/core/iomgr/resolve_address_windows.c b/src/core/iomgr/resolve_address_windows.c index ac31dadd9d7..9b416dfe8aa 100644 --- a/src/core/iomgr/resolve_address_windows.c +++ b/src/core/iomgr/resolve_address_windows.c @@ -65,7 +65,6 @@ grpc_resolved_addresses *grpc_blocking_resolve_address( int s; size_t i; grpc_resolved_addresses *addrs = NULL; - const gpr_timespec start_time = gpr_now(); /* parse name, splitting it into host and port parts */ gpr_split_host_port(name, &host, &port); @@ -108,9 +107,6 @@ grpc_resolved_addresses *grpc_blocking_resolve_address( } { - const gpr_timespec delay = gpr_time_sub(gpr_now(), start_time); - const int delay_ms = - delay.tv_sec * GPR_MS_PER_SEC + delay.tv_nsec / GPR_NS_PER_MS; for (i = 0; i < addrs->naddrs; i++) { char *buf; grpc_sockaddr_to_string(&buf, (struct sockaddr *)&addrs->addrs[i].addr, From 0d20f42c933902aadf4f56ebd8747ff5d70327c1 Mon Sep 17 00:00:00 2001 From: wkubiak Date: Mon, 27 Apr 2015 15:38:44 +0200 Subject: [PATCH 14/19] fix comparison between pointer and integer error --- src/core/iomgr/tcp_server_windows.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/iomgr/tcp_server_windows.c b/src/core/iomgr/tcp_server_windows.c index 6e10da97ccb..fe92846a716 100644 --- a/src/core/iomgr/tcp_server_windows.c +++ b/src/core/iomgr/tcp_server_windows.c @@ -192,7 +192,7 @@ static void start_accept(server_port *port) { } /* TODO(jtattermusch): probably a race here, we regularly get use-after-free on server shutdown */ - GPR_ASSERT(port->socket != 0xfeeefeee); + GPR_ASSERT(port->socket != (grpc_winsocket*)0xfeeefeee); success = port->AcceptEx(port->socket->socket, sock, port->addresses, 0, addrlen, addrlen, &bytes_received, &port->socket->read_info.overlapped); From a9274b89dc7f1c020a6820213472a235da66bb0f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 27 Apr 2015 07:54:37 -0700 Subject: [PATCH 15/19] Fix comment --- include/grpc/support/tls.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/grpc/support/tls.h b/include/grpc/support/tls.h index 1077fdec295..8dffd522559 100644 --- a/include/grpc/support/tls.h +++ b/include/grpc/support/tls.h @@ -44,7 +44,7 @@ Thread locals have type gpr_intptr. Declaring a thread local variable 'foo': - GPR_TLS_DECL(foo, initial_value); + GPR_TLS_DECL(foo); Thread locals always have static scope. Initializing a thread local (must be done at library initialization From 1be373cf1209db007dc6e05bee86ab7fbb96dd8c Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 27 Apr 2015 07:58:16 -0700 Subject: [PATCH 16/19] Stop kicking ourselves --- .../pollset_multipoller_with_poll_posix.c | 2 +- src/core/iomgr/pollset_posix.c | 28 +++++++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/core/iomgr/pollset_multipoller_with_poll_posix.c b/src/core/iomgr/pollset_multipoller_with_poll_posix.c index bcef7c35b5d..25b7cfda1a1 100644 --- a/src/core/iomgr/pollset_multipoller_with_poll_posix.c +++ b/src/core/iomgr/pollset_multipoller_with_poll_posix.c @@ -203,7 +203,7 @@ static int multipoll_with_poll_pollset_maybe_work( } static void multipoll_with_poll_pollset_kick(grpc_pollset *p) { - grpc_pollset_kick_kick(&p->kick_state); + grpc_pollset_force_kick(p); } static void multipoll_with_poll_pollset_destroy(grpc_pollset *pollset) { diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 03fd94f1364..60d0dad6d87 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -47,9 +47,11 @@ #include "src/core/iomgr/fd_posix.h" #include "src/core/iomgr/iomgr_internal.h" #include "src/core/iomgr/socket_utils_posix.h" +#include "src/core/profiling/timers.h" #include #include #include +#include #include static grpc_pollset g_backup_pollset; @@ -57,6 +59,8 @@ static int g_shutdown_backup_poller; static gpr_event g_backup_poller_done; static gpr_event g_backup_pollset_shutdown_done; +GPR_TLS_DECL(g_current_thread_poller); + static void backup_poller(void *p) { gpr_timespec delta = gpr_time_from_millis(100); gpr_timespec last_poll = gpr_now(); @@ -76,17 +80,21 @@ static void backup_poller(void *p) { } void grpc_pollset_kick(grpc_pollset *p) { - if (p->counter) { + if (gpr_tls_get(&g_current_thread_poller) != (gpr_intptr)p && p->counter) { p->vtable->kick(p); } } void grpc_pollset_force_kick(grpc_pollset *p) { - grpc_pollset_kick_kick(&p->kick_state); + if (gpr_tls_get(&g_current_thread_poller) != (gpr_intptr)p) { + grpc_pollset_kick_kick(&p->kick_state); + } } static void kick_using_pollset_kick(grpc_pollset *p) { - grpc_pollset_kick_kick(&p->kick_state); + if (gpr_tls_get(&g_current_thread_poller) != (gpr_intptr)p) { + grpc_pollset_kick_kick(&p->kick_state); + } } /* global state management */ @@ -96,6 +104,8 @@ grpc_pollset *grpc_backup_pollset(void) { return &g_backup_pollset; } void grpc_pollset_global_init(void) { gpr_thd_id id; + gpr_tls_init(&g_current_thread_poller); + /* Initialize kick fd state */ grpc_pollset_kick_global_init(); @@ -129,6 +139,8 @@ void grpc_pollset_global_shutdown(void) { /* destroy the kick pipes */ grpc_pollset_kick_global_destroy(); + + gpr_tls_destroy(&g_current_thread_poller); } /* main interface */ @@ -161,8 +173,8 @@ void grpc_pollset_del_fd(grpc_pollset *pollset, grpc_fd *fd) { int grpc_pollset_work(grpc_pollset *pollset, gpr_timespec deadline) { /* pollset->mu already held */ - gpr_timespec now; - now = gpr_now(); + gpr_timespec now = gpr_now(); + int r; if (gpr_time_cmp(now, deadline) > 0) { return 0; } @@ -172,7 +184,10 @@ int grpc_pollset_work(grpc_pollset *pollset, gpr_timespec deadline) { if (grpc_alarm_check(&pollset->mu, now, &deadline)) { return 1; } - return pollset->vtable->maybe_work(pollset, deadline, now, 1); + gpr_tls_set(&g_current_thread_poller, (gpr_intptr)pollset); + r = pollset->vtable->maybe_work(pollset, deadline, now, 1); + gpr_tls_set(&g_current_thread_poller, 0); + return r; } void grpc_pollset_shutdown(grpc_pollset *pollset, @@ -396,6 +411,7 @@ static int unary_poll_pollset_maybe_work(grpc_pollset *pollset, pfd[1].events = grpc_fd_begin_poll(fd, pollset, POLLIN, POLLOUT, &fd_watcher); r = poll(pfd, GPR_ARRAY_SIZE(pfd), timeout); + GRPC_TIMER_MARK(POLL_FINISHED, r); grpc_fd_end_poll(&fd_watcher); From 1fb99552b75e9b3fc1e391bc66049d1091128c5b Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 27 Apr 2015 08:55:08 -0700 Subject: [PATCH 17/19] Fix early shutdown: await client context deletion before channel deletion --- include/grpc++/client_context.h | 5 ++++- src/cpp/client/channel.cc | 2 +- src/cpp/client/channel.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h index 19630c9b544..a58e9872e60 100644 --- a/include/grpc++/client_context.h +++ b/include/grpc++/client_context.h @@ -35,6 +35,7 @@ #define GRPCXX_CLIENT_CONTEXT_H #include +#include #include #include @@ -126,9 +127,10 @@ class ClientContext { friend class ::grpc::ClientAsyncResponseReader; grpc_call* call() { return call_; } - void set_call(grpc_call* call) { + void set_call(grpc_call* call, const std::shared_ptr& channel) { GPR_ASSERT(call_ == nullptr); call_ = call; + channel_ = channel; } grpc_completion_queue* cq() { return cq_; } @@ -137,6 +139,7 @@ class ClientContext { grpc::string authority() { return authority_; } bool initial_metadata_received_; + std::shared_ptr channel_; grpc_call* call_; grpc_completion_queue* cq_; gpr_timespec deadline_; diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc index ba8882278f5..c541ddfb487 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel.cc @@ -71,7 +71,7 @@ Call Channel::CreateCall(const RpcMethod& method, ClientContext* context, : context->authority().c_str(), context->raw_deadline()); GRPC_TIMER_MARK(CALL_CREATED, c_call); - context->set_call(c_call); + context->set_call(c_call, shared_from_this()); return Call(c_call, this, cq); } diff --git a/src/cpp/client/channel.h b/src/cpp/client/channel.h index cd239247c82..46009d20bad 100644 --- a/src/cpp/client/channel.h +++ b/src/cpp/client/channel.h @@ -51,6 +51,7 @@ class Credentials; class StreamContextInterface; class Channel GRPC_FINAL : public GrpcLibrary, + public std::enable_shared_from_this, public ChannelInterface { public: Channel(const grpc::string& target, grpc_channel* c_channel); From 330f4c8c39c7d657a7724da0c0e21c339f865e2d Mon Sep 17 00:00:00 2001 From: Julien Boeuf Date: Mon, 27 Apr 2015 10:37:42 -0700 Subject: [PATCH 18/19] Fix includes for Boring SSL. --- src/core/tsi/ssl_transport_security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/tsi/ssl_transport_security.c b/src/core/tsi/ssl_transport_security.c index 018ddc44563..b7c2859a1c9 100644 --- a/src/core/tsi/ssl_transport_security.c +++ b/src/core/tsi/ssl_transport_security.c @@ -34,6 +34,7 @@ #include "src/core/tsi/ssl_transport_security.h" #include +#include #include #include From bf177c884fbf48159896b58dd21016c85f95f95a Mon Sep 17 00:00:00 2001 From: Masood Malekghassemi Date: Mon, 27 Apr 2015 12:14:38 -0700 Subject: [PATCH 19/19] Pass deadline to call details for batch calls --- src/core/surface/server.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/surface/server.c b/src/core/surface/server.c index e7719298701..3b129039bbf 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -1083,6 +1083,7 @@ static void begin_call(grpc_server *server, call_data *calld, &rc->data.batch.details->host_capacity, calld->host); cpstr(&rc->data.batch.details->method, &rc->data.batch.details->method_capacity, calld->path); + rc->data.batch.details->deadline = calld->deadline; grpc_call_set_completion_queue(calld->call, rc->data.batch.cq_bind); *rc->data.batch.call = calld->call; r->op = GRPC_IOREQ_RECV_INITIAL_METADATA;