Jorge Canizales
7f51a041b4
Restrict deployment targets to the protobuf requirement.
2015-09-08 21:31:59 -07:00
Jorge Canizales
0bee681ab1
Bump version of gRPC.podspec to 0.11
...
Technically unnecessary, but for consistency with the other beta releases.
2015-09-08 21:05:33 -07:00
Alistair Veitch
1c09accaad
change aggregation_ops to internal type
2015-08-31 16:57:32 -07:00
Alistair Veitch
c47621fbef
merge
2015-08-31 08:39:47 -07:00
Alistair Veitch
bff9cf52ed
Merge branch 'master' into tracing_api
2015-08-28 14:35:49 -07:00
Alistair Veitch
ae7bbfcb92
merge to head
2015-08-28 11:00:02 -07:00
Alistair Veitch
9a09982e2d
view and aggregation API
2015-08-27 13:16:00 -07:00
Hongyu Chen
beb580b941
More merge conflict fix
2015-08-25 16:19:33 -07:00
Alistair Veitch
a4e884721d
merge to head
2015-08-25 15:36:20 -07:00
Hongyu Chen
011ea49592
Merge remote-tracking branch 'upstream/master' into timespec
2015-08-25 14:44:15 -07:00
yang-g
31ff8bcc15
add missing headers from 2495
2015-08-25 14:09:06 -07:00
Hongyu Chen
a0f149e873
Move core/profiling/timers_preciseclock.h to core/support/ such that we
...
have a gpr public function which returns cycle clock.
2015-08-24 16:27:19 -07:00
Hongyu Chen
e09dc78e74
rename census_filter.{c,h} to grpc_filter.{c,h}
2015-08-21 11:28:33 -07:00
Hongyu Chen
c389bd22b7
Merge remote-tracking branch 'upstream/master'
2015-08-20 11:18:35 -07:00
Hongyu Chen
fdc1dc744b
Move census_filters from .../channel to .../census
2015-08-19 16:58:12 -07:00
Robbie Shade
3544fd26a0
Merge remote-tracking branch 'upstream/master' into add_udp_server_2
...
Conflicts:
Makefile
2015-08-13 18:03:24 -04:00
Nicolas "Pixel" Noble
bb3aed0ef9
Removing gpr_cancelable.
2015-08-13 22:53:21 +02:00
Robbie Shade
37ad56b469
Merge remote-tracking branch 'upstream/master' into add_udp_server_2
2015-08-13 16:12:26 -04:00
Alistair Veitch
c47e69b71e
Merge branch 'master' into tracing_api
2015-08-13 11:36:10 -07:00
Alistair Veitch
e6d0ad317e
add all new content
2015-08-13 09:59:48 -07:00
Hongyu Chen
7adbb64307
Build file changes
2015-08-11 16:00:32 -07:00
Robbie Shade
fb5eb0e98d
Regenerated project files
2015-08-06 12:39:04 -04:00
Craig Tiller
0700d8b118
Merge github.com:grpc/grpc into kinetic-lopsided-poetry
2015-08-05 15:28:41 -07:00
Alistair Veitch
a924b31d28
merge with upstream/master
2015-08-04 17:47:11 -07:00
Craig Tiller
f53d9c8d0d
Testing port server
...
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.
2015-08-04 14:19:43 -07:00
Craig Tiller
42ce225d50
Merge github.com:grpc/grpc into plucking-hell
...
Conflicts:
Makefile
2015-08-01 16:21:18 -07:00
Craig Tiller
44a127c80f
Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about
...
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
2015-07-31 07:45:59 -07:00
Craig Tiller
70e9b3d2a2
Merge github.com:grpc/grpc into plucking-hell
2015-07-30 16:15:58 -07:00
Alistair Veitch
6796805897
Merge branch 'master' into issue_2709
2015-07-30 14:35:22 -07:00
Alistair Veitch
ff32faf3c9
Move grpc_census_call_*_context calls into public header
2015-07-30 09:54:15 -07:00
Craig Tiller
83f4d4e218
Add a subchannel factory decorator library
2015-07-29 18:14:41 -07:00
Craig Tiller
5ddbb9d405
Allow specific pollers to be woken
...
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).
2015-07-29 15:58:11 -07:00
Alistair Veitch
0383d494c4
version 1
2015-07-26 15:29:00 -07:00
Craig Tiller
b256faa353
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
2015-07-23 11:28:16 -07:00
Craig Tiller
5126bb6d82
Merge pull request #2493 from a-veitch/record_stat
...
Census record stats API
2015-07-23 09:57:58 -07:00
Alistair Veitch
b46f3f400e
fix build
2015-07-20 13:34:10 -07:00
Craig Tiller
698d00c60e
Add ipv4:, ipv6: schemes
2015-07-20 12:32:58 -07:00
Craig Tiller
9d25e94682
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
2015-07-20 10:31:12 -07:00
Michael Lumish
8584cb108d
Merge pull request #2497 from jcanizales/update-head-v-to-0.7
...
Move head podspec to v0.7.
2015-07-20 08:57:01 -07:00
Jorge Canizales
63c3efb6fa
Move head podspec to v0.7.
...
Readd the commented-out config to suppress warnings, to have it handy
for submissions.
2015-07-17 18:53:20 -07:00
Alistair Veitch
635899d062
rebuild makefile
2015-07-17 16:02:24 -07:00
Craig Tiller
48cb07c909
Client connectivity API
...
Initial plumbing work; needs tests and more client_channel
implementation.
2015-07-15 16:16:15 -07:00
David Garcia Quintas
e0d581b6ad
Merge branch 'master' of github.com:grpc/grpc into decompression
...
# Conflicts:
# Makefile
# include/grpc++/client_context.h
# include/grpc++/server_context.h
# src/cpp/client/client_context.cc
# src/cpp/server/server_context.cc
# vsprojects/Grpc.mak
2015-07-15 14:07:18 -07:00
vjpai
a882299984
Merge branch 'master' into lockfree-stack
2015-07-10 19:48:17 -07:00
Vijay Pai
005e305c22
Initial checkin commit for lockfree stack.
...
Tests not yet included.
2015-07-10 15:18:45 -07:00
Robbie Shade
6953529365
Updated build.json, regenerated project files.
2015-07-10 14:27:34 -04:00
Craig Tiller
2e622bc16a
Add a version string and a function to retrieve it
2015-07-10 07:46:03 -07:00
David Garcia Quintas
14ce90ff82
Merge branch 'master' of github.com:grpc/grpc into decompression
2015-07-09 16:18:14 -07:00
Julien Boeuf
ea94e46b0d
Merge branch 'master' of github.com:grpc/grpc into jwt_verifier
2015-07-08 16:24:31 -07:00
David Garcia Quintas
17bb64981a
Merge branch 'master' of github.com:grpc/grpc into decompression
2015-07-08 15:17:10 -07:00