Commit Graph

94 Commits

Author SHA1 Message Date
Yang Gao c71a9d2b56 clang-format 2015-05-04 00:22:12 -07:00
Yang Gao ea13af73e0 merge with head 2015-05-01 11:34:45 -07:00
Yang Gao 3921c56bee Expose max message size at the server side 2015-04-30 16:07:06 -07:00
Craig Tiller 81e57d9acf Add a thread stress end2end test 2015-04-29 16:34:13 -07:00
Craig Tiller 7305dc69e6 Merge pull request #1227 from nicolasnoble/the-purge-2
Refactoring std::chrono out.
2015-04-24 17:57:49 -07:00
Yang Gao fa74ec4617 Merge pull request #1359 from a11r/cc2
Test client stream cancellation and fix bug exposed by the test.
2015-04-24 15:16:51 -07:00
Nicolas "Pixel" Noble fd2bf675f7 Merge branch 'master' of github.com:grpc/grpc into the-purge-2
Conflicts:
	include/grpc++/completion_queue.h
2015-04-24 23:24:44 +02:00
Yang Gao c4b6ffb1b6 Add a GrpcLibrary class to wrap grpc_init and grpc_shutdown and convert all the tests to init/shutdown free. 2015-04-24 13:09:40 -07:00
Nicolas "Pixel" Noble 23be280366 Merge branch 'master' of github.com:grpc/grpc into the-purge-2
Conflicts:
	src/cpp/client/channel.cc
	vsprojects/vs2010/grpc++.vcxproj
	vsprojects/vs2013/grpc++.vcxproj.filters
2015-04-24 00:38:19 +02:00
Abhishek Kumar d774c5cadb Test client stream cancellation and fix bug exposed by the test. 2015-04-23 14:59:49 -07:00
Craig Tiller bab1d2cf5f Merge pull request #1307 from a11r/streamcancel
Added e2e tests for server and bidi stream cancellation.
2015-04-23 14:15:41 -07:00
Abhishek Kumar a1d3a72930 fixed indentation 2015-04-23 10:24:04 -07:00
Yang Gao 3fbf7d76e2 Merge pull request #1312 from ctiller/batch-metadata
Batch metadata
2015-04-22 14:35:46 -07:00
Yang Gao 3b3097fb7a Remove an extra unref 2015-04-21 11:47:45 -07:00
Craig Tiller 12088b26d9 Tweak tests 2015-04-20 09:51:27 -07:00
Abhishek Kumar 18298a7440 Fixed flakes due to OK racing with cancel 2015-04-17 15:00:25 -07:00
Abhishek Kumar e41d0402ba Added end2end test for server streaming rpc cancellation. 2015-04-17 14:12:33 -07:00
Abhishek Kumar 82a83313db Added test case demonstrating cancel on bidi stream 2015-04-17 13:30:51 -07:00
Nicolas "Pixel" Noble b7c2035e83 Merge branch 'master' of https://github.com/grpc/grpc into the-purge-2
Conflicts:
	test/cpp/end2end/async_end2end_test.cc
	test/cpp/end2end/end2end_test.cc
	test/cpp/interop/client.cc
