diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-16 16:50:59 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-16 16:50:59 -0700 |
| commit | 47f18378b507a90ae971c9c9cb4d81a7643f8fe8 (patch) | |
| tree | e8fd527c3b08769821d79ea3a56570219457b654 /build.json | |
| parent | 1ada6ad8e57e9033f9cc9a6b0082e27a413e9584 (diff) | |
| parent | c9af31dad084f3fb58a7523e0bcf917a1d98cf3e (diff) | |
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Diffstat (limited to 'build.json')
| -rw-r--r-- | build.json | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/build.json b/build.json index 224aef4ac0..f7c933e4e5 100644 --- a/build.json +++ b/build.json @@ -40,6 +40,7 @@ "include/grpc++/config_protobuf.h", "include/grpc++/create_channel.h", "include/grpc++/credentials.h", + "include/grpc++/fixed_size_thread_pool.h", "include/grpc++/generic_stub.h", "include/grpc++/impl/call.h", "include/grpc++/impl/client_unary_call.h", @@ -69,8 +70,7 @@ ], "headers": [ "src/cpp/client/channel.h", - "src/cpp/common/create_auth_context.h", - "src/cpp/server/thread_pool.h" + "src/cpp/common/create_auth_context.h" ], "src": [ "src/cpp/client/channel.cc", @@ -87,12 +87,12 @@ "src/cpp/proto/proto_utils.cc", "src/cpp/server/async_generic_service.cc", "src/cpp/server/create_default_thread_pool.cc", + "src/cpp/server/fixed_size_thread_pool.cc", "src/cpp/server/insecure_server_credentials.cc", "src/cpp/server/server.cc", "src/cpp/server/server_builder.cc", "src/cpp/server/server_context.cc", "src/cpp/server/server_credentials.cc", - "src/cpp/server/thread_pool.cc", "src/cpp/util/byte_buffer.cc", "src/cpp/util/slice.cc", "src/cpp/util/status.cc", @@ -2057,6 +2057,21 @@ ] }, { + "name": "fixed_size_thread_pool_test", + "build": "test", + "language": "c++", + "src": [ + "test/cpp/server/fixed_size_thread_pool_test.cc" + ], + "deps": [ + "grpc_test_util", + "grpc++", + "grpc", + "gpr_test_util", + "gpr" + ] + }, + { "name": "generic_end2end_test", "build": "test", "language": "c++", @@ -2463,21 +2478,6 @@ ] }, { - "name": "thread_pool_test", - "build": "test", - "language": "c++", - "src": [ - "test/cpp/server/thread_pool_test.cc" - ], - "deps": [ - "grpc_test_util", - "grpc++", - "grpc", - "gpr_test_util", - "gpr" - ] - }, - { "name": "thread_stress_test", "build": "test", "language": "c++", |