Commit Graph

317 Commits

Author SHA1 Message Date
Mark D. Roth 1f0f23cc5a Handshaker plugin mechanism. 2017-01-06 13:07:19 -08:00
Mark D. Roth 348fba2809 Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup 2017-01-06 11:07:30 -08:00
Craig Tiller 293ef1572b Merge github.com:grpc/grpc into slice_with_exec_ctx 2017-01-04 15:38:44 -08:00
Craig Tiller 3ca6019d39 Merge branch 'patchy' into slice_with_exec_ctx_and_build 2017-01-04 14:41:29 -08:00
Nicolas "Pixel" Noble 3d5592cea8 Moving message_size_filter properly. 2017-01-04 23:23:40 +01:00
Craig Tiller eb30c809cf Merge branch 'flow_control_v2' into bwest 2016-12-27 16:03:43 -08:00
Craig Tiller ef6938477b Merge branch 'slice_with_exec_ctx' into metadata_filter 2016-12-27 08:59:00 -08:00
Craig Tiller 0704727c2d Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-12-27 08:38:35 -08:00
Nathaniel Manista 8f7b0b48bf v1.0.x → master upmerge
Manual changes:

 - Fixed use of Exception.message in _invalid_metadata_test.py

 - Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb

 - Added "set -e" to generate_build_additions.sh
