DONE!!1one

BUILD

@@ -849,15 +849,21 @@ cc_library(
  "include/grpc++/support/sync_stream.h",
  "include/grpc++/support/time.h",
  "include/grpc++/impl/codegen/async_stream.h",
+ "include/grpc++/impl/codegen/async_unary_call.h",
  "include/grpc++/impl/codegen/call.h",
  "include/grpc++/impl/codegen/call_hook.h",
  "include/grpc++/impl/codegen/channel_interface.h",
  "include/grpc++/impl/codegen/client_context.h",
+ "include/grpc++/impl/codegen/client_unary_call.h",
+ "include/grpc++/impl/codegen/completion_queue.h",
  "include/grpc++/impl/codegen/completion_queue_tag.h",
  "include/grpc++/impl/codegen/config.h",
  "include/grpc++/impl/codegen/config_protobuf.h",
  "include/grpc++/impl/codegen/grpc_library.h",
+ "include/grpc++/impl/codegen/method_handler_impl.h",
  "include/grpc++/impl/codegen/proto_utils.h",
+ "include/grpc++/impl/codegen/rpc_method.h",
+ "include/grpc++/impl/codegen/rpc_service_method.h",
  "include/grpc++/impl/codegen/security/auth_context.h",
  "include/grpc++/impl/codegen/serialization_traits.h",
  "include/grpc++/impl/codegen/server_context.h",
@@ -870,6 +876,7 @@ cc_library(
  "include/grpc++/impl/codegen/sync.h",
  "include/grpc++/impl/codegen/sync_cxx11.h",
  "include/grpc++/impl/codegen/sync_no_cxx11.h",
+ "include/grpc++/impl/codegen/sync_stream.h",
  "include/grpc++/impl/codegen/time.h",
  ],
  includes = [
@@ -968,15 +975,21 @@ cc_library(
  "include/grpc++/support/sync_stream.h",
  "include/grpc++/support/time.h",
  "include/grpc++/impl/codegen/async_stream.h",
+ "include/grpc++/impl/codegen/async_unary_call.h",
  "include/grpc++/impl/codegen/call.h",
  "include/grpc++/impl/codegen/call_hook.h",
  "include/grpc++/impl/codegen/channel_interface.h",
  "include/grpc++/impl/codegen/client_context.h",
+ "include/grpc++/impl/codegen/client_unary_call.h",
+ "include/grpc++/impl/codegen/completion_queue.h",
  "include/grpc++/impl/codegen/completion_queue_tag.h",
  "include/grpc++/impl/codegen/config.h",
  "include/grpc++/impl/codegen/config_protobuf.h",
  "include/grpc++/impl/codegen/grpc_library.h",
+ "include/grpc++/impl/codegen/method_handler_impl.h",
  "include/grpc++/impl/codegen/proto_utils.h",
+ "include/grpc++/impl/codegen/rpc_method.h",
+ "include/grpc++/impl/codegen/rpc_service_method.h",
  "include/grpc++/impl/codegen/security/auth_context.h",
  "include/grpc++/impl/codegen/serialization_traits.h",
  "include/grpc++/impl/codegen/server_context.h",
@@ -989,6 +1002,7 @@ cc_library(
  "include/grpc++/impl/codegen/sync.h",
  "include/grpc++/impl/codegen/sync_cxx11.h",
  "include/grpc++/impl/codegen/sync_no_cxx11.h",
+ "include/grpc++/impl/codegen/sync_stream.h",
  "include/grpc++/impl/codegen/time.h",
  ],
  includes = [
@@ -1030,15 +1044,21 @@ cc_library(
  ],
  hdrs = [
  "include/grpc++/impl/codegen/async_stream.h",
+ "include/grpc++/impl/codegen/async_unary_call.h",
  "include/grpc++/impl/codegen/call.h",
  "include/grpc++/impl/codegen/call_hook.h",
  "include/grpc++/impl/codegen/channel_interface.h",
  "include/grpc++/impl/codegen/client_context.h",
+ "include/grpc++/impl/codegen/client_unary_call.h",
+ "include/grpc++/impl/codegen/completion_queue.h",
  "include/grpc++/impl/codegen/completion_queue_tag.h",
  "include/grpc++/impl/codegen/config.h",
  "include/grpc++/impl/codegen/config_protobuf.h",
  "include/grpc++/impl/codegen/grpc_library.h",
+ "include/grpc++/impl/codegen/method_handler_impl.h",
  "include/grpc++/impl/codegen/proto_utils.h",
+ "include/grpc++/impl/codegen/rpc_method.h",
+ "include/grpc++/impl/codegen/rpc_service_method.h",
  "include/grpc++/impl/codegen/security/auth_context.h",
  "include/grpc++/impl/codegen/serialization_traits.h",
  "include/grpc++/impl/codegen/server_context.h",
@@ -1051,6 +1071,7 @@ cc_library(
  "include/grpc++/impl/codegen/sync.h",
  "include/grpc++/impl/codegen/sync_cxx11.h",
  "include/grpc++/impl/codegen/sync_no_cxx11.h",
+ "include/grpc++/impl/codegen/sync_stream.h",
  "include/grpc++/impl/codegen/time.h",
  "include/grpc/impl/codegen/alloc.h",
  "include/grpc/impl/codegen/atm.h",

Makefile

@@ -3074,15 +3074,21 @@ PUBLIC_HEADERS_CXX += \
  include/grpc++/support/sync_stream.h \
  include/grpc++/support/time.h \
  include/grpc++/impl/codegen/async_stream.h \
+ include/grpc++/impl/codegen/async_unary_call.h \
  include/grpc++/impl/codegen/call.h \
  include/grpc++/impl/codegen/call_hook.h \
  include/grpc++/impl/codegen/channel_interface.h \
  include/grpc++/impl/codegen/client_context.h \
+ include/grpc++/impl/codegen/client_unary_call.h \
+ include/grpc++/impl/codegen/completion_queue.h \
  include/grpc++/impl/codegen/completion_queue_tag.h \
  include/grpc++/impl/codegen/config.h \
  include/grpc++/impl/codegen/config_protobuf.h \
  include/grpc++/impl/codegen/grpc_library.h \
+ include/grpc++/impl/codegen/method_handler_impl.h \
  include/grpc++/impl/codegen/proto_utils.h \
+ include/grpc++/impl/codegen/rpc_method.h \
+ include/grpc++/impl/codegen/rpc_service_method.h \
  include/grpc++/impl/codegen/security/auth_context.h \
  include/grpc++/impl/codegen/serialization_traits.h \
  include/grpc++/impl/codegen/server_context.h \
@@ -3095,6 +3101,7 @@ PUBLIC_HEADERS_CXX += \
  include/grpc++/impl/codegen/sync.h \
  include/grpc++/impl/codegen/sync_cxx11.h \
  include/grpc++/impl/codegen/sync_no_cxx11.h \
+ include/grpc++/impl/codegen/sync_stream.h \
  include/grpc++/impl/codegen/time.h \
 
 LIBGRPC++_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_SRC))))
@@ -3369,15 +3376,21 @@ PUBLIC_HEADERS_CXX += \
  include/grpc++/support/sync_stream.h \
  include/grpc++/support/time.h \
  include/grpc++/impl/codegen/async_stream.h \
+ include/grpc++/impl/codegen/async_unary_call.h \
  include/grpc++/impl/codegen/call.h \
  include/grpc++/impl/codegen/call_hook.h \
  include/grpc++/impl/codegen/channel_interface.h \
  include/grpc++/impl/codegen/client_context.h \
+ include/grpc++/impl/codegen/client_unary_call.h \
+ include/grpc++/impl/codegen/completion_queue.h \
  include/grpc++/impl/codegen/completion_queue_tag.h \
  include/grpc++/impl/codegen/config.h \
  include/grpc++/impl/codegen/config_protobuf.h \
  include/grpc++/impl/codegen/grpc_library.h \
+ include/grpc++/impl/codegen/method_handler_impl.h \
  include/grpc++/impl/codegen/proto_utils.h \
+ include/grpc++/impl/codegen/rpc_method.h \
+ include/grpc++/impl/codegen/rpc_service_method.h \
  include/grpc++/impl/codegen/security/auth_context.h \
  include/grpc++/impl/codegen/serialization_traits.h \
  include/grpc++/impl/codegen/server_context.h \
@@ -3390,6 +3403,7 @@ PUBLIC_HEADERS_CXX += \
  include/grpc++/impl/codegen/sync.h \
  include/grpc++/impl/codegen/sync_cxx11.h \
  include/grpc++/impl/codegen/sync_no_cxx11.h \
+ include/grpc++/impl/codegen/sync_stream.h \
  include/grpc++/impl/codegen/time.h \
 
 LIBGRPC++_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_UNSECURE_SRC))))
