50be893eba
Merge pull request #6915 from markdroth/filter_api
...
Implement C++ API for defining channel filters.
2016-08-05 15:11:18 -07:00
ca1558753a
Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split
2016-08-04 00:30:37 +02:00
e60ae9c967
deflake grpclb_test
2016-08-02 16:37:41 -07:00
85c1168d17
Merge remote-tracking branch 'upstream/master' into filter_api
2016-08-02 14:07:00 -07:00
18983f8e38
Merge pull request #7590 from vjpai/affinity_optional
...
Don't assert if we're not able to set CPU affinity
2016-08-02 10:28:08 -07:00
3ac6fc1b97
Merge branch 'filter_call_init_failure' into filter_api
2016-08-02 10:07:48 -07:00
4e7259dcaa
Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split
2016-08-02 18:32:05 +02:00
d9cee6f2ac
moar clang-format
2016-08-01 17:42:47 -07:00
87e06c84fd
Merge branch 'master' of github.com:grpc/grpc into grpclb_v0
2016-08-01 11:02:22 -07:00
96b7b52190
Fix exit condition
2016-08-01 09:33:38 -07:00
6e5c33c3e2
Don't assert if we're not able to set affinity for some reason
2016-07-30 02:56:46 -07:00
4166cb06ea
Addressed the rest of the PR comments
2016-07-29 14:38:25 -07:00
8302b123de
Merge branch 'v1.0.x' into manual-upmerge
...
Conflicts:
src/ruby/pb/test/client.rb
src/ruby/pb/test/server.rb
tools/dockerfile/test/php7_jessie_x64/Dockerfile
2016-07-29 22:48:16 +02:00
efef0d29c5
Merge pull request #7380 from nicolasnoble/no-c++11-threads
...
Avoid using certain C++11-isms with grpc::thread, as it's not necessarily std::thread.
2016-07-27 09:28:15 -07:00
bc0b08892f
Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split
...
Conflicts:
Makefile
2016-07-25 23:51:01 +02:00
cc961b6c5a
Merge pull request #7020 from rjshade/assert_not_expect
...
ASSERT vector size before directly accessing first element
2016-07-25 14:36:11 -07:00
b5fa72c89e
Merge pull request #7451 from y-zeng/seperate_generated_files
...
Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf
2016-07-25 14:32:51 -07:00
c326407379
Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split
2016-07-25 21:51:59 +02:00
b8208ff79a
Merge pull request #7269 from y-zeng/cli_call
...
Support server reflection in CLI
2016-07-21 17:11:36 -07:00
f6aefa3ea6
Merge pull request #7400 from yang-g/ga_branch2
...
Cherrypick #7319 into v1.0.x
2016-07-21 11:28:44 -07:00
9cb9445155
Addressed review comments
2016-07-20 16:39:31 -07:00
6b88b22d9e
Add comments for GRPC_NO_GENERATED_CODE
2016-07-19 19:12:46 -07:00
77b74258b5
Revert unnecessary deletions
2016-07-19 11:53:37 -07:00
77c7f9fd62
Merge pull request #7407 from ctiller/delayed-write
...
Benchmark fixes
2016-07-19 09:26:04 -07:00
5ca7e47493
Merge pull request #6737 from ctiller/delayed-write
...
Delay beginning most writes until we enter poll()
2016-07-19 09:25:49 -07:00
6570b83c9c
Splitting interop_server.cc
2016-07-18 23:42:35 +02:00
1318479011
Separate generated file and protobuf dependency
2016-07-18 13:07:42 -07:00
a26c77b314
added another TODO to grpclb_test
2016-07-18 12:57:13 -07:00
1d5cb2ad8a
Improvements to the grpclb proto API funcs
2016-07-18 12:56:53 -07:00
c51a4833ce
Merge branch 'master' into assert_not_expect
2016-07-15 15:06:14 -04:00
30a4a544be
Merge branch 'filter_call_init_failure' into filter_api
2016-07-15 09:16:05 -07:00
8b3b97f99d
Added a tiny comment header and TODOs.
2016-07-15 07:46:47 -07:00
ad94fdfe51
Fix compile error
2016-07-15 06:42:29 -07:00
b23239b6d8
Merge branch 'histo' of github.com:vjpai/grpc into delayed-write
2016-07-15 06:37:41 -07:00
807387641f
prevent spurious wake up and unstarted/already shutdown server
2016-07-14 22:59:39 -07:00
13d3e3b7e2
Merge pull request #6737 from ctiller/delayed-write
...
Delay beginning most writes until we enter poll()
2016-07-14 19:31:47 -07:00
27a02b5d9d
Merge pull request #7319 from yang-g/wait_async
...
Make Server::Wait work for async only server.
2016-07-14 18:26:25 -07:00
ea11d168c7
Added more docs.
...
And fixed behavior when incoming serverlist has zero servers. Previously we
ignored the update. Currently (and correctly) we consider it but the pick itself
will stay pending until we actually have > 0 servers in the incoming serverlist.
2016-07-14 17:27:32 -07:00
6ec11f2acd
prevent spurious wake up and unstarted/already shutdown server
2016-07-14 14:53:35 -07:00
7c3ba12813
Merge branch 'master' of github.com:grpc/grpc into grpclb_v0
2016-07-14 14:13:41 -07:00
0a06cd7b68
Cleanup from code review
2016-07-14 13:21:24 -07:00
05573f1692
Make Server::Wait work for async only server.
2016-07-13 22:23:19 -07:00
5fde20d9f0
clang-format
2016-07-13 19:25:59 -07:00
40317fd720
Resolve pernicious race between destructor and thread functions by insisting that destructor is invoked after the class has gone back to being a harmless single-threaded thing.
2016-07-13 19:20:25 -07:00
e053e730d2
Avoid using certain C++11-isms with grpc::thread, as it's not necessarily std::thread.
2016-07-14 00:42:07 +02:00
8da7b1f779
Fix some failures
2016-07-13 15:06:00 -07:00
ad7c527618
Temporary workaround by setting up a deadline on server shutdown.
...
This reveals an issue that needs to be solved:
D0713 14:48:28.049861213 14503 server.c:704] Waiting for 44 channels and 0/1 listeners to be destroyed before shutting down server
2016-07-13 14:51:44 -07:00
d4c5bd8512
Merge github.com:grpc/grpc into delayed-write
2016-07-13 13:46:05 -07:00
a831651aa5
Unify and make consistent the per-thread shutdown process
2016-07-13 10:32:26 -07:00
b5ee1cdcb9
Dont stall shutting down server
2016-07-13 08:39:35 -07:00
kpayson64