Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into tracing_api | Alistair Veitch | 2015-08-28 |
|\ | |||
| * | More merge conflict fix | Hongyu Chen | 2015-08-25 |
| | | |||
* | | merge to head | Alistair Veitch | 2015-08-25 |
|\ \ | |||
| | * | Merge remote-tracking branch 'upstream/master' into timespec | Hongyu Chen | 2015-08-25 |
| | |\ | | |/ | |/| | |||
| * | | add missing headers from 2495 | yang-g | 2015-08-25 |
| | | | |||
| * | | Merge pull request #2945 from maxwell-demon/master | Alistair Veitch | 2015-08-25 |
| |\ \ | | | | | | | | | Re-install census_filters | ||
| * \ \ | Merge branch 'master' of github.com:grpc/grpc into cpp_string_ref | Julien Boeuf | 2015-08-24 |
| |\ \ \ | |||
| * | | | | Adding grpc::string_ref class. | Julien Boeuf | 2015-08-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Strict subset of http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2012/n3442.html - Useful to avoid unnecessary string copies. | ||
| | | | * | Move core/profiling/timers_preciseclock.h to core/support/ such that we | Hongyu Chen | 2015-08-24 |
| | |_|/ | |/| | | | | | | | | | | have a gpr public function which returns cycle clock. | ||
| | * | | Fix merge failures | yang-g | 2015-08-24 |
| | | | | |||
| | * | | merge with head | yang-g | 2015-08-24 |
| | |\ \ | |||
| | | * | | Eliminate public thread-pool interface | Vijay Pai | 2015-08-24 |
| | |/ / | |/| | | |||
| | * | | split stream.h into sync_stream.h and async_stream.h | yang-g | 2015-08-21 |
| | | | | |||
| | * | | headers reorg | yang-g | 2015-08-21 |
| | | | | |||
| | | * | rename census_filter.{c,h} to grpc_filter.{c,h} | Hongyu Chen | 2015-08-21 |
| | | | | |||
| | * | | Make Channel ctor private | yang-g | 2015-08-20 |
| | | | | |||
| | * | | remove internal_stub | yang-g | 2015-08-20 |
| | | | | |||
| | | * | Merge remote-tracking branch 'upstream/master' | Hongyu Chen | 2015-08-20 |
| | | |\ | | |_|/ | |/| | | |||
| | | * | Move census_filters from .../channel to .../census | Hongyu Chen | 2015-08-19 |
| | | | | |||
| | * | | Remove ChannelInterface and replace it with Channel | yang-g | 2015-08-19 |
| |/ / | |||
| * | | Merge pull request #2549 from hongweiwang/zookeeper | David G. Quintas | 2015-08-14 |
| |\ \ | | | | | | | | | Zookeeper name resolver | ||
| * \ \ | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
| | * | | | Removing gpr_cancelable. | Nicolas "Pixel" Noble | 2015-08-13 |
| | | | | | |||
| * | | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 |
| |\| | | | |||
| | * | | | Let grpc target depend on //external:zlib so that "-lz" or a real zlib | Ming Zhao | 2015-08-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | target like https://github.com/google/kythe/blob/master/third_party/zlib/BUILD can be pulled in. | ||
* | | | | | Merge branch 'master' into tracing_api | Alistair Veitch | 2015-08-13 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
* | | | | | add all new content | Alistair Veitch | 2015-08-13 |
| | | | | | |||
| | | | * | Merge remote-tracking branch 'upstream/master' | Hongyu Chen | 2015-08-11 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | | * | Build file changes | Hongyu Chen | 2015-08-11 |
| | | | | | |||
| | | * | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-10 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| * | | | | move auth property iterator declaration into auth_context.h | yang-g | 2015-08-10 |
| | |_|/ | |/| | | |||
| | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-07 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-06 |
| |\ \ \ | |||
| | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-06 |
| | | | |\ | | | |_|/ | | |/| | | |||
| | | * | | Regenerated project files | Robbie Shade | 2015-08-06 |
| | | |\ \ | | | |/ / | | |/| | | |||
| | * | | | Merge pull request #2781 from yang-g/stuboptions | Abhishek Kumar | 2015-08-05 |
| | |\ \ \ | | | | | | | | | | | | | Add StubOptions | ||
| * | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | Craig Tiller | 2015-08-05 |
| |\| | | | | |||
| | | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-05 |
| | | | | |\ | | | |_|_|/ | | |/| | | | |||
* | | | | | | merge with upstream/master | Alistair Veitch | 2015-08-04 |
|\ \ \ \ \ \ | |||
| | * | | | | | Testing port server | Craig Tiller | 2015-08-04 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run_tests.py will start a server (if it's not running, or if the running port server mismatches the 'current' one) that serves ports to use for tests. The server is left running after run_tests.py finishes, so that in environments such as Mac and Windows where tests run unshielded from each other, we don't start jumping on already used ports. | ||
| | | * / / | Add StubOptions | yang-g | 2015-08-03 |
| | |/ / / | |/| | | | |||
| | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-03 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | * | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-08-01 |
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: Makefile | ||
| | | | * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-07-31 |
| | | | |\ | |||
| * | | | \ | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | Craig Tiller | 2015-07-31 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: vsprojects/Grpc.mak vsprojects/grpc.sln vsprojects/grpc/grpc.vcxproj vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | ||
| | | * | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-07-30 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | * | | | | Merge branch 'master' into issue_2709 | Alistair Veitch | 2015-07-30 |
| | |\ \ \ \ | |||
| | * | | | | | Move grpc_census_call_*_context calls into public header | Alistair Veitch | 2015-07-30 |
| | | | | | | | |||
| * | | | | | | Add a subchannel factory decorator library | Craig Tiller | 2015-07-29 |
| | |/ / / / | |/| | | | | |||
| | | * | | | Allow specific pollers to be woken | Craig Tiller | 2015-07-29 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if two threads call grpc_completion_queue_pluck on the same completion queue for different tags, there is a 50% chance that we deliver the completion wakeup to the wrong poller - forcing the correct poller to wait until its polling times out before it can return an event up to the application. This change tweaks our polling interfaces so that we can indeed wake a specific poller. Nothing has been performance tuned yet. It's definitely sub-optimal in a number of places. Wakeup file-descriptors should be recycled. We should have a path that avoids calling poll() followed by epoll(). We can probably live without it right at the second though. This code will fail on Windows at least (I'll do that port when I'm in the office and have a Windows machine). |