@@ -3470,15 +3484,21 @@ LIBGRPC_PLUGIN_SUPPORT_SRC = \
 
 PUBLIC_HEADERS_CXX += \
  include/grpc++/impl/codegen/async_stream.h \
+ include/grpc++/impl/codegen/async_unary_call.h \
  include/grpc++/impl/codegen/call.h \
  include/grpc++/impl/codegen/call_hook.h \
  include/grpc++/impl/codegen/channel_interface.h \
  include/grpc++/impl/codegen/client_context.h \
+ include/grpc++/impl/codegen/client_unary_call.h \
+ include/grpc++/impl/codegen/completion_queue.h \
  include/grpc++/impl/codegen/completion_queue_tag.h \
  include/grpc++/impl/codegen/config.h \
  include/grpc++/impl/codegen/config_protobuf.h \
  include/grpc++/impl/codegen/grpc_library.h \
+ include/grpc++/impl/codegen/method_handler_impl.h \
  include/grpc++/impl/codegen/proto_utils.h \
+ include/grpc++/impl/codegen/rpc_method.h \
+ include/grpc++/impl/codegen/rpc_service_method.h \
  include/grpc++/impl/codegen/security/auth_context.h \
  include/grpc++/impl/codegen/serialization_traits.h \
  include/grpc++/impl/codegen/server_context.h \