2015-04-11 01:53:09 +02:00
Nicolas "Pixel" Noble 0caebbfcfe Splitting gRPC service class codegen into its own set of files. 2015-04-09 23:08:51 +02:00
Nicolas "Pixel" Noble a05b8b7b25 Removing a few more references to #include <chrono> 2015-04-08 09:07:20 +02:00
Nicolas Noble 89219162dd Refactoring std::chrono out. 2015-04-08 05:42:08 +02:00
Yang Gao 0c4b0ddcc5 Add tests with delayed cancellation from client and server 2015-03-30 13:08:34 -07:00
Yang Gao 48bbd000eb merge upstream and resolve conflict 2015-03-26 23:12:14 -07:00
Vijay Pai 92a928fa68 Make string construction explicit as implicit conversion doesn't work in 4.4 2015-03-26 16:30:22 -04:00
Nicolas Noble 96e32aa0a5 Merge pull request #1133 from yang-g/cleanup
clean up
2015-03-25 12:38:40 -07:00
Yang Gao 16c78c922c Clean up unneeded includes and remove shutdown protobuf library 2015-03-25 10:36:16 -07:00
Vijay Pai 82dd80abc6 Elminate range-based fors and work around some other limitations in older compilers 2015-03-24 10:36:08 -07:00
Yang Gao 993d540e37 covert test to use generic stub 2015-03-19 13:35:49 -07:00
Jan Tattermusch 5e36d0d474 Merge pull request #1093 from nicolasnoble/windows
Various Windows fixes.
2015-03-19 10:29:47 -07:00
Nicolas Noble cfd6073a66 Various Windows fixes.
-) using dupenv_s instead of getenv_s and calling strdup ourselves.
-) few impossible-to-obtain if checks.
-) various signed/unsigned casting.
-) using time_t instead of time32_t
-) checking output of FormatMessage for failures.
-) don't redefine _WIN32_WINNT without undefining it first.
-) fixed msvc's interlocked casting.
-) renamed AddPort to AddListeningPort.
-) added protobuf's third_party includes to search path.
-) added a missing definition for inet_ntop in mingw32.
-) removed useless declarations.
2015-03-19 04:21:22 +01:00
Yang Gao 757afaeb30 clang-format new changes 2015-03-17 15:49:26 -07:00
Yang Gao d672d8fbe2 resolve merge confict 2015-03-17 15:47:47 -07:00
Yang Gao 700bdeb6f5 Merge pull request #1023 from vjpai/async
Non-blocking Next method for C++ async completion queue
2015-03-17 15:45:33 -07:00
Yang Gao 6baa9b67ad clang-format c++ code 2015-03-17 10:49:39 -07:00
vjpai 7aadf46fdb Change to std::chrono and add a test. 2015-03-17 00:39:18 -07:00
Yang Gao 1ad253d137 expose the server's cq through the generic service object 2015-03-16 13:11:29 -07:00
Yang Gao 45c09db87c sort the tags, this is not necessary, just make it look better 2015-03-13 15:49:35 -07:00
Yang Gao 9fbbc7bb13 add one bidi test 2015-03-13 15:33:08 -07:00
Yang Gao 4999649653 Rename to AsyncGeneric* 2015-03-12 16:40:19 -07:00
Yang Gao 005eb88c45 Rename anonymous to generic globally 2015-03-11 22:17:13 -07:00
Yang Gao 0cb6c25e71 A first test with typed async client and untyped service for a simple rpc 2015-03-11 00:30:57 -07:00
Craig Tiller 61691f92c3 Merge github.com:grpc/grpc into credit 2015-03-02 08:51:52 -08:00
vjpai 1b47b12895 Merge remote-tracking branch 'upstream/master' 2015-02-26 23:16:25 -08:00
Vijay Pai 64ac47f389 clang-format all these files 2015-02-26 17:59:51 -08:00
vjpai 56c5129629 Rename Async methods from generator to avoid naming conflicts to
bind and other functions
2015-02-26 17:01:35 -08:00
Craig Tiller cf133f41f8 Make it possible to compile with gcc4.6 2015-02-26 14:27:05 -08:00
Craig Tiller 25f6cd7a97 Merge github.com:grpc/grpc into credit
Conflicts:
	examples/pubsub/publisher_test.cc
	examples/pubsub/subscriber_test.cc
	include/grpc++/create_channel.h
	src/cpp/client/create_channel.cc
	test/cpp/end2end/async_end2end_test.cc
	test/cpp/end2end/end2end_test.cc
	test/cpp/util/create_test_channel.cc
2015-02-24 08:12:05 -08:00
Craig Tiller b9d91eb454 Merge github.com:google/grpc into deprecate-c++
Conflicts:
	test/cpp/end2end/async_end2end_test.cc
	test/cpp/end2end/end2end_test.cc
2015-02-23 17:13:40 -08:00
Craig Tiller e4fe844b67 s/CreateChannel/CreateChannelDeprecated
For the 2-argument version of CreateChannel.

This is a temporary step until #711 is ready to roll out.
2015-02-23 13:55:15 -08:00