Nicolas "Pixel" Noble
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
Vijay Pai
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
kpayson64
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
kpayson64
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
kpayson64
b8208ff79a
Merge pull request #7269 from y-zeng/cli_call
...
Support server reflection in CLI
2016-07-21 17:11:36 -07:00
Nicolas Noble
f6aefa3ea6
Merge pull request #7400 from yang-g/ga_branch2
...
Cherrypick #7319 into v1.0.x
2016-07-21 11:28:44 -07:00
Yuchen Zeng
9cb9445155
Addressed review comments
2016-07-20 16:39:31 -07:00
Yuchen Zeng
6b88b22d9e
Add comments for GRPC_NO_GENERATED_CODE
2016-07-19 19:12:46 -07:00
Yuchen Zeng
77b74258b5
Revert unnecessary deletions
2016-07-19 11:53:37 -07:00
Craig Tiller
77c7f9fd62
Merge pull request #7407 from ctiller/delayed-write
...
Benchmark fixes
2016-07-19 09:26:04 -07:00
Craig Tiller
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
Yuchen Zeng
1318479011
Separate generated file and protobuf dependency
2016-07-18 13:07:42 -07:00
Robbie Shade
c51a4833ce
Merge branch 'master' into assert_not_expect
2016-07-15 15:06:14 -04:00
Craig Tiller
ad94fdfe51
Fix compile error
2016-07-15 06:42:29 -07:00
Craig Tiller
b23239b6d8
Merge branch 'histo' of github.com:vjpai/grpc into delayed-write
2016-07-15 06:37:41 -07:00
yang-g
807387641f
prevent spurious wake up and unstarted/already shutdown server
2016-07-14 22:59:39 -07:00
Craig Tiller
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
kpayson64
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
yang-g
6ec11f2acd
prevent spurious wake up and unstarted/already shutdown server
2016-07-14 14:53:35 -07:00
Craig Tiller
0a06cd7b68
Cleanup from code review
2016-07-14 13:21:24 -07:00
yang-g
05573f1692
Make Server::Wait work for async only server.
2016-07-13 22:23:19 -07:00
Vijay Pai
5fde20d9f0
clang-format
2016-07-13 19:25:59 -07:00
Vijay Pai
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
Nicolas "Pixel" Noble
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
Craig Tiller
8da7b1f779
Fix some failures
2016-07-13 15:06:00 -07:00
Vijay Pai
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
Craig Tiller
d4c5bd8512
Merge github.com:grpc/grpc into delayed-write
2016-07-13 13:46:05 -07:00
Vijay Pai
a831651aa5
Unify and make consistent the per-thread shutdown process
2016-07-13 10:32:26 -07:00
Craig Tiller
b5ee1cdcb9
Dont stall shutting down server
2016-07-13 08:39:35 -07:00
Craig Tiller
38fb8de100
get timeouts working on run_tests.py again
2016-07-13 08:23:32 -07:00
Craig Tiller
e64d693050
Better fine-tuning
2016-07-12 20:53:16 -07:00
Craig Tiller
61e2040de0
Get json_run_localhost working again
2016-07-12 17:26:52 -07:00
Craig Tiller
72376da8ba
Get json_run_localhost working again
2016-07-12 17:14:37 -07:00
Craig Tiller
9e3691c5bd
Actually run json_run_localhost tests
2016-07-12 16:29:46 -07:00
Craig Tiller
b19dbead67
Make request freelists per cq, to allow drastically higher requested call counts
2016-07-12 15:33:11 -07:00
Craig Tiller
1d03e100eb
Ensure timely response to marks
2016-07-12 09:50:56 -07:00
yang-g
3e63b4ee7e
Merge remote-tracking branch 'upstream/master' into slice
2016-07-12 08:36:26 -07:00
yang-g
e89dc6ceb6
Make Server::Wait work for async only server.
2016-07-11 15:48:01 -07:00
Craig Tiller
026754f489
Merge github.com:grpc/grpc into delayed-write
2016-07-11 12:31:14 -07:00
Vijay Pai
f782465fba
Fix some shutdown errors related to CQ/join ordering
2016-07-08 10:33:10 -07:00
Vijay Pai
aa8bbeb6c6
Merge branch 'verbose_errors' into histo
2016-07-08 09:41:59 -07:00
Vijay Pai
f373f2cf8b
Stop holding histogram for a long time
2016-07-08 09:40:55 -07:00
Yuchen Zeng
c68640f05c
Read from stdin
...
Read from stdin if the request text and binary file are not provided
2016-07-07 16:42:32 -07:00
Craig Tiller
fbf03c1735
Fix high seqno tests, up runtimes for benchmark tests to flush more bugs
2016-07-07 13:10:09 -07:00
Yuchen Zeng
a17c8d993d
Fix typos
2016-07-07 11:40:05 -07:00
Yuchen Zeng
c24e0ee4f0
Update docs
2016-07-07 11:32:25 -07:00
Yuchen Zeng
256cc7aa03
Support server reflection in CLI
2016-07-07 11:09:49 -07:00
Vijay Pai
ceb1a7d79f
Add more information so that we can have a meaningful exit code
2016-07-07 11:06:04 -07:00
Craig Tiller
6c8619bbe7
Better fix for flow control bug
2016-07-07 10:41:48 -07:00
Sree Kuchibhotla
9181754cd9
Merge branch 'master' into stress_test_metrics_fix
2016-07-07 09:39:45 -07:00