@@ -3491,6 +3511,7 @@ PUBLIC_HEADERS_CXX += \
  include/grpc++/impl/codegen/sync.h \
  include/grpc++/impl/codegen/sync_cxx11.h \
  include/grpc++/impl/codegen/sync_no_cxx11.h \
+ include/grpc++/impl/codegen/sync_stream.h \
  include/grpc++/impl/codegen/time.h \
  include/grpc/impl/codegen/alloc.h \
  include/grpc/impl/codegen/atm.h \

build.yaml

@@ -104,15 +104,21 @@ filegroups:
 - name: grpc++_codegen
  public_headers:
  - include/grpc++/impl/codegen/async_stream.h
+ - include/grpc++/impl/codegen/async_unary_call.h
  - include/grpc++/impl/codegen/call.h
  - include/grpc++/impl/codegen/call_hook.h
  - include/grpc++/impl/codegen/channel_interface.h
  - include/grpc++/impl/codegen/client_context.h
+ - include/grpc++/impl/codegen/client_unary_call.h
+ - include/grpc++/impl/codegen/completion_queue.h
  - include/grpc++/impl/codegen/completion_queue_tag.h
  - include/grpc++/impl/codegen/config.h
  - include/grpc++/impl/codegen/config_protobuf.h
  - include/grpc++/impl/codegen/grpc_library.h
+ - include/grpc++/impl/codegen/method_handler_impl.h
  - include/grpc++/impl/codegen/proto_utils.h