2016-12-16 23:48:52 +00:00
Craig Tiller 1b0d2f008b Merge branch 'slice_with_exec_ctx' into metadata_filter 2016-12-12 07:19:55 -08:00
Craig Tiller 6d379a90af Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-12-12 07:16:03 -08:00
Mark D. Roth 4d2ea02129 Revert "Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h"""" 2016-12-12 07:12:27 -08:00
Craig Tiller 30268a99e0 Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" 2016-12-12 06:48:30 -08:00
Craig Tiller b995e8bcda Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-12-12 06:36:43 -08:00
Craig Tiller 385dd9a462 Merge branch 'slice_interning' into metadata_filter 2016-12-06 20:27:38 -08:00
Craig Tiller 35769dc29c Merge branch 'slice_with_exec_ctx' into slice_interning 2016-12-06 20:23:13 -08:00
Craig Tiller 30d50fed6d Fix build 2016-12-06 19:34:32 -08:00
Craig Tiller 397bff36b9 Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-12-06 15:05:59 -08:00
Mark D. Roth 2d317fbc57 Revert "Revert "Remove redundant includes from string.h and tmpfile.h"" 2016-12-05 08:07:13 -08:00
Mark D. Roth 4eec0041f5 Revert "Remove redundant includes from string.h and tmpfile.h" 2016-12-05 08:03:41 -08:00
Mark D. Roth adc3fbc0a3 Merge pull request #8922 from sreecha/slice_cleanup
Remove redundant includes from string.h and tmpfile.h
2016-12-05 07:43:40 -08:00
Mark D. Roth 714038204a Use the same server code for both secure and insecure servers. 2016-12-02 10:51:39 -08:00
Sree Kuchibhotla f989469fe3 Temporarily enable gpr_slice_* functions to not break api compatibility 2016-12-01 17:09:35 -08:00
Yuchen Zeng b0023d25dc Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-11-30 15:51:25 -08:00
Craig Tiller 369ddc524a Merge branch 'slice_with_exec_ctx' into slice_interning 2016-11-30 13:32:18 -08:00
Mark D. Roth 6c3d040ebf Merge branch 'security_handshaker1' into security_handshaker2 2016-11-29 14:24:42 -08:00
Muxi Yan a7f03f6423 Advance objective c version to v1.0.2 2016-11-28 11:29:19 -08:00
Craig Tiller ac5f518016 Merge branch 'slice_with_exec_ctx' into eliminate_mdstr 2016-11-18 12:45:16 -08:00
Craig Tiller b28c7e8710 Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-11-18 10:29:04 -08:00
Yuchen Zeng 9e4c8eb8e8 Address review comments 2016-11-18 01:17:10 -08:00
Mark D. Roth 071cacf1cb Rename security handshaker files. 2016-11-17 13:17:56 -08:00
Mark D. Roth 8686cab11c Use the same connector code for both secure and insecure clients. 2016-11-17 13:12:17 -08:00
Craig Tiller 66b14c125e Merge branch 'slice_interning' into eliminate_mdstr 2016-11-16 16:05:01 -08:00
Craig Tiller 1094c32f35 Merge branch 'slice_with_exec_ctx' into slice_interning 2016-11-16 15:54:03 -08:00
Craig Tiller c586666cbd Merge github.com:grpc/grpc into slice_with_exec_ctx 2016-11-16 15:25:00 -08:00
Mark D. Roth 863113a0d9 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-16 14:18:28 -08:00
Craig Tiller c80fa2f673 Merge pull request #8680 from ctiller/no_more_legacy
Remove legacy poller
2016-11-15 17:25:27 -08:00
Yuchen Zeng 5c1f55af23 Merge pull request #8335 from y-zeng/tos
Add grpc_socket_mutator
2016-11-11 15:05:14 -08:00
Craig Tiller 5ef31ab9c9 Progress towards mdstr elimination 2016-11-10 16:27:48 -08:00
Craig Tiller 14ded3bbff Merge branch 'slice_with_exec_ctx' into slice_interning 2016-11-10 08:37:40 -08:00
Craig Tiller 7cdad96fc4 Fix foward declaration duplication 2016-11-10 08:37:21 -08:00
Craig Tiller 64b26567ad First pass of slice interning facilities 2016-11-10 08:31:42 -08:00
Mark D. Roth c56c3ad259 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-09 13:32:36 -08:00
Muxi Yan 53c4c28b43 Add new util file to podspec 2016-11-08 13:34:02 -08:00
Mark D. Roth fc75321830 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-08 10:57:20 -08:00
Yuchen Zeng bd363544fd Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-11-08 10:56:16 -08:00
Craig Tiller e6684f415e Remove legacy poller 2016-11-08 08:17:43 -08:00
Craig Tiller b720b609ea Merge github.com:grpc/grpc into grpc_slice 2016-11-08 07:20:27 -08:00
Mark D. Roth c22717ec63 Merge remote-tracking branch 'upstream/master' into service_config_json 2016-11-07 09:41:07 -08:00
Craig Tiller 503653e27e Merge pull request #8456 from ctiller/pid_ctl
Simple PID controller
2016-11-04 14:17:14 -07:00
Mark D. Roth ea846a0800 Rename method_config.[ch] to service_config.[ch]. 2016-11-03 11:32:54 -07:00
Yuchen Zeng e882e39224 Fix windows build 2016-11-02 19:33:41 -07:00
Yuchen Zeng 64d518e3b0 Merge remote-tracking branch 'upstream/master' into tos 2016-11-02 16:27:49 -07:00
Craig Tiller 41fd9f2343 Merge github.com:grpc/grpc into grpc_slice 2016-10-31 14:42:53 -07:00
Yuchen Zeng c76e9d3062 Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-10-28 15:41:58 -07:00
Michael Lumish 15b04e41f1 Merge pull request #8559 from murgatroid99/v1.0.1_upmerge
V1.0.1 upmerge
2016-10-28 14:22:09 -07:00
murgatroid99 5d6ae930ab Merge remote-tracking branch 'upstream/v1.0.x' into v1.0.1_upmerge 2016-10-28 11:48:22 -07:00
Craig Tiller fa014a86e3 Merge github.com:grpc/grpc into pid_ctl 2016-10-28 07:31:20 -07:00
Craig Tiller 6e080a3651 Merge branch 'buffer_pools_for_realsies' into grpc_slice 2016-10-26 21:00:53 -07:00
Craig Tiller 3d357d901c Merge github.com:grpc/grpc into buffer_pools_for_realsies 2016-10-26 20:52:03 -07:00
Craig Tiller c3350541e3 Generate build files 2016-10-26 16:19:01 -07:00
Mark D. Roth e4e457ed76 Merge remote-tracking branch 'upstream/master' into circular_dependency_fix 2016-10-26 13:06:03 -07:00
Mark D. Roth bfe56801ad Move method_config module from ext/client_channel to lib/transport. 2016-10-26 12:45:20 -07:00
Mark D. Roth fb809b7850 Merge remote-tracking branch 'upstream/master' into resolver_channel_args 2016-10-26 09:12:25 -07:00
Muxi Yan 447d0a22e6 Advance versions of gRPC from v1.0.1-pre1 to v1.0.1 2016-10-25 14:14:12 -07:00
Yuchen Zeng f1cd449030 Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-10-25 11:26:17 -07:00
Craig Tiller c690768b15 Merge branch 'flow_control_v2' into bwest 2016-10-24 14:50:12 -07:00
Craig Tiller fe8c5012d3 Merge github.com:grpc/grpc into buffer_pools_for_realsies 2016-10-24 14:49:18 -07:00
murgatroid99 b516cadc2a Merge branch 'master' into uv_core_transport 2016-10-21 15:54:42 -07:00
Mark D. Roth ae07f7fdc6 Merge remote-tracking branch 'upstream/master' into resolver_channel_args 2016-10-21 15:23:53 -07:00
Mark D. Roth af84245131 Remove resolver_result. 2016-10-21 15:05:15 -07:00
Muxi Yan 6fd881e183 Advance versions of BoringSSL in podspec and template 2016-10-21 14:46:01 -07:00
Matt Kwong e9255d04e5 fix sanity 2016-10-20 19:08:57 -07:00
Craig Tiller 3f14e6df65 Merge branch 'flow_control_v2' into bwest 2016-10-20 15:53:50 -07:00
Craig Tiller 79fb584883 Merge branch 'bdp_est' into bwest 2016-10-20 15:47:19 -07:00
Craig Tiller dd2fa6482a Add pid controller test 2016-10-20 15:46:32 -07:00
Craig Tiller 9e0066b0c9 Add estimator test 2016-10-20 14:04:18 -07:00
murgatroid99 10edf68eec Merge branch 'master' into uv_core_transport 2016-10-19 15:19:00 -07:00
Mark D. Roth eb35a1d16b Merge remote-tracking branch 'upstream/master' into rename_client_config 2016-10-19 14:53:42 -07:00
Craig Tiller 9ea0f2c6e8 Merge github.com:grpc/grpc into buffer_pools_for_realsies 2016-10-19 14:44:53 -07:00
murgatroid99 59f347e125 Merge branch 'master' into uv_core_transport 2016-10-19 13:53:21 -07:00
Mark D. Roth 605a8f12ed Merge remote-tracking branch 'upstream/master' into service_config 2016-10-18 11:06:33 -07:00
Muxi Yan a507de342d Advance version of BoringSSL 2016-10-17 20:57:25 -07:00
Muxi Yan 6758caae31 Advance versions from 1.0.0 to 1.0.1-pre1 2016-10-17 17:10:26 -07:00
Craig Tiller 20afa3d7c9 BufferPool --> ResourceQuota 2016-10-17 14:52:14 -07:00
Yuchen Zeng c007a6c879 Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-10-17 14:33:29 -07:00
Craig Tiller 654b242ce7 Merge branch 'direct-calls' into buffer_pools_for_realsies 2016-10-17 14:31:44 -07:00
Craig Tiller 8c94df19d4 Merge github.com:grpc/grpc into direct-calls 2016-10-17 13:25:45 -07:00
Mark D. Roth 6a721b5b3f Rename grpc_hash_table to grpc_mdstr_hash_table. 2016-10-14 12:43:34 -07:00
Yuchen Zeng de3daf5d63 More interfaces for grpc_socket_mutator 2016-10-13 17:26:26 -07:00
Ken Payson 82e4ec741b Moved cv polling into ev_poll_posix.c 2016-10-13 12:26:01 -07:00
Yuchen Zeng a4f708a4c4 Introduce grpc_socket_mutator 2016-10-11 18:36:24 -07:00
Yuchen Zeng 929f4c652f Add tos configuration in channel args 2016-10-10 16:02:43 -07:00
Mark D. Roth 15195741d7 Merge remote-tracking branch 'upstream/master' into rename_client_config 2016-10-07 09:02:28 -07:00
Yuchen Zeng 6988838a67 Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-10-03 13:24:13 -07:00
murgatroid99 eebb129fd3 Merge branch 'master' into uv_core_transport 2016-10-03 09:33:29 -07:00
murgatroid99 c36f6ea745 Compile and link core tests with libuv 2016-10-03 09:24:09 -07:00
Ken Payson 5b5c8071c6 Merge master 2016-09-30 09:04:01 -07:00
Craig Tiller d88c461217 Merge branch 'direct-calls' into buffer_pools_for_realsies 2016-09-29 10:35:38 -07:00
Craig Tiller ca3451de7a Merge github.com:grpc/grpc into direct-calls 2016-09-29 10:27:44 -07:00
Ken Payson e02c7ed37b Broke cv polling into seperate engine 2016-09-29 09:15:49 -07:00
Mark D. Roth 6600645135 Refactor hash table code into its own module and use it for method_config as well as method_config_table. 2016-09-27 10:13:56 -07:00
Mark D. Roth bec804b77f Merge branch 'deadline_filter' into service_config 2016-09-26 11:18:06 -07:00
Mark D. Roth 4c3a4688bb Move method config table code to its own module. 2016-09-23 15:19:26 -07:00
murgatroid99 08b0fab426 Merge branch 'master' into uv_core_transport 2016-09-23 14:35:49 -07:00
Craig Tiller d801cd7ed7 Merge branch 'direct-calls' into buffer_pools_for_realsies 2016-09-23 13:51:23 -07:00
Craig Tiller 5abf79a91b Merge github.com:grpc/grpc into direct-calls 2016-09-23 13:51:00 -07:00
Craig Tiller 86958768b4 Buffer pools compile 2016-09-23 12:05:34 -07:00
Mark D. Roth 1a2e6ac10d Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-23 09:47:01 -07:00
Craig Tiller 0d19c67ea9 Merge branch 'direct-calls' into buffer_pools_for_realsies 2016-09-22 16:10:29 -07:00
Craig Tiller 7af69f34df Add buffer pools to build 2016-09-22 13:48:54 -07:00
Mark D. Roth 933c955aaf Merge remote-tracking branch 'upstream/master' into http_connect 2016-09-21 08:12:11 -07:00
Mark D. Roth 3c09810ac9 Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-21 08:01:05 -07:00
Craig Tiller 1edc77c7c6 Merge github.com:grpc/grpc into direct-calls 2016-09-20 11:02:51 -07:00
Jim King 9fec58f2b4 Merge pull request #8052 from Vizerai/grpc_tracing
grpc tracing context
2016-09-19 11:35:59 -07:00
Mark D. Roth 9710e2cb71 Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-19 11:13:27 -07:00
murgatroid99 bcc60f75d4 Merge branch 'master' into uv_core_transport 2016-09-16 13:44:28 -07:00
murgatroid99 9030c81f20 Add a libuv endpoint to the C core, for use in the Node library 2016-09-16 13:25:08 -07:00
Mark D. Roth 85102a9eb6 Merge remote-tracking branch 'upstream/master' into http_connect 2016-09-16 13:24:05 -07:00
Mark D. Roth eaea5caab3 Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-16 13:12:21 -07:00
Mark D. Roth 34dac9d4ca Merge remote-tracking branch 'upstream/master' into max_send_size_filter 2016-09-16 13:06:26 -07:00
Craig Tiller ee43d7bbb1 Merge pull request #8069 from grpc/revert-8068-revert-7279-grand-unified-closures
Revert "Revert "Grand unified closures""
2016-09-16 12:11:11 -07:00
Mark D. Roth 8b7678cf84 Merge remote-tracking branch 'upstream/master' into http_connect 2016-09-16 10:51:15 -07:00
Mark D. Roth abf03aed93 Merge remote-tracking branch 'upstream/master' into max_send_size_filter 2016-09-16 07:35:37 -07:00
Ken Payson 31caabdead Add shim to support condition variable wakeup fds where pipe/eventfd is not available 2016-09-14 14:25:46 -07:00
Craig Tiller 762e72ef7b Merge github.com:grpc/grpc into direct-calls 2016-09-14 11:16:51 -07:00
Mark D. Roth 2137cd8e9b Rename client_config directory to client_channel. 2016-09-14 09:04:00 -07:00
Craig Tiller a51f54192a Merge pull request #7559 from dgquintas/codegen_cleanse
Removed references to public APIs from codegen/
2016-09-13 19:40:43 -07:00
Mark D. Roth 5e1b58bcea Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-12 16:59:00 -07:00
Craig Tiller 57726ca5a9 Revert "Revert "Grand unified closures"" 2016-09-12 11:59:45 -07:00
Craig Tiller 537f7c2a13 Revert "Grand unified closures" 2016-09-12 11:56:39 -07:00
Mark D. Roth 242dc4be0e Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-12 11:54:25 -07:00
Vizerai 12d1fc61d8 initial commit of tracing context files 2016-09-09 14:22:19 -07:00
Craig Tiller d8a3c048e2 Tie workqueue implementation to event engine 2016-09-09 12:42:37 -07:00
Mark D. Roth ebfcd97940 Merge remote-tracking branch 'upstream/master' into max_send_size_filter 2016-09-08 07:16:34 -07:00
Mark D. Roth c890042118 Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-07 09:18:04 -07:00
Mark D. Roth 164f0e926d Merge remote-tracking branch 'upstream/master' into http_connect 2016-09-07 09:14:50 -07:00
Craig Tiller 344834b40b Merge github.com:grpc/grpc into grand-unified-closures 2016-09-07 08:39:05 -07:00
Craig Tiller e0321637d7 Merge pull request #7774 from ctiller/percent-encoder
Percent encoding routines
2016-09-06 22:08:12 -07:00
Mark D. Roth 6c3295a5a2 Merge remote-tracking branch 'upstream/master' into http_connect 2016-09-06 11:04:11 -07:00
Mark D. Roth 7bfa1a8343 Merge remote-tracking branch 'upstream/master' into max_send_size_filter 2016-09-06 10:44:32 -07:00
Craig Tiller 255dad3630 Merge github.com:grpc/grpc into grand-unified-closures 2016-09-02 09:15:23 -07:00
David Garcia Quintas e44902ecc9 Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-09-02 15:27:33 +02:00
Yuchen Zeng 5b159f29e0 Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-09-01 22:40:28 -07:00
Mark D. Roth fb475c93c4 Merge remote-tracking branch 'upstream/master' into deadline_filter 2016-09-01 14:22:55 -07:00
Mark D. Roth 79620aaa10 Merge pull request #7943 from markdroth/client_channel_cleanup
Move subchannel_call_holder code into client_channel module.
2016-09-01 13:12:56 -07:00
David Garcia Quintas d3dee72437 Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-09-01 20:18:41 +02:00
Mark D. Roth 89119fa9b6 Merge branch 'client_channel_cleanup' into deadline_filter 2016-09-01 08:29:56 -07:00
Mark D. Roth 4c0fe49f76 Move subchannel_call_holder code into client_channel module. 2016-08-31 13:51:55 -07:00
Alistair Veitch a0c69f9099 add trace context proto 2016-08-31 12:01:27 -07:00