+ - include/grpc++/impl/codegen/rpc_method.h
+ - include/grpc++/impl/codegen/rpc_service_method.h
  - include/grpc++/impl/codegen/security/auth_context.h
  - include/grpc++/impl/codegen/serialization_traits.h
  - include/grpc++/impl/codegen/server_context.h
@@ -125,6 +131,7 @@ filegroups:
  - include/grpc++/impl/codegen/sync.h
  - include/grpc++/impl/codegen/sync_cxx11.h
  - include/grpc++/impl/codegen/sync_no_cxx11.h
+ - include/grpc++/impl/codegen/sync_stream.h
  - include/grpc++/impl/codegen/time.h
  src:
  - src/cpp/codegen/grpc_library.cc

examples/cpp/helloworld/Makefile

@@ -55,9 +55,11 @@ greeter_async_client: helloworld.pb.o helloworld.grpc.pb.o greeter_async_client.
 greeter_async_server: helloworld.pb.o helloworld.grpc.pb.o greeter_async_server.o
  $(CXX) $^ $(LDFLAGS) -o $@
 
+.PRECIOUS: %.grpc.pb.cc
 %.grpc.pb.cc: %.proto
  $(PROTOC) -I $(PROTOS_PATH) --grpc_out=. --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN_PATH) $<
 
+.PRECIOUS: %.pb.cc
 %.pb.cc: %.proto
  $(PROTOC) -I $(PROTOS_PATH) --cpp_out=. $<
 

include/grpc++/completion_queue.h

@@ -31,172 +31,9 @@
  *
  */
 
-/// A completion queue implements a concurrent producer-consumer queue, with two
-/// main methods, \a Next and \a AsyncNext.
 #ifndef GRPCXX_COMPLETION_QUEUE_H
 #define GRPCXX_COMPLETION_QUEUE_H
 
-#include <grpc++/impl/codegen/grpc_library.h>
-#include <grpc++/impl/codegen/status.h>
-#include <grpc++/impl/codegen/time.h>
-
-struct grpc_completion_queue;
-
-namespace grpc {
-
-template <class R>
-class ClientReader;
-template <class W>
-class ClientWriter;
-template <class W, class R>
-class ClientReaderWriter;
-template <class R>
-class ServerReader;
-template <class W>
-class ServerWriter;
-template <class W, class R>
-class ServerReaderWriter;
-template <class ServiceType, class RequestType, class ResponseType>
-class RpcMethodHandler;
-template <class ServiceType, class RequestType, class ResponseType>
-class ClientStreamingHandler;
-template <class ServiceType, class RequestType, class ResponseType>
-class ServerStreamingHandler;
-template <class ServiceType, class RequestType, class ResponseType>
-class BidiStreamingHandler;
-class UnknownMethodHandler;
-
-class Channel;
-class ChannelInterface;
-class ClientContext;
-class CompletionQueueTag;
-class CompletionQueue;
-class RpcMethod;
-class Server;
-class ServerBuilder;
-class ServerContext;
-
-/// A thin wrapper around \a grpc_completion_queue (see / \a
-/// src/core/surface/completion_queue.h).
-class CompletionQueue : private GrpcLibrary {
- public:
- /// Default constructor. Implicitly creates a \a grpc_completion_queue
- /// instance.
- CompletionQueue();
-
- /// Wrap \a take, taking ownership of the instance.
- ///
- /// \param take The completion queue instance to wrap. Ownership is taken.
- explicit CompletionQueue(grpc_completion_queue* take);
-
- /// Destructor. Destroys the owned wrapped completion queue / instance.
- ~CompletionQueue();
-
- /// Tri-state return for AsyncNext: SHUTDOWN, GOT_EVENT, TIMEOUT.
- enum NextStatus {
- SHUTDOWN, ///< The completion queue has been shutdown.
- GOT_EVENT, ///< Got a new event; \a tag will be filled in with its
- ///< associated value; \a ok indicating its success.
- TIMEOUT ///< deadline was reached.
- };
-
- /// Read from the queue, blocking up to \a deadline (or the queue's shutdown).
- /// Both \a tag and \a ok are updated upon success (if an event is available
- /// within the \a deadline). A \a tag points to an arbitrary location usually
- /// employed to uniquely identify an event.
- ///
- /// \param tag[out] Upon sucess, updated to point to the event's tag.
- /// \param ok[out] Upon sucess, true if read a regular event, false otherwise.
- /// \param deadline[in] How long to block in wait for an event.
- ///
- /// \return The type of event read.
- template <typename T>
- NextStatus AsyncNext(void** tag, bool* ok, const T& deadline) {
- TimePoint<T> deadline_tp(deadline);
- return AsyncNextInternal(tag, ok, deadline_tp.raw_time());
- }
-
- /// Read from the queue, blocking until an event is available or the queue is
- /// shutting down.
- ///
- /// \param tag[out] Updated to point to the read event's tag.
- /// \param ok[out] true if read a regular event, false otherwise.
- ///
- /// \return true if read a regular event, false if the queue is shutting down.
- bool Next(void** tag, bool* ok) {
- return (AsyncNextInternal(tag, ok, gpr_inf_future(GPR_CLOCK_REALTIME)) !=
- SHUTDOWN);
- }
-
- /// Request the shutdown of the queue.
- ///
- /// \warning This method must be called at some point. Once invoked, \a Next
- /// will start to return false and \a AsyncNext will return \a
- /// NextStatus::SHUTDOWN. Only once either one of these methods does that
- /// (that is, once the queue has been \em drained) can an instance of this
- /// class be destroyed.
- void Shutdown();
-
- /// Returns a \em raw pointer to the underlying \a grpc_completion_queue
- /// instance.
- ///
- /// \warning Remember that the returned instance is owned. No transfer of
- /// owership is performed.
- grpc_completion_queue* cq() { return cq_; }
-
- private:
- // Friend synchronous wrappers so that they can access Pluck(), which is
- // a semi-private API geared towards the synchronous implementation.
- template <class R>
- friend class ::grpc::ClientReader;
- template <class W>
- friend class ::grpc::ClientWriter;
- template <class W, class R>
- friend class ::grpc::ClientReaderWriter;
- template <class R>
- friend class ::grpc::ServerReader;
- template <class W>
- friend class ::grpc::ServerWriter;
- template <class W, class R>
- friend class ::grpc::ServerReaderWriter;
- template <class ServiceType, class RequestType, class ResponseType>
- friend class RpcMethodHandler;
- template <class ServiceType, class RequestType, class ResponseType>
- friend class ClientStreamingHandler;
- template <class ServiceType, class RequestType, class ResponseType>
- friend class ServerStreamingHandler;
- template <class ServiceType, class RequestType, class ResponseType>
- friend class BidiStreamingHandler;
- friend class UnknownMethodHandler;
- friend class ::grpc::Server;
- friend class ::grpc::ServerContext;
- template <class InputMessage, class OutputMessage>
- friend Status BlockingUnaryCall(ChannelInterface* channel,
- const RpcMethod& method,
- ClientContext* context,
- const InputMessage& request,
- OutputMessage* result);
-
- NextStatus AsyncNextInternal(void** tag, bool* ok, gpr_timespec deadline);
-
- /// Wraps \a grpc_completion_queue_pluck.
- /// \warning Must not be mixed with calls to \a Next.
- bool Pluck(CompletionQueueTag* tag);
-
- /// Performs a single polling pluck on \a tag.
- void TryPluck(CompletionQueueTag* tag);
-
- grpc_completion_queue* cq_; // owned
-};
-
-/// A specific type of completion queue used by the processing of notifications
-/// by servers. Instantiated by \a ServerBuilder.
-class ServerCompletionQueue : public CompletionQueue {
- private:
- friend class ServerBuilder;
- ServerCompletionQueue() {}
-};
-
-} // namespace grpc
+#include <grpc++/impl/codegen/completion_queue.h>
 
 #endif // GRPCXX_COMPLETION_QUEUE_H