diff --git a/Makefile b/Makefile
index 99e12fdfacf9f01186892dfadcc2ff966f1c7245..0046a53341e65750717b6483d00be4f8ac47ecba 100644
--- a/Makefile
+++ b/Makefile
@@ -1018,6 +1018,8 @@ test_c: buildtests_c
$(Q) $(BINDIR)/$(CONFIG)/httpcli_test || ( echo test httpcli_test failed ; exit 1 )
$(E) "[RUN] Testing interop_test"
$(Q) $(BINDIR)/$(CONFIG)/interop_test || ( echo test interop_test failed ; exit 1 )
+ $(E) "[RUN] Testing json_rewrite_test"
+ $(Q) $(BINDIR)/$(CONFIG)/json_rewrite_test || ( echo test json_rewrite_test failed ; exit 1 )
$(E) "[RUN] Testing json_test"
$(Q) $(BINDIR)/$(CONFIG)/json_test || ( echo test json_test failed ; exit 1 )
$(E) "[RUN] Testing lame_client_test"
@@ -2266,6 +2268,7 @@ LIBGRPC_SRC = \
src/core/channel/noop_filter.c \
src/core/compression/algorithm.c \
src/core/compression/message_compress.c \
+ src/core/debug/trace.c \
src/core/iomgr/alarm.c \
src/core/iomgr/alarm_heap.c \
src/core/iomgr/endpoint.c \
@@ -2405,6 +2408,7 @@ src/core/channel/metadata_buffer.c: $(OPENSSL_DEP)
src/core/channel/noop_filter.c: $(OPENSSL_DEP)
src/core/compression/algorithm.c: $(OPENSSL_DEP)
src/core/compression/message_compress.c: $(OPENSSL_DEP)
+src/core/debug/trace.c: $(OPENSSL_DEP)
src/core/iomgr/alarm.c: $(OPENSSL_DEP)
src/core/iomgr/alarm_heap.c: $(OPENSSL_DEP)
src/core/iomgr/endpoint.c: $(OPENSSL_DEP)
@@ -2561,6 +2565,7 @@ $(OBJDIR)/$(CONFIG)/src/core/channel/metadata_buffer.o:
$(OBJDIR)/$(CONFIG)/src/core/channel/noop_filter.o:
$(OBJDIR)/$(CONFIG)/src/core/compression/algorithm.o:
$(OBJDIR)/$(CONFIG)/src/core/compression/message_compress.o:
+$(OBJDIR)/$(CONFIG)/src/core/debug/trace.o:
$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm.o:
$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm_heap.o:
$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint.o:
@@ -2732,6 +2737,7 @@ LIBGRPC_UNSECURE_SRC = \
src/core/channel/noop_filter.c \
src/core/compression/algorithm.c \
src/core/compression/message_compress.c \
+ src/core/debug/trace.c \
src/core/iomgr/alarm.c \
src/core/iomgr/alarm_heap.c \
src/core/iomgr/endpoint.c \
@@ -2866,6 +2872,7 @@ $(OBJDIR)/$(CONFIG)/src/core/channel/metadata_buffer.o:
$(OBJDIR)/$(CONFIG)/src/core/channel/noop_filter.o:
$(OBJDIR)/$(CONFIG)/src/core/compression/algorithm.o:
$(OBJDIR)/$(CONFIG)/src/core/compression/message_compress.o:
+$(OBJDIR)/$(CONFIG)/src/core/debug/trace.o:
$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm.o:
$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm_heap.o:
$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint.o:
diff --git a/build.json b/build.json
index 1822488c0e980f2d51457b0f804e4198a44b0e3f..411391efab69c58c7e6208757f23f587b3c089bd 100644
--- a/build.json
+++ b/build.json
@@ -32,6 +32,7 @@
"src/core/channel/noop_filter.h",
"src/core/compression/algorithm.h",
"src/core/compression/message_compress.h",
+ "src/core/debug/trace.h",
"src/core/iomgr/alarm.h",
"src/core/iomgr/alarm_heap.h",
"src/core/iomgr/alarm_internal.h",
@@ -120,6 +121,7 @@
"src/core/channel/noop_filter.c",
"src/core/compression/algorithm.c",
"src/core/compression/message_compress.c",
+ "src/core/debug/trace.c",
"src/core/iomgr/alarm.c",
"src/core/iomgr/alarm_heap.c",
"src/core/iomgr/endpoint.c",
@@ -1283,7 +1285,6 @@
{
"name": "json_rewrite_test",
"build": "test",
- "run": false,
"language": "c",
"src": [
"test/core/json/json_rewrite_test.c"
diff --git a/examples/pubsub/pubsub.proto b/examples/pubsub/pubsub.proto
index ac896933201b553ed9992db76757a8b27b5532b0..9443ae3aa3e69bee64f2826d1d4f0a6a7e6818a3 100644
--- a/examples/pubsub/pubsub.proto
+++ b/examples/pubsub/pubsub.proto
@@ -157,9 +157,7 @@ package tech.pubsub;
//
// Consuming messages via push:
//
-// TODO(eschapira): Add HTTP push example.
-//
-// The port 'machinename:8888' must be bound to a stubby server that implements
+// The port 'machinename:8888' must be bound to a server that implements
// the PushEndpointService with the following method:
//
// int HandlePubsubEvent(PubsubEvent event) {
@@ -252,8 +250,6 @@ service PublisherService {
// Adds a message to the topic. Returns NOT_FOUND if the topic does not
// exist.
- // (-- For different error code values returned via Stubby, see
- // util/task/codes.proto. --)
rpc Publish(PublishRequest) returns (proto2.Empty) {
}
@@ -292,7 +288,6 @@ message PubsubMessage {
// Optional list of labels for this message. Keys in this collection must
// be unique.
- //(-- TODO(eschapira): Define how key namespace may be scoped to the topic.--)
repeated tech.label.Label label = 2;
// ID of this message assigned by the server at publication time. Guaranteed
@@ -467,7 +462,7 @@ message Subscription {
// If <code>query</code> is non-empty, only messages on the subscriber's
// topic whose labels match the query will be returned. Otherwise all
// messages on the topic will be returned.
- // (-- The query syntax is described in tech/label/proto/label_query.proto --)
+ // (-- The query syntax is described in label_query.proto --)
optional string query = 3;
// The subscriber may specify requirements for truncating unacknowledged
diff --git a/src/compiler/python_plugin.cc b/src/compiler/python_plugin.cc
index ebe3660619b42b546e3ca7d81d39805f65f3922e..05c6b095d8e2916985cb9c2c6d791e8cdeb98a8e 100644
--- a/src/compiler/python_plugin.cc
+++ b/src/compiler/python_plugin.cc
@@ -63,7 +63,7 @@ class PythonGrpcGenerator : public CodeGenerator {
// Get output file name.
string file_name;
static const int proto_suffix_length = 6; // length of ".proto"
- if (file->name().size() > proto_suffix_length &&
+ if (file->name().size() > static_cast<size_t>(proto_suffix_length) &&
file->name().find_last_of(".proto") == file->name().size() - 1) {
file_name = file->name().substr(
0, file->name().size() - proto_suffix_length) + "_pb2.py";
diff --git a/src/compiler/ruby_generator_map-inl.h b/src/compiler/ruby_generator_map-inl.h
index 345e4c13706a7df64bd52cdf1484c7a784fef182..a86342e8d5593de92a7095d7b5baf3ba193e0d06 100644
--- a/src/compiler/ruby_generator_map-inl.h
+++ b/src/compiler/ruby_generator_map-inl.h
@@ -34,6 +34,7 @@
#ifndef NET_GRPC_COMPILER_RUBY_GENERATOR_MAP_INL_H_
#define NET_GRPC_COMPILER_RUBY_GENERATOR_MAP_INL_H_
+#include <iostream>
#include <initializer_list>
#include <map>
#include <ostream> // NOLINT
@@ -51,8 +52,8 @@ namespace grpc_ruby_generator {
inline std::map<std::string, std::string> ListToDict(
const initializer_list<std::string> &values) {
if (values.size() % 2 != 0) {
- // MOE: insert std::cerr << "Not every 'key' has a value in `values`."
- // << std::endl;
+ std::cerr << "Not every 'key' has a value in `values`."
+ << std::endl;
}
std::map<std::string, std::string> value_map;
auto value_iter = values.begin();
diff --git a/src/core/channel/channel_stack.h b/src/core/channel/channel_stack.h
index 98d095fccf1624f463e09b8c334c847a22ce2910..1ca95e7f1a6b99b7b89f22220b91398bd2d1efd7 100644
--- a/src/core/channel/channel_stack.h
+++ b/src/core/channel/channel_stack.h
@@ -45,10 +45,9 @@
#include <grpc/grpc.h>
#include <grpc/support/log.h>
+#include "src/core/debug/trace.h"
#include "src/core/transport/transport.h"
-/* #define GRPC_CHANNEL_STACK_TRACE 1 */
-
typedef struct grpc_channel_element grpc_channel_element;
typedef struct grpc_call_element grpc_call_element;
@@ -246,9 +245,7 @@ typedef struct {
/* A call stack tracks a set of related filters for one call, and guarantees
they live within a single malloc() allocation */
-typedef struct {
- size_t count;
-} grpc_call_stack;
+typedef struct { size_t count; } grpc_call_stack;
/* Get a channel element given a channel stack and its index */
grpc_channel_element *grpc_channel_stack_element(grpc_channel_stack *stack,
@@ -301,12 +298,7 @@ void grpc_call_element_recv_metadata(grpc_call_element *cur_elem,
void grpc_call_element_send_cancel(grpc_call_element *cur_elem);
void grpc_call_element_send_finish(grpc_call_element *cur_elem);
-#ifdef GRPC_CHANNEL_STACK_TRACE
-#define GRPC_CALL_LOG_OP(sev, elem, op) grpc_call_log_op(sev, elem, op)
-#else
#define GRPC_CALL_LOG_OP(sev, elem, op) \
- do { \
- } while (0)
-#endif
+ if (grpc_trace_bits & GRPC_TRACE_CHANNEL) grpc_call_log_op(sev, elem, op)
#endif /* __GRPC_INTERNAL_CHANNEL_CHANNEL_STACK_H__ */
diff --git a/src/core/debug/trace.c b/src/core/debug/trace.c
new file mode 100644
index 0000000000000000000000000000000000000000..cdbe168fc85b09961355a69439a362a8041320ad
--- /dev/null
+++ b/src/core/debug/trace.c
@@ -0,0 +1,110 @@
+/*
+ *
+ * Copyright 2015, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "src/core/debug/trace.h"
+
+#include <string.h>
+
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include "src/core/support/env.h"
+
+#if GRPC_ENABLE_TRACING
+gpr_uint32 grpc_trace_bits;
+
+static void add(const char *beg, const char *end, char ***ss, size_t *ns) {
+ size_t n = *ns;
+ size_t np = n + 1;
+ char *s = gpr_malloc(end - beg + 1);
+ memcpy(s, beg, end - beg);
+ s[end-beg] = 0;
+ *ss = gpr_realloc(*ss, sizeof(char**) * np);
+ (*ss)[n] = s;
+ *ns = np;
+}
+
+static void split(const char *s, char ***ss, size_t *ns) {
+ const char *c = strchr(s, ',');
+ if (c == NULL) {
+ add(s, s + strlen(s), ss, ns);
+ } else {
+ add(s, c, ss, ns);
+ split(c+1, ss, ns);
+ }
+}
+
+static void parse(const char *s) {
+ char **strings = NULL;
+ size_t nstrings = 0;
+ size_t i;
+ split(s, &strings, &nstrings);
+
+ grpc_trace_bits = 0;
+
+ for (i = 0; i < nstrings; i++) {
+ const char *s = strings[i];
+ if (0 == strcmp(s, "surface")) {
+ grpc_trace_bits |= GRPC_TRACE_SURFACE;
+ } else if (0 == strcmp(s, "channel")) {
+ grpc_trace_bits |= GRPC_TRACE_CHANNEL;
+ } else if (0 == strcmp(s, "tcp")) {
+ grpc_trace_bits |= GRPC_TRACE_TCP;
+ } else if (0 == strcmp(s, "secure_endpoint")) {
+ grpc_trace_bits |= GRPC_TRACE_SECURE_ENDPOINT;
+ } else if (0 == strcmp(s, "all")) {
+ grpc_trace_bits = -1;
+ } else {
+ gpr_log(GPR_ERROR, "Unknown trace var: '%s'", s);
+ }
+ }
+
+ for (i = 0; i < nstrings; i++) {
+ gpr_free(strings[i]);
+ }
+ gpr_free(strings);
+}
+
+void grpc_init_trace_bits() {
+ char *e = gpr_getenv("GRPC_TRACE");
+ if (e == NULL) {
+ grpc_trace_bits = 0;
+ } else {
+ parse(e);
+ gpr_free(e);
+ }
+}
+#else
+void grpc_init_trace_bits() {
+}
+#endif
+
diff --git a/src/core/debug/trace.h b/src/core/debug/trace.h
new file mode 100644
index 0000000000000000000000000000000000000000..167ef3c6ea6b949f3afc355a651c44406f71c82e
--- /dev/null
+++ b/src/core/debug/trace.h
@@ -0,0 +1,60 @@
+/*
+ *
+ * Copyright 2015, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef GRPC_CORE_DEBUG_TRACE_H
+#define GRPC_CORE_DEBUG_TRACE_H
+
+#include <grpc/support/port_platform.h>
+
+/* set to zero to remove all debug trace code */
+#ifndef GRPC_ENABLE_TRACING
+# define GRPC_ENABLE_TRACING 1
+#endif
+
+typedef enum {
+ GRPC_TRACE_SURFACE = 1 << 0,
+ GRPC_TRACE_CHANNEL = 1 << 1,
+ GRPC_TRACE_TCP = 1 << 2,
+ GRPC_TRACE_SECURE_ENDPOINT = 1 << 3
+} grpc_trace_bit_value;
+
+#if GRPC_ENABLE_TRACING
+extern gpr_uint32 grpc_trace_bits;
+#else
+# define grpc_trace_bits 0
+#endif
+
+void grpc_init_trace_bits();
+
+#endif
+
diff --git a/src/core/iomgr/fd_posix.c b/src/core/iomgr/fd_posix.c
index 4f52339bc14d719a4486ae83d38866acb6105fb6..41fd24e05a853f6045923d21d0145b4aa9c36c56 100644
--- a/src/core/iomgr/fd_posix.c
+++ b/src/core/iomgr/fd_posix.c
@@ -45,7 +45,10 @@
#include <grpc/support/log.h>
#include <grpc/support/useful.h>
-enum descriptor_state { NOT_READY, READY, WAITING };
+enum descriptor_state {
+ NOT_READY = 0,
+ READY = 1
+}; /* or a pointer to a closure to call */
/* We need to keep a freelist not because of any concerns of malloc performance
* but instead so that implementations with multiple threads in (for example)
@@ -88,8 +91,8 @@ static grpc_fd *alloc_fd(int fd) {
gpr_mu_init(&r->watcher_mu);
}
gpr_atm_rel_store(&r->refst, 1);
- gpr_atm_rel_store(&r->readst.state, NOT_READY);
- gpr_atm_rel_store(&r->writest.state, NOT_READY);
+ gpr_atm_rel_store(&r->readst, NOT_READY);
+ gpr_atm_rel_store(&r->writest, NOT_READY);
gpr_atm_rel_store(&r->shutdown, 0);
r->fd = fd;
r->watcher_root.next = r->watcher_root.prev = &r->watcher_root;
@@ -166,11 +169,6 @@ void grpc_fd_ref(grpc_fd *fd) { ref_by(fd, 2); }
void grpc_fd_unref(grpc_fd *fd) { unref_by(fd, 2); }
-typedef struct {
- grpc_iomgr_cb_func cb;
- void *arg;
-} callback;
-
static void make_callback(grpc_iomgr_cb_func cb, void *arg, int success,
int allow_synchronous_callback) {
if (allow_synchronous_callback) {
@@ -180,18 +178,18 @@ static void make_callback(grpc_iomgr_cb_func cb, void *arg, int success,
}
}
-static void make_callbacks(callback *callbacks, size_t n, int success,
+static void make_callbacks(grpc_iomgr_closure *callbacks, size_t n, int success,
int allow_synchronous_callback) {
size_t i;
for (i = 0; i < n; i++) {
- make_callback(callbacks[i].cb, callbacks[i].arg, success,
+ make_callback(callbacks[i].cb, callbacks[i].cb_arg, success,
allow_synchronous_callback);
}
}
-static void notify_on(grpc_fd *fd, grpc_fd_state *st, grpc_iomgr_cb_func cb,
- void *arg, int allow_synchronous_callback) {
- switch ((enum descriptor_state)gpr_atm_acq_load(&st->state)) {
+static void notify_on(grpc_fd *fd, gpr_atm *st, grpc_iomgr_closure *closure,
+ int allow_synchronous_callback) {
+ switch (gpr_atm_acq_load(st)) {
case NOT_READY:
/* There is no race if the descriptor is already ready, so we skip
the interlocked op in that case. As long as the app doesn't
@@ -199,9 +197,7 @@ static void notify_on(grpc_fd *fd, grpc_fd_state *st, grpc_iomgr_cb_func cb,
oldval should never be anything other than READY or NOT_READY. We
don't
check for user error on the fast path. */
- st->cb = cb;
- st->cb_arg = arg;
- if (gpr_atm_rel_cas(&st->state, NOT_READY, WAITING)) {
+ if (gpr_atm_rel_cas(st, NOT_READY, (gpr_intptr)closure)) {
/* swap was successful -- the closure will run after the next
set_ready call. NOTE: we don't have an ABA problem here,
since we should never have concurrent calls to the same
@@ -212,12 +208,13 @@ static void notify_on(grpc_fd *fd, grpc_fd_state *st, grpc_iomgr_cb_func cb,
/* swap was unsuccessful due to an intervening set_ready call.
Fall through to the READY code below */
case READY:
- assert(gpr_atm_acq_load(&st->state) == READY);
- gpr_atm_rel_store(&st->state, NOT_READY);
- make_callback(cb, arg, !gpr_atm_acq_load(&fd->shutdown),
+ assert(gpr_atm_acq_load(st) == READY);
+ gpr_atm_rel_store(st, NOT_READY);
+ make_callback(closure->cb, closure->cb_arg,
+ !gpr_atm_acq_load(&fd->shutdown),
allow_synchronous_callback);
return;
- case WAITING:
+ default: /* WAITING */
/* upcallptr was set to a different closure. This is an error! */
gpr_log(GPR_ERROR,
"User called a notify_on function with a previous callback still "
@@ -228,38 +225,38 @@ static void notify_on(grpc_fd *fd, grpc_fd_state *st, grpc_iomgr_cb_func cb,
abort();
}
-static void set_ready_locked(grpc_fd_state *st, callback *callbacks,
+static void set_ready_locked(gpr_atm *st, grpc_iomgr_closure *callbacks,
size_t *ncallbacks) {
- callback *c;
+ gpr_intptr state = gpr_atm_acq_load(st);
- switch ((enum descriptor_state)gpr_atm_acq_load(&st->state)) {
+ switch (state) {
+ case READY:
+ /* duplicate ready, ignore */
+ return;
case NOT_READY:
- if (gpr_atm_rel_cas(&st->state, NOT_READY, READY)) {
+ if (gpr_atm_rel_cas(st, NOT_READY, READY)) {
/* swap was successful -- the closure will run after the next
notify_on call. */
return;
}
- /* swap was unsuccessful due to an intervening set_ready call.
- Fall through to the WAITING code below */
- case WAITING:
- assert(gpr_atm_acq_load(&st->state) == WAITING);
- c = &callbacks[(*ncallbacks)++];
- c->cb = st->cb;
- c->arg = st->cb_arg;
- gpr_atm_rel_store(&st->state, NOT_READY);
- return;
- case READY:
- /* duplicate ready, ignore */
+ /* swap was unsuccessful due to an intervening set_ready call.
+ Fall through to the WAITING code below */
+ state = gpr_atm_acq_load(st);
+ default: /* waiting */
+ assert(gpr_atm_acq_load(st) != READY &&
+ gpr_atm_acq_load(st) != NOT_READY);
+ callbacks[(*ncallbacks)++] = *(grpc_iomgr_closure *)state;
+ gpr_atm_rel_store(st, NOT_READY);
return;
}
}
-static void set_ready(grpc_fd *fd, grpc_fd_state *st,
+static void set_ready(grpc_fd *fd, gpr_atm *st,
int allow_synchronous_callback) {
/* only one set_ready can be active at once (but there may be a racing
notify_on) */
int success;
- callback cb;
+ grpc_iomgr_closure cb;
size_t ncb = 0;
gpr_mu_lock(&fd->set_state_mu);
set_ready_locked(st, &cb, &ncb);
@@ -269,7 +266,7 @@ static void set_ready(grpc_fd *fd, grpc_fd_state *st,
}
void grpc_fd_shutdown(grpc_fd *fd) {
- callback cb[2];
+ grpc_iomgr_closure cb[2];
size_t ncb = 0;
gpr_mu_lock(&fd->set_state_mu);
GPR_ASSERT(!gpr_atm_acq_load(&fd->shutdown));
@@ -280,14 +277,12 @@ void grpc_fd_shutdown(grpc_fd *fd) {
make_callbacks(cb, ncb, 0, 0);
}
-void grpc_fd_notify_on_read(grpc_fd *fd, grpc_iomgr_cb_func read_cb,
- void *read_cb_arg) {
- notify_on(fd, &fd->readst, read_cb, read_cb_arg, 0);
+void grpc_fd_notify_on_read(grpc_fd *fd, grpc_iomgr_closure *closure) {
+ notify_on(fd, &fd->readst, closure, 0);
}
-void grpc_fd_notify_on_write(grpc_fd *fd, grpc_iomgr_cb_func write_cb,
- void *write_cb_arg) {
- notify_on(fd, &fd->writest, write_cb, write_cb_arg, 0);
+void grpc_fd_notify_on_write(grpc_fd *fd, grpc_iomgr_closure *closure) {
+ notify_on(fd, &fd->writest, closure, 0);
}
gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset,
@@ -305,8 +300,8 @@ gpr_uint32 grpc_fd_begin_poll(grpc_fd *fd, grpc_pollset *pollset,
watcher->fd = fd;
gpr_mu_unlock(&fd->watcher_mu);
- return (gpr_atm_acq_load(&fd->readst.state) != READY ? read_mask : 0) |
- (gpr_atm_acq_load(&fd->writest.state) != READY ? write_mask : 0);
+ return (gpr_atm_acq_load(&fd->readst) != READY ? read_mask : 0) |
+ (gpr_atm_acq_load(&fd->writest) != READY ? write_mask : 0);
}
void grpc_fd_end_poll(grpc_fd_watcher *watcher) {
diff --git a/src/core/iomgr/fd_posix.h b/src/core/iomgr/fd_posix.h
index 370ab1345a04e10ee2c2dfed8f06073aa0cf6e98..2a308c8ae20190363a5f906b86ceb577d40f2526 100644
--- a/src/core/iomgr/fd_posix.h
+++ b/src/core/iomgr/fd_posix.h
@@ -43,9 +43,7 @@
typedef struct {
grpc_iomgr_cb_func cb;
void *cb_arg;
- int success;
- gpr_atm state;
-} grpc_fd_state;
+} grpc_iomgr_closure;
typedef struct grpc_fd grpc_fd;
@@ -71,8 +69,8 @@ struct grpc_fd {
gpr_mu watcher_mu;
grpc_fd_watcher watcher_root;
- grpc_fd_state readst;
- grpc_fd_state writest;
+ gpr_atm readst;
+ gpr_atm writest;
grpc_iomgr_cb_func on_done;
void *on_done_user_data;
@@ -126,12 +124,10 @@ void grpc_fd_shutdown(grpc_fd *fd);
underlying platform. This means that users must drain fd in read_cb before
calling notify_on_read again. Users are also expected to handle spurious
events, i.e read_cb is called while nothing can be readable from fd */
-void grpc_fd_notify_on_read(grpc_fd *fd, grpc_iomgr_cb_func read_cb,
- void *read_cb_arg);
+void grpc_fd_notify_on_read(grpc_fd *fd, grpc_iomgr_closure *closure);
/* Exactly the same semantics as above, except based on writable events. */
-void grpc_fd_notify_on_write(grpc_fd *fd, grpc_iomgr_cb_func write_cb,
- void *write_cb_arg);
+void grpc_fd_notify_on_write(grpc_fd *fd, grpc_iomgr_closure *closure);
/* Notification from the poller to an fd that it has become readable or
writable.
diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c
index 137aa99c7b101f9d165b712b7e9544e40483386e..e20cc3d1b2ed7e829def445d79db1b4e02b5171f 100644
--- a/src/core/iomgr/tcp_client_posix.c
+++ b/src/core/iomgr/tcp_client_posix.c
@@ -60,6 +60,7 @@ typedef struct {
gpr_timespec deadline;
grpc_alarm alarm;
int refs;
+ grpc_iomgr_closure write_closure;
} async_connect;
static int prepare_socket(const struct sockaddr *addr, int fd) {
@@ -136,7 +137,7 @@ static void on_writable(void *acp, int success) {
opened too many network connections. The "easy" fix:
don't do that! */
gpr_log(GPR_ERROR, "kernel out of buffers");
- grpc_fd_notify_on_write(ac->fd, on_writable, ac);
+ grpc_fd_notify_on_write(ac->fd, &ac->write_closure);
return;
} else {
switch (so_error) {
@@ -229,9 +230,11 @@ void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *ep),
ac->fd = grpc_fd_create(fd);
gpr_mu_init(&ac->mu);
ac->refs = 2;
+ ac->write_closure.cb = on_writable;
+ ac->write_closure.cb_arg = ac;
grpc_alarm_init(&ac->alarm, deadline, on_alarm, ac, gpr_now());
- grpc_fd_notify_on_write(ac->fd, on_writable, ac);
+ grpc_fd_notify_on_write(ac->fd, &ac->write_closure);
}
#endif
diff --git a/src/core/iomgr/tcp_posix.c b/src/core/iomgr/tcp_posix.c
index 150a907cb105fe9b13b4b523ce96a3fc4837a749..eceb0feadb1463ec6111aa40476b181f14190a53 100644
--- a/src/core/iomgr/tcp_posix.c
+++ b/src/core/iomgr/tcp_posix.c
@@ -45,6 +45,7 @@
#include <unistd.h>
#include "src/core/support/string.h"
+#include "src/core/debug/trace.h"
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/slice.h>
@@ -263,6 +264,9 @@ typedef struct {
void *write_user_data;
grpc_tcp_slice_state write_state;
+
+ grpc_iomgr_closure read_closure;
+ grpc_iomgr_closure write_closure;
} grpc_tcp;
static void grpc_tcp_handle_read(void *arg /* grpc_tcp */, int success);
@@ -290,17 +294,17 @@ static void call_read_cb(grpc_tcp *tcp, gpr_slice *slices, size_t nslices,
grpc_endpoint_cb_status status) {
grpc_endpoint_read_cb cb = tcp->read_cb;
-#ifdef GRPC_TRACE_TCP
- size_t i;
- gpr_log(GPR_DEBUG, "read: status=%d", status);
- for (i = 0; i < nslices; i++) {
- char *dump =
- gpr_hexdump((char *)GPR_SLICE_START_PTR(slices[i]),
- GPR_SLICE_LENGTH(slices[i]), GPR_HEXDUMP_PLAINTEXT);
- gpr_log(GPR_DEBUG, "READ: %s", dump);
- gpr_free(dump);
+ if (grpc_trace_bits & GRPC_TRACE_TCP) {
+ size_t i;
+ gpr_log(GPR_DEBUG, "read: status=%d", status);
+ for (i = 0; i < nslices; i++) {
+ char *dump =
+ gpr_hexdump((char *)GPR_SLICE_START_PTR(slices[i]),
+ GPR_SLICE_LENGTH(slices[i]), GPR_HEXDUMP_PLAINTEXT);
+ gpr_log(GPR_DEBUG, "READ: %s", dump);
+ gpr_free(dump);
+ }
}
-#endif
tcp->read_cb = NULL;
cb(tcp->read_user_data, slices, nslices, status);
@@ -370,7 +374,7 @@ static void grpc_tcp_handle_read(void *arg /* grpc_tcp */, int success) {
} else {
/* Spurious read event, consume it here */
slice_state_destroy(&read_state);
- grpc_fd_notify_on_read(tcp->em_fd, grpc_tcp_handle_read, tcp);
+ grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure);
}
} else {
/* TODO(klempner): Log interesting errors */
@@ -405,7 +409,7 @@ static void grpc_tcp_notify_on_read(grpc_endpoint *ep, grpc_endpoint_read_cb cb,
tcp->read_cb = cb;
tcp->read_user_data = user_data;
gpr_ref(&tcp->refcount);
- grpc_fd_notify_on_read(tcp->em_fd, grpc_tcp_handle_read, tcp);
+ grpc_fd_notify_on_read(tcp->em_fd, &tcp->read_closure);
}
#define MAX_WRITE_IOVEC 16
@@ -468,7 +472,7 @@ static void grpc_tcp_handle_write(void *arg /* grpc_tcp */, int success) {
write_status = grpc_tcp_flush(tcp);
if (write_status == GRPC_ENDPOINT_WRITE_PENDING) {
- grpc_fd_notify_on_write(tcp->em_fd, grpc_tcp_handle_write, tcp);
+ grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure);
} else {
slice_state_destroy(&tcp->write_state);
if (write_status == GRPC_ENDPOINT_WRITE_DONE) {
@@ -491,17 +495,17 @@ static grpc_endpoint_write_status grpc_tcp_write(grpc_endpoint *ep,
grpc_tcp *tcp = (grpc_tcp *)ep;
grpc_endpoint_write_status status;
-#ifdef GRPC_TRACE_TCP
- size_t i;
+ if (grpc_trace_bits & GRPC_TRACE_TCP) {
+ size_t i;
- for (i = 0; i < nslices; i++) {
- char *data =
- gpr_hexdump((char *)GPR_SLICE_START_PTR(slices[i]),
- GPR_SLICE_LENGTH(slices[i]), GPR_HEXDUMP_PLAINTEXT);
- gpr_log(GPR_DEBUG, "WRITE %p: %s", tcp, data);
- gpr_free(data);
+ for (i = 0; i < nslices; i++) {
+ char *data =
+ gpr_hexdump((char *)GPR_SLICE_START_PTR(slices[i]),
+ GPR_SLICE_LENGTH(slices[i]), GPR_HEXDUMP_PLAINTEXT);
+ gpr_log(GPR_DEBUG, "WRITE %p: %s", tcp, data);
+ gpr_free(data);
+ }
}
-#endif
GPR_ASSERT(tcp->write_cb == NULL);
slice_state_init(&tcp->write_state, slices, nslices, nslices);
@@ -513,7 +517,7 @@ static grpc_endpoint_write_status grpc_tcp_write(grpc_endpoint *ep,
gpr_ref(&tcp->refcount);
tcp->write_cb = cb;
tcp->write_user_data = user_data;
- grpc_fd_notify_on_write(tcp->em_fd, grpc_tcp_handle_write, tcp);
+ grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_closure);
}
return status;
@@ -541,6 +545,10 @@ grpc_endpoint *grpc_tcp_create(grpc_fd *em_fd, size_t slice_size) {
/* paired with unref in grpc_tcp_destroy */
gpr_ref_init(&tcp->refcount, 1);
tcp->em_fd = em_fd;
+ tcp->read_closure.cb = grpc_tcp_handle_read;
+ tcp->read_closure.cb_arg = tcp;
+ tcp->write_closure.cb = grpc_tcp_handle_write;
+ tcp->write_closure.cb_arg = tcp;
return &tcp->base;
}
diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c
index b7a06259497f20780f9a05e03022c881c96bd1d8..90b7eb451d4159cbdac680af6558e61d51d8d457 100644
--- a/src/core/iomgr/tcp_server_posix.c
+++ b/src/core/iomgr/tcp_server_posix.c
@@ -82,6 +82,7 @@ typedef struct {
struct sockaddr_un un;
} addr;
int addr_len;
+ grpc_iomgr_closure read_closure;
} server_port;
static void unlink_if_unix_domain_socket(const struct sockaddr_un *un) {
@@ -244,7 +245,7 @@ static void on_read(void *arg, int success) {
case EINTR:
continue;
case EAGAIN:
- grpc_fd_notify_on_read(sp->emfd, on_read, sp);
+ grpc_fd_notify_on_read(sp->emfd, &sp->read_closure);
return;
default:
gpr_log(GPR_ERROR, "Failed accept4: %s", strerror(errno));
@@ -393,7 +394,9 @@ void grpc_tcp_server_start(grpc_tcp_server *s, grpc_pollset **pollsets,
for (j = 0; j < pollset_count; j++) {
grpc_pollset_add_fd(pollsets[j], s->ports[i].emfd);
}
- grpc_fd_notify_on_read(s->ports[i].emfd, on_read, &s->ports[i]);
+ s->ports[i].read_closure.cb = on_read;
+ s->ports[i].read_closure.cb_arg = &s->ports[i];
+ grpc_fd_notify_on_read(s->ports[i].emfd, &s->ports[i].read_closure);
s->active_ports++;
}
gpr_mu_unlock(&s->mu);
diff --git a/src/core/security/secure_endpoint.c b/src/core/security/secure_endpoint.c
index 031f23dc79d109782c8104b7a50b05501f0d2919..d6bdf5a709f6304ab86f0645a1ef31f4b1f560fd 100644
--- a/src/core/security/secure_endpoint.c
+++ b/src/core/security/secure_endpoint.c
@@ -39,6 +39,7 @@
#include <grpc/support/slice.h>
#include <grpc/support/sync.h>
#include "src/core/tsi/transport_security_interface.h"
+#include "src/core/debug/trace.h"
#define STAGING_BUFFER_SIZE 8192
@@ -95,16 +96,16 @@ static void flush_read_staging_buffer(secure_endpoint *ep, gpr_uint8 **cur,
static void call_read_cb(secure_endpoint *ep, gpr_slice *slices, size_t nslices,
grpc_endpoint_cb_status error) {
-#ifdef GRPC_TRACE_SECURE_TRANSPORT
- size_t i;
- for (i = 0; i < nslices; i++) {
- char *data =
- gpr_hexdump((char *)GPR_SLICE_START_PTR(slices[i]),
- GPR_SLICE_LENGTH(slices[i]), GPR_HEXDUMP_PLAINTEXT);
- gpr_log(GPR_DEBUG, "READ %p: %s", ep, data);
- gpr_free(data);
+ if (grpc_trace_bits & GRPC_TRACE_SECURE_ENDPOINT) {
+ size_t i;
+ for (i = 0; i < nslices; i++) {
+ char *data =
+ gpr_hexdump((char *)GPR_SLICE_START_PTR(slices[i]),
+ GPR_SLICE_LENGTH(slices[i]), GPR_HEXDUMP_PLAINTEXT);
+ gpr_log(GPR_DEBUG, "READ %p: %s", ep, data);
+ gpr_free(data);
+ }
}
-#endif
ep->read_cb(ep->read_user_data, slices, nslices, error);
secure_endpoint_unref(ep);
}
@@ -230,15 +231,15 @@ static grpc_endpoint_write_status endpoint_write(grpc_endpoint *secure_ep,
grpc_endpoint_write_status status;
GPR_ASSERT(ep->output_buffer.count == 0);
-#ifdef GRPC_TRACE_SECURE_TRANSPORT
- for (i = 0; i < nslices; i++) {
- char *data =
- gpr_hexdump((char *)GPR_SLICE_START_PTR(slices[i]),
- GPR_SLICE_LENGTH(slices[i]), GPR_HEXDUMP_PLAINTEXT);
- gpr_log(GPR_DEBUG, "WRITE %p: %s", ep, data);
- gpr_free(data);
+ if (grpc_trace_bits & GRPC_TRACE_SECURE_ENDPOINT) {
+ for (i = 0; i < nslices; i++) {
+ char *data =
+ gpr_hexdump((char *)GPR_SLICE_START_PTR(slices[i]),
+ GPR_SLICE_LENGTH(slices[i]), GPR_HEXDUMP_PLAINTEXT);
+ gpr_log(GPR_DEBUG, "WRITE %p: %s", ep, data);
+ gpr_free(data);
+ }
}
-#endif
for (i = 0; i < nslices; i++) {
gpr_slice plain = slices[i];
diff --git a/src/core/surface/init.c b/src/core/surface/init.c
index 43c9906a8a4c01666230d583600346ea8747894c..fa4614abc84e524941dea85f1eede74a90076198 100644
--- a/src/core/surface/init.c
+++ b/src/core/surface/init.c
@@ -32,8 +32,9 @@
*/
#include <grpc/grpc.h>
-#include "src/core/statistics/census_interface.h"
#include "src/core/iomgr/iomgr.h"
+#include "src/core/debug/trace.h"
+#include "src/core/statistics/census_interface.h"
static gpr_once g_init = GPR_ONCE_INIT;
static gpr_mu g_init_mu;
@@ -49,6 +50,7 @@ void grpc_init(void) {
gpr_mu_lock(&g_init_mu);
if (++g_initializations == 1) {
+ grpc_init_trace_bits();
grpc_iomgr_init();
census_init();
}
diff --git a/src/core/surface/surface_trace.h b/src/core/surface/surface_trace.h
index f998de1ad6aaf8da4f9da41f8f7793b3070c397e..4d478d6470ee18348c4f90cb02a35c48e7becf4e 100644
--- a/src/core/surface/surface_trace.h
+++ b/src/core/surface/surface_trace.h
@@ -34,21 +34,14 @@
#ifndef __GRPC_INTERNAL_SURFACE_SURFACE_TRACE_H__
#define __GRPC_INTERNAL_SURFACE_SURFACE_TRACE_H__
+#include "src/core/debug/trace.h"
#include <grpc/support/log.h>
-/* #define GRPC_ENABLE_SURFACE_TRACE 1 */
-
-#ifdef GRPC_ENABLE_SURFACE_TRACE
#define GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, event) \
- do { \
+ if (grpc_trace_bits & GRPC_TRACE_SURFACE) { \
char *_ev = grpc_event_string(event); \
gpr_log(GPR_INFO, "RETURN_EVENT[%p]: %s", cq, _ev); \
gpr_free(_ev); \
- } while (0)
-#else
-#define GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, event) \
- do { \
- } while (0)
-#endif
+ }
#endif /* __GRPC_INTERNAL_SURFACE_SURFACE_TRACE_H__ */
diff --git a/src/csharp/Grpc.Core/Grpc.Core.nuspec b/src/csharp/Grpc.Core/Grpc.Core.nuspec
new file mode 100644
index 0000000000000000000000000000000000000000..af8a8869ca1ed17754222d6413fc362f5e5e3a80
--- /dev/null
+++ b/src/csharp/Grpc.Core/Grpc.Core.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package >
+ <metadata>
+ <id>Grpc.Core</id>
+ <title>gRPC Core</title>
+ <summary>Core C# implementation of gRPC - an RPC library and framework</summary>
+ <description>Core C# implementation of gRPC - an RPC library and framework. See project site for more info.
+ This is an experimental release, not ready to use.
+ </description>
+ <version>0.1.0</version>
+ <authors>Google Inc.</authors>
+ <owners>jtattermusch</owners>
+ <licenseUrl>https://github.com/grpc/grpc/blob/master/LICENSE</licenseUrl>
+ <projectUrl>https://github.com/grpc/grpc</projectUrl>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <releaseNotes>The first experimental release. Not ready to use.</releaseNotes>
+ <copyright>Copyright 2015, Google Inc.</copyright>
+ <tags>gRPC RPC Protocol HTTP/2</tags>
+ </metadata>
+ <files>
+ <file src="bin/Release/Grpc.Core.dll" target="lib/net45" />
+ </files>
+</package>
diff --git a/src/csharp/Grpc.nuspec b/src/csharp/Grpc.nuspec
new file mode 100644
index 0000000000000000000000000000000000000000..96a6aaf6b7265129bcc421ec600b08753028ac46
--- /dev/null
+++ b/src/csharp/Grpc.nuspec
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package >
+ <metadata>
+ <id>Grpc</id>
+ <title>gRPC</title>
+ <summary>C# implementation of gRPC - an RPC library and framework</summary>
+ <description>C# implementation of gRPC - an RPC library and framework. See project site for more info.
+ This is an experimental release, not ready to use.
+ </description>
+ <version>0.1.0</version>
+ <authors>Google Inc.</authors>
+ <owners>jtattermusch</owners>
+ <licenseUrl>https://github.com/grpc/grpc/blob/master/LICENSE</licenseUrl>
+ <projectUrl>https://github.com/grpc/grpc</projectUrl>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <releaseNotes>The first experimental release. Not ready to use.</releaseNotes>
+ <copyright>Copyright 2015, Google Inc.</copyright>
+ <tags>gRPC RPC Protocol HTTP/2</tags>
+ <dependencies>
+ <dependency id="Grpc.Core" version="0.1.0" />
+ </dependencies>
+ </metadata>
+</package>
diff --git a/src/node/interop/empty.proto b/src/node/interop/empty.proto
index f66a108c19b7b46f4afe2b55d09bfc4f03a359a9..4295a0a960c0a07a7cf1df88438d3a8715a1b48b 100644
--- a/src/node/interop/empty.proto
+++ b/src/node/interop/empty.proto
@@ -40,10 +40,4 @@ package grpc.testing;
// rpc Bar (grpc.testing.Empty) returns (grpc.testing.Empty) { };
// };
//
-// MOE:begin_strip
-// The difference between this one and net/rpc/empty-message.proto is that
-// 1) The generated message here is in proto2 C++ API.
-// 2) The proto2.Empty has minimum dependencies
-// (no message_set or net/rpc dependencies)
-// MOE:end_strip
message Empty {}
diff --git a/src/python/src/grpc/_adapter/_face_test_case.py b/src/python/src/grpc/_adapter/_face_test_case.py
index da73366f446f6b6e3f392a37b1eef0d645f9b9e6..8cce322d300ff92fe79362e10769e67288fa8fb3 100644
--- a/src/python/src/grpc/_adapter/_face_test_case.py
+++ b/src/python/src/grpc/_adapter/_face_test_case.py
@@ -81,7 +81,8 @@ class FaceTestCase(test_case.FaceTestCase, coverage.BlockingCoverage):
fore_link = fore.ForeLink(
pool, serialization.request_deserializers,
serialization.response_serializers, None, ())
- port = fore_link.start()
+ fore_link.start()
+ port = fore_link.port()
rear_link = rear.RearLink(
'localhost', port, pool,
serialization.request_serializers, serialization.response_deserializers)
diff --git a/src/python/src/grpc/_adapter/_links_test.py b/src/python/src/grpc/_adapter/_links_test.py
index ba7660bb92042a4f08f249b5b2286d5df180ed63..6b3bcee9fa8aae55a3e812de65c45d68c809326f 100644
--- a/src/python/src/grpc/_adapter/_links_test.py
+++ b/src/python/src/grpc/_adapter/_links_test.py
@@ -70,7 +70,8 @@ class RoundTripTest(unittest.TestCase):
self.fore_link_pool, {test_method: None}, {test_method: None}, None, ())
fore_link.join_rear_link(test_rear_link)
test_rear_link.join_fore_link(fore_link)
- port = fore_link.start()
+ fore_link.start()
+ port = fore_link.port()
rear_link = rear.RearLink(
'localhost', port, self.rear_link_pool, {test_method: None},
@@ -123,7 +124,8 @@ class RoundTripTest(unittest.TestCase):
{test_method: _IDENTITY}, None, ())
fore_link.join_rear_link(test_rear_link)
test_rear_link.join_fore_link(fore_link)
- port = fore_link.start()
+ fore_link.start()
+ port = fore_link.port()
rear_link = rear.RearLink(
'localhost', port, self.rear_link_pool, {test_method: _IDENTITY},
@@ -185,7 +187,8 @@ class RoundTripTest(unittest.TestCase):
{test_method: scenario.serialize_response}, None, ())
fore_link.join_rear_link(test_rear_link)
test_rear_link.join_fore_link(fore_link)
- port = fore_link.start()
+ fore_link.start()
+ port = fore_link.port()
rear_link = rear.RearLink(
'localhost', port, self.rear_link_pool,
diff --git a/src/python/src/grpc/_adapter/fore.py b/src/python/src/grpc/_adapter/fore.py
index f72b2fd5a5f2fa1acf4c1fd0121577d207395538..051fc083f19a8b272a4de3e907c0c1b171e311bc 100644
--- a/src/python/src/grpc/_adapter/fore.py
+++ b/src/python/src/grpc/_adapter/fore.py
@@ -40,6 +40,7 @@ from grpc.framework.base import interfaces
from grpc.framework.base.packets import interfaces as ticket_interfaces
from grpc.framework.base.packets import null
from grpc.framework.base.packets import packets as tickets
+from grpc.framework.foundation import activated
@enum.unique
@@ -65,7 +66,7 @@ def _status(call, rpc_state):
rpc_state.write.low = _LowWrite.CLOSED
-class ForeLink(ticket_interfaces.ForeLink):
+class ForeLink(ticket_interfaces.ForeLink, activated.Activated):
"""A service-side bridge between RPC Framework and the C-ish _low code."""
def __init__(
@@ -92,13 +93,14 @@ class ForeLink(ticket_interfaces.ForeLink):
self._response_serializers = response_serializers
self._root_certificates = root_certificates
self._key_chain_pairs = key_chain_pairs
- self._port = port
+ self._requested_port = port
self._rear_link = null.NULL_REAR_LINK
self._completion_queue = None
self._server = None
self._rpc_states = {}
self._spinning = False
+ self._port = None
def _on_stop_event(self):
self._spinning = False
@@ -264,23 +266,24 @@ class ForeLink(ticket_interfaces.ForeLink):
"""See ticket_interfaces.ForeLink.join_rear_link for specification."""
self._rear_link = null.NULL_REAR_LINK if rear_link is None else rear_link
- def start(self):
+ def _start(self):
"""Starts this ForeLink.
This method must be called before attempting to exchange tickets with this
object.
"""
with self._condition:
- address = '[::]:%d' % (0 if self._port is None else self._port)
+ address = '[::]:%d' % (
+ 0 if self._requested_port is None else self._requested_port)
self._completion_queue = _low.CompletionQueue()
if self._root_certificates is None and not self._key_chain_pairs:
self._server = _low.Server(self._completion_queue, None)
- port = self._server.add_http2_addr(address)
+ self._port = self._server.add_http2_addr(address)
else:
server_credentials = _low.ServerCredentials(
self._root_certificates, self._key_chain_pairs)
self._server = _low.Server(self._completion_queue, server_credentials)
- port = self._server.add_secure_http2_addr(address)
+ self._port = self._server.add_secure_http2_addr(address)
self._server.start()
self._server.service(None)
@@ -288,11 +291,11 @@ class ForeLink(ticket_interfaces.ForeLink):
self._pool.submit(self._spin, self._completion_queue, self._server)
self._spinning = True
- return port
+ return self
# TODO(nathaniel): Expose graceful-shutdown semantics in which this object
# enters a state in which it finishes ongoing RPCs but refuses new ones.
- def stop(self):
+ def _stop(self):
"""Stops this ForeLink.
This method must be called for proper termination of this object, and no
@@ -301,7 +304,7 @@ class ForeLink(ticket_interfaces.ForeLink):
"""
with self._condition:
self._server.stop()
- # TODO(b/18904187): Yep, this is weird. Deleting a server shouldn't have a
+ # TODO(nathaniel): Yep, this is weird. Deleting a server shouldn't have a
# behaviorally significant side-effect.
self._server = None
self._completion_queue.stop()
@@ -309,6 +312,35 @@ class ForeLink(ticket_interfaces.ForeLink):
while self._spinning:
self._condition.wait()
+ self._port = None
+
+ def __enter__(self):
+ """See activated.Activated.__enter__ for specification."""
+ return self._start()
+
+ def __exit__(self, exc_type, exc_val, exc_tb):
+ """See activated.Activated.__exit__ for specification."""
+ self._stop()
+ return False
+
+ def start(self):
+ """See activated.Activated.start for specification."""
+ return self._start()
+
+ def stop(self):
+ """See activated.Activated.stop for specification."""
+ self._stop()
+
+ def port(self):
+ """Identifies the port on which this ForeLink is servicing RPCs.
+
+ Returns:
+ The number of the port on which this ForeLink is servicing RPCs, or None
+ if this ForeLink is not currently activated and servicing RPCs.
+ """
+ with self._condition:
+ return self._port
+
def accept_back_to_front_ticket(self, ticket):
"""See ticket_interfaces.ForeLink.accept_back_to_front_ticket for spec."""
with self._condition:
diff --git a/src/python/src/grpc/_adapter/rear.py b/src/python/src/grpc/_adapter/rear.py
index c47c0aa0209052e399843ea91b3f2da02fccdb2d..cbcf121d9ab3a8808aa2364b02fbb5b656003d86 100644
--- a/src/python/src/grpc/_adapter/rear.py
+++ b/src/python/src/grpc/_adapter/rear.py
@@ -39,6 +39,7 @@ from grpc._adapter import _low
from grpc.framework.base.packets import interfaces as ticket_interfaces
from grpc.framework.base.packets import null
from grpc.framework.base.packets import packets as tickets
+from grpc.framework.foundation import activated
_INVOCATION_EVENT_KINDS = (
_low.Event.Kind.METADATA_ACCEPTED,
@@ -84,7 +85,7 @@ def _write(operation_id, call, outstanding, write_state, serialized_payload):
raise ValueError('Write attempted after writes completed!')
-class RearLink(ticket_interfaces.RearLink):
+class RearLink(ticket_interfaces.RearLink, activated.Activated):
"""An invocation-side bridge between RPC Framework and the C-ish _low code."""
def __init__(
@@ -297,7 +298,7 @@ class RearLink(ticket_interfaces.RearLink):
with self._condition:
self._fore_link = null.NULL_FORE_LINK if fore_link is None else fore_link
- def start(self):
+ def _start(self):
"""Starts this RearLink.
This method must be called before attempting to exchange tickets with this
@@ -306,8 +307,9 @@ class RearLink(ticket_interfaces.RearLink):
with self._condition:
self._completion_queue = _low.CompletionQueue()
self._channel = _low.Channel('%s:%d' % (self._host, self._port))
+ return self
- def stop(self):
+ def _stop(self):
"""Stops this RearLink.
This method must be called for proper termination of this object, and no
@@ -321,6 +323,23 @@ class RearLink(ticket_interfaces.RearLink):
while self._spinning:
self._condition.wait()
+ def __enter__(self):
+ """See activated.Activated.__enter__ for specification."""
+ return self._start()
+
+ def __exit__(self, exc_type, exc_val, exc_tb):
+ """See activated.Activated.__exit__ for specification."""
+ self._stop()
+ return False
+
+ def start(self):
+ """See activated.Activated.start for specification."""
+ return self._start()
+
+ def stop(self):
+ """See activated.Activated.stop for specification."""
+ self._stop()
+
def accept_front_to_back_ticket(self, ticket):
"""See ticket_interfaces.RearLink.accept_front_to_back_ticket for spec."""
with self._condition:
diff --git a/src/python/src/grpc/early_adopter/implementations.py b/src/python/src/grpc/early_adopter/implementations.py
index c549317d15d0108e97ef7e530e88bf819930fd16..1d76d0f9e0d523f367b4358eb5c3466a2dd13802 100644
--- a/src/python/src/grpc/early_adopter/implementations.py
+++ b/src/python/src/grpc/early_adopter/implementations.py
@@ -70,7 +70,8 @@ class _Server(interfaces.Server):
self._pool, self._breakdown.request_deserializers,
self._breakdown.response_serializers, None,
((self._private_key, self._certificate_chain),), port=self._port)
- port = self._fore_link.start()
+ self._fore_link.start()
+ port = self._fore_link.port()
self._back = _tickets_implementations.back(
servicer, self._pool, self._pool, self._pool, _MEGA_TIMEOUT,
_MEGA_TIMEOUT)
diff --git a/src/python/src/grpc/framework/assembly/__init__.py b/src/python/src/grpc/framework/assembly/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..708651910607ffb686d781713f6893567821b9fd
--- /dev/null
+++ b/src/python/src/grpc/framework/assembly/__init__.py
@@ -0,0 +1,30 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
diff --git a/src/python/src/grpc/framework/assembly/implementations.py b/src/python/src/grpc/framework/assembly/implementations.py
new file mode 100644
index 0000000000000000000000000000000000000000..461aa9c85547b4c300067ed0686e3bdf163030e4
--- /dev/null
+++ b/src/python/src/grpc/framework/assembly/implementations.py
@@ -0,0 +1,305 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Implementations for assembling RPC framework values."""
+
+import threading
+
+from grpc.framework.assembly import interfaces
+from grpc.framework.base import util as base_utilities
+from grpc.framework.base.packets import implementations as tickets_implementations
+from grpc.framework.base.packets import interfaces as tickets_interfaces
+from grpc.framework.common import cardinality
+from grpc.framework.common import style
+from grpc.framework.face import implementations as face_implementations
+from grpc.framework.face import interfaces as face_interfaces
+from grpc.framework.face import utilities as face_utilities
+from grpc.framework.foundation import activated
+from grpc.framework.foundation import logging_pool
+
+_ONE_DAY_IN_SECONDS = 60 * 60 * 24
+_THREAD_POOL_SIZE = 100
+
+
+class _FaceStub(object):
+
+ def __init__(self, rear_link):
+ self._rear_link = rear_link
+ self._lock = threading.Lock()
+ self._pool = None
+ self._front = None
+ self._under_stub = None
+
+ def __enter__(self):
+ with self._lock:
+ self._pool = logging_pool.pool(_THREAD_POOL_SIZE)
+ self._front = tickets_implementations.front(
+ self._pool, self._pool, self._pool)
+ self._rear_link.start()
+ self._rear_link.join_fore_link(self._front)
+ self._front.join_rear_link(self._rear_link)
+ self._under_stub = face_implementations.stub(self._front, self._pool)
+
+ def __exit__(self, exc_type, exc_val, exc_tb):
+ with self._lock:
+ self._under_stub = None
+ self._rear_link.stop()
+ base_utilities.wait_for_idle(self._front)
+ self._front = None
+ self._pool.shutdown(wait=True)
+ self._pool = None
+ return False
+
+ def __getattr__(self, attr):
+ with self._lock:
+ if self._under_stub is None:
+ raise ValueError('Called out of context!')
+ else:
+ return getattr(self._under_stub, attr)
+
+
+def _behaviors(implementations, front, pool):
+ behaviors = {}
+ stub = face_implementations.stub(front, pool)
+ for name, implementation in implementations.iteritems():
+ if implementation.cardinality is cardinality.Cardinality.UNARY_UNARY:
+ behaviors[name] = stub.unary_unary_sync_async(name)
+ elif implementation.cardinality is cardinality.Cardinality.UNARY_STREAM:
+ behaviors[name] = lambda request, context, bound_name=name: (
+ stub.inline_value_in_stream_out(bound_name, request, context))
+ elif implementation.cardinality is cardinality.Cardinality.STREAM_UNARY:
+ behaviors[name] = stub.stream_unary_sync_async(name)
+ elif implementation.cardinality is cardinality.Cardinality.STREAM_STREAM:
+ behaviors[name] = lambda request_iterator, context, bound_name=name: (
+ stub.inline_stream_in_stream_out(
+ bound_name, request_iterator, context))
+ return behaviors
+
+
+class _DynamicInlineStub(object):
+
+ def __init__(self, implementations, rear_link):
+ self._implementations = implementations
+ self._rear_link = rear_link
+ self._lock = threading.Lock()
+ self._pool = None
+ self._front = None
+ self._behaviors = None
+
+ def __enter__(self):
+ with self._lock:
+ self._pool = logging_pool.pool(_THREAD_POOL_SIZE)
+ self._front = tickets_implementations.front(
+ self._pool, self._pool, self._pool)
+ self._rear_link.start()
+ self._rear_link.join_fore_link(self._front)
+ self._front.join_rear_link(self._rear_link)
+ self._behaviors = _behaviors(
+ self._implementations, self._front, self._pool)
+ return self
+
+ def __exit__(self, exc_type, exc_val, exc_tb):
+ with self._lock:
+ self._behaviors = None
+ self._rear_link.stop()
+ base_utilities.wait_for_idle(self._front)
+ self._front = None
+ self._pool.shutdown(wait=True)
+ self._pool = None
+ return False
+
+ def __getattr__(self, attr):
+ with self._lock:
+ behavior = self._behaviors.get(attr)
+ if behavior is None:
+ raise AttributeError(attr)
+ else:
+ return behavior
+
+
+def _servicer(implementations, pool):
+ inline_value_in_value_out_methods = {}
+ inline_value_in_stream_out_methods = {}
+ inline_stream_in_value_out_methods = {}
+ inline_stream_in_stream_out_methods = {}
+ event_value_in_value_out_methods = {}
+ event_value_in_stream_out_methods = {}
+ event_stream_in_value_out_methods = {}
+ event_stream_in_stream_out_methods = {}
+
+ for name, implementation in implementations.iteritems():
+ if implementation.cardinality is cardinality.Cardinality.UNARY_UNARY:
+ if implementation.style is style.Service.INLINE:
+ inline_value_in_value_out_methods[name] = (
+ face_utilities.inline_unary_unary_method(implementation.unary_unary_inline))
+ elif implementation.style is style.Service.EVENT:
+ event_value_in_value_out_methods[name] = (
+ face_utilities.event_unary_unary_method(implementation.unary_unary_event))
+ elif implementation.cardinality is cardinality.Cardinality.UNARY_STREAM:
+ if implementation.style is style.Service.INLINE:
+ inline_value_in_stream_out_methods[name] = (
+ face_utilities.inline_unary_stream_method(implementation.unary_stream_inline))
+ elif implementation.style is style.Service.EVENT:
+ event_value_in_stream_out_methods[name] = (
+ face_utilities.event_unary_stream_method(implementation.unary_stream_event))
+ if implementation.cardinality is cardinality.Cardinality.STREAM_UNARY:
+ if implementation.style is style.Service.INLINE:
+ inline_stream_in_value_out_methods[name] = (
+ face_utilities.inline_stream_unary_method(implementation.stream_unary_inline))
+ elif implementation.style is style.Service.EVENT:
+ event_stream_in_value_out_methods[name] = (
+ face_utilities.event_stream_unary_method(implementation.stream_unary_event))
+ elif implementation.cardinality is cardinality.Cardinality.STREAM_STREAM:
+ if implementation.style is style.Service.INLINE:
+ inline_stream_in_stream_out_methods[name] = (
+ face_utilities.inline_stream_stream_method(implementation.stream_stream_inline))
+ elif implementation.style is style.Service.EVENT:
+ event_stream_in_stream_out_methods[name] = (
+ face_utilities.event_stream_stream_method(implementation.stream_stream_event))
+
+ return face_implementations.servicer(
+ pool,
+ inline_value_in_value_out_methods=inline_value_in_value_out_methods,
+ inline_value_in_stream_out_methods=inline_value_in_stream_out_methods,
+ inline_stream_in_value_out_methods=inline_stream_in_value_out_methods,
+ inline_stream_in_stream_out_methods=inline_stream_in_stream_out_methods,
+ event_value_in_value_out_methods=event_value_in_value_out_methods,
+ event_value_in_stream_out_methods=event_value_in_stream_out_methods,
+ event_stream_in_value_out_methods=event_stream_in_value_out_methods,
+ event_stream_in_stream_out_methods=event_stream_in_stream_out_methods)
+
+
+class _ServiceAssembly(activated.Activated):
+
+ def __init__(self, implementations, fore_link):
+ self._implementations = implementations
+ self._fore_link = fore_link
+ self._lock = threading.Lock()
+ self._pool = None
+ self._back = None
+
+ def _start(self):
+ with self._lock:
+ self._pool = logging_pool.pool(_THREAD_POOL_SIZE)
+ servicer = _servicer(self._implementations, self._pool)
+ self._back = tickets_implementations.back(
+ servicer, self._pool, self._pool, self._pool, _ONE_DAY_IN_SECONDS,
+ _ONE_DAY_IN_SECONDS)
+ self._fore_link.start()
+ self._fore_link.join_rear_link(self._back)
+ self._back.join_fore_link(self._fore_link)
+
+ def _stop(self):
+ with self._lock:
+ self._fore_link.stop()
+ base_utilities.wait_for_idle(self._back)
+ self._back = None
+ self._pool.shutdown(wait=True)
+ self._pool = None
+
+ def __enter__(self):
+ self._start()
+ return self
+
+ def __exit__(self, exc_type, exc_val, exc_tb):
+ self._stop()
+ return False
+
+ def start(self):
+ return self._start()
+
+ def stop(self):
+ self._stop()
+
+
+def assemble_face_stub(activated_rear_link):
+ """Assembles a face_interfaces.Stub.
+
+ The returned object is a context manager and may only be used in context to
+ invoke RPCs.
+
+ Args:
+ activated_rear_link: An object that is both a tickets_interfaces.RearLink
+ and an activated.Activated. The object should be in the inactive state
+ when passed to this method.
+
+ Returns:
+ A face_interfaces.Stub on which, in context, RPCs can be invoked.
+ """
+ return _FaceStub(activated_rear_link)
+
+
+def assemble_dynamic_inline_stub(implementations, activated_rear_link):
+ """Assembles a stub with method names for attributes.
+
+ The returned object is a context manager and may only be used in context to
+ invoke RPCs.
+
+ The returned object, when used in context, will respond to attribute access
+ as follows: if the requested attribute is the name of a unary-unary RPC
+ method, the value of the attribute will be a
+ face_interfaces.UnaryUnarySyncAsync with which to invoke the RPC method. If
+ the requested attribute is the name of a unary-stream RPC method, the value
+ of the attribute will be a callable with the semantics of
+ face_interfaces.Stub.inline_value_in_stream_out, minus the "name" parameter,
+ with which to invoke the RPC method. If the requested attribute is the name
+ of a stream-unary RPC method, the value of the attribute will be a
+ face_interfaces.StreamUnarySyncAsync with which to invoke the RPC method. If
+ the requested attribute is the name of a stream-stream RPC method, the value
+ of the attribute will be a callable with the semantics of
+ face_interfaces.Stub.inline_stream_in_stream_out, minus the "name" parameter,
+ with which to invoke the RPC method.
+
+ Args:
+ implementations: A dictionary from RPC method name to
+ interfaces.MethodImplementation.
+ activated_rear_link: An object that is both a tickets_interfaces.RearLink
+ and an activated.Activated. The object should be in the inactive state
+ when passed to this method.
+
+ Returns:
+ A stub on which, in context, RPCs can be invoked.
+ """
+ return _DynamicInlineStub(implementations, activated_rear_link)
+
+
+def assemble_service(implementations, activated_fore_link):
+ """Assembles the service-side of the RPC Framework stack.
+
+ Args:
+ implementations: A dictionary from RPC method name to
+ interfaces.MethodImplementation.
+ activated_fore_link: An object that is both a tickets_interfaces.ForeLink
+ and an activated.Activated. The object should be in the inactive state
+ when passed to this method.
+
+ Returns:
+ An activated.Activated value encapsulating RPC service.
+ """
+ return _ServiceAssembly(implementations, activated_fore_link)
diff --git a/src/python/src/grpc/framework/assembly/implementations_test.py b/src/python/src/grpc/framework/assembly/implementations_test.py
new file mode 100644
index 0000000000000000000000000000000000000000..74dc02ed83ddba887111be86668e193f8c1ea638
--- /dev/null
+++ b/src/python/src/grpc/framework/assembly/implementations_test.py
@@ -0,0 +1,284 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# TODO(nathaniel): Expand this test coverage.
+
+"""Test of the GRPC-backed ForeLink and RearLink."""
+
+import threading
+import unittest
+
+from grpc.framework.assembly import implementations
+from grpc.framework.assembly import utilities
+from grpc.framework.base import interfaces
+from grpc.framework.base.packets import packets as tickets
+from grpc.framework.base.packets import interfaces as tickets_interfaces
+from grpc.framework.base.packets import null
+from grpc.framework.foundation import logging_pool
+from grpc._junkdrawer import math_pb2
+
+DIV = 'Div'
+DIV_MANY = 'DivMany'
+FIB = 'Fib'
+SUM = 'Sum'
+
+def _fibbonacci(limit):
+ left, right = 0, 1
+ for _ in xrange(limit):
+ yield left
+ left, right = right, left + right
+
+
+def _div(request, unused_context):
+ return math_pb2.DivReply(
+ quotient=request.dividend / request.divisor,
+ remainder=request.dividend % request.divisor)
+
+
+def _div_many(request_iterator, unused_context):
+ for request in request_iterator:
+ yield math_pb2.DivReply(
+ quotient=request.dividend / request.divisor,
+ remainder=request.dividend % request.divisor)
+
+
+def _fib(request, unused_context):
+ for number in _fibbonacci(request.limit):
+ yield math_pb2.Num(num=number)
+
+
+def _sum(request_iterator, unused_context):
+ accumulation = 0
+ for request in request_iterator:
+ accumulation += request.num
+ return math_pb2.Num(num=accumulation)
+
+
+_IMPLEMENTATIONS = {
+ DIV: utilities.unary_unary_inline(_div),
+ DIV_MANY: utilities.stream_stream_inline(_div_many),
+ FIB: utilities.unary_stream_inline(_fib),
+ SUM: utilities.stream_unary_inline(_sum),
+}
+
+_TIMEOUT = 10
+
+
+class PipeLink(tickets_interfaces.ForeLink, tickets_interfaces.RearLink):
+
+ def __init__(self):
+ self._fore_lock = threading.Lock()
+ self._fore_link = null.NULL_FORE_LINK
+ self._rear_lock = threading.Lock()
+ self._rear_link = null.NULL_REAR_LINK
+
+ def __enter__(self):
+ return self
+
+ def __exit__(self, exc_type, exc_val, exc_tb):
+ return False
+
+ def start(self):
+ pass
+
+ def stop(self):
+ pass
+
+ def accept_back_to_front_ticket(self, ticket):
+ with self._fore_lock:
+ self._fore_link.accept_back_to_front_ticket(ticket)
+
+ def join_rear_link(self, rear_link):
+ with self._rear_lock:
+ self._rear_link = null.NULL_REAR_LINK if rear_link is None else rear_link
+
+ def accept_front_to_back_ticket(self, ticket):
+ with self._rear_lock:
+ self._rear_link.accept_front_to_back_ticket(ticket)
+
+ def join_fore_link(self, fore_link):
+ with self._fore_lock:
+ self._fore_link = null.NULL_FORE_LINK if fore_link is None else fore_link
+
+
+class FaceStubTest(unittest.TestCase):
+
+ def testUnaryUnary(self):
+ divisor = 7
+ dividend = 13
+ expected_quotient = 1
+ expected_remainder = 6
+ pipe = PipeLink()
+ service = implementations.assemble_service(_IMPLEMENTATIONS, pipe)
+ face_stub = implementations.assemble_face_stub(pipe)
+
+ service.start()
+ try:
+ with face_stub:
+ response = face_stub.blocking_value_in_value_out(
+ DIV, math_pb2.DivArgs(divisor=divisor, dividend=dividend),
+ _TIMEOUT)
+ self.assertEqual(expected_quotient, response.quotient)
+ self.assertEqual(expected_remainder, response.remainder)
+ finally:
+ service.stop()
+
+ def testUnaryStream(self):
+ stream_length = 29
+ pipe = PipeLink()
+ service = implementations.assemble_service(_IMPLEMENTATIONS, pipe)
+ face_stub = implementations.assemble_face_stub(pipe)
+
+ with service, face_stub:
+ responses = list(
+ face_stub.inline_value_in_stream_out(
+ FIB, math_pb2.FibArgs(limit=stream_length), _TIMEOUT))
+ numbers = [response.num for response in responses]
+ for early, middle, later in zip(numbers, numbers[1:], numbers[2:]):
+ self.assertEqual(early + middle, later)
+
+ def testStreamUnary(self):
+ stream_length = 13
+ pipe = PipeLink()
+ service = implementations.assemble_service(_IMPLEMENTATIONS, pipe)
+ face_stub = implementations.assemble_face_stub(pipe)
+
+ with service, face_stub:
+ sync_async = face_stub.stream_unary_sync_async(SUM)
+ response_future = sync_async.async(
+ (math_pb2.Num(num=index) for index in range(stream_length)),
+ _TIMEOUT)
+ self.assertEqual(
+ (stream_length * (stream_length - 1)) / 2,
+ response_future.result().num)
+
+ def testStreamStream(self):
+ stream_length = 17
+ divisor_offset = 7
+ dividend_offset = 17
+ pipe = PipeLink()
+ service = implementations.assemble_service(_IMPLEMENTATIONS, pipe)
+ face_stub = implementations.assemble_face_stub(pipe)
+
+ with service, face_stub:
+ response_iterator = face_stub.inline_stream_in_stream_out(
+ DIV_MANY,
+ (math_pb2.DivArgs(
+ divisor=divisor_offset + index,
+ dividend=dividend_offset + index)
+ for index in range(stream_length)),
+ _TIMEOUT)
+ for index, response in enumerate(response_iterator):
+ self.assertEqual(
+ (dividend_offset + index) / (divisor_offset + index),
+ response.quotient)
+ self.assertEqual(
+ (dividend_offset + index) % (divisor_offset + index),
+ response.remainder)
+ self.assertEqual(stream_length, index + 1)
+
+
+class DynamicInlineStubTest(unittest.TestCase):
+
+ def testUnaryUnary(self):
+ divisor = 59
+ dividend = 973
+ expected_quotient = dividend / divisor
+ expected_remainder = dividend % divisor
+ pipe = PipeLink()
+ service = implementations.assemble_service(_IMPLEMENTATIONS, pipe)
+ dynamic_stub = implementations.assemble_dynamic_inline_stub(
+ _IMPLEMENTATIONS, pipe)
+
+ service.start()
+ with dynamic_stub:
+ response = dynamic_stub.Div(
+ math_pb2.DivArgs(divisor=divisor, dividend=dividend), _TIMEOUT)
+ self.assertEqual(expected_quotient, response.quotient)
+ self.assertEqual(expected_remainder, response.remainder)
+ service.stop()
+
+ def testUnaryStream(self):
+ stream_length = 43
+ pipe = PipeLink()
+ service = implementations.assemble_service(_IMPLEMENTATIONS, pipe)
+ dynamic_stub = implementations.assemble_dynamic_inline_stub(
+ _IMPLEMENTATIONS, pipe)
+
+ with service, dynamic_stub:
+ response_iterator = dynamic_stub.Fib(
+ math_pb2.FibArgs(limit=stream_length), _TIMEOUT)
+ numbers = tuple(response.num for response in response_iterator)
+ for early, middle, later in zip(numbers, numbers[:1], numbers[:2]):
+ self.assertEqual(early + middle, later)
+ self.assertEqual(stream_length, len(numbers))
+
+ def testStreamUnary(self):
+ stream_length = 127
+ pipe = PipeLink()
+ service = implementations.assemble_service(_IMPLEMENTATIONS, pipe)
+ dynamic_stub = implementations.assemble_dynamic_inline_stub(
+ _IMPLEMENTATIONS, pipe)
+
+ with service, dynamic_stub:
+ response_future = dynamic_stub.Sum.async(
+ (math_pb2.Num(num=index) for index in range(stream_length)),
+ _TIMEOUT)
+ self.assertEqual(
+ (stream_length * (stream_length - 1)) / 2,
+ response_future.result().num)
+
+ def testStreamStream(self):
+ stream_length = 179
+ divisor_offset = 71
+ dividend_offset = 1763
+ pipe = PipeLink()
+ service = implementations.assemble_service(_IMPLEMENTATIONS, pipe)
+ dynamic_stub = implementations.assemble_dynamic_inline_stub(
+ _IMPLEMENTATIONS, pipe)
+
+ with service, dynamic_stub:
+ response_iterator = dynamic_stub.DivMany(
+ (math_pb2.DivArgs(
+ divisor=divisor_offset + index,
+ dividend=dividend_offset + index)
+ for index in range(stream_length)),
+ _TIMEOUT)
+ for index, response in enumerate(response_iterator):
+ self.assertEqual(
+ (dividend_offset + index) / (divisor_offset + index),
+ response.quotient)
+ self.assertEqual(
+ (dividend_offset + index) % (divisor_offset + index),
+ response.remainder)
+ self.assertEqual(stream_length, index + 1)
+
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/src/python/src/grpc/framework/assembly/interfaces.py b/src/python/src/grpc/framework/assembly/interfaces.py
new file mode 100644
index 0000000000000000000000000000000000000000..e5d750b2bc21f460c421af594605fa332879685a
--- /dev/null
+++ b/src/python/src/grpc/framework/assembly/interfaces.py
@@ -0,0 +1,91 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# TODO(nathaniel): The assembly layer only exists to smooth out wrinkles in
+# the face layer. The two should be squashed together as soon as manageable.
+"""Interfaces for assembling RPC Framework values."""
+
+import abc
+
+# cardinality, style, and stream are referenced from specification in this
+# module.
+from grpc.framework.common import cardinality # pylint: disable=unused-import
+from grpc.framework.common import style # pylint: disable=unused-import
+from grpc.framework.foundation import stream # pylint: disable=unused-import
+
+
+class MethodImplementation(object):
+ """A sum type that describes an RPC method implementation.
+
+ Attributes:
+ cardinality: A cardinality.Cardinality value.
+ style: A style.Service value.
+ unary_unary_inline: The implementation of the RPC method as a callable
+ value that takes a request value and a face_interfaces.RpcContext object
+ and returns a response value. Only non-None if cardinality is
+ cardinality.Cardinality.UNARY_UNARY and style is style.Service.INLINE.
+ unary_stream_inline: The implementation of the RPC method as a callable
+ value that takes a request value and a face_interfaces.RpcContext object
+ and returns an iterator of response values. Only non-None if cardinality
+ is cardinality.Cardinality.UNARY_STREAM and style is
+ style.Service.INLINE.
+ stream_unary_inline: The implementation of the RPC method as a callable
+ value that takes an iterator of request values and a
+ face_interfaces.RpcContext object and returns a response value. Only
+ non-None if cardinality is cardinality.Cardinality.STREAM_UNARY and style
+ is style.Service.INLINE.
+ stream_stream_inline: The implementation of the RPC method as a callable
+ value that takes an iterator of request values and a
+ face_interfaces.RpcContext object and returns an iterator of response
+ values. Only non-None if cardinality is
+ cardinality.Cardinality.STREAM_STREAM and style is style.Service.INLINE.
+ unary_unary_event: The implementation of the RPC method as a callable value
+ that takes a request value, a response callback to which to pass the
+ response value of the RPC, and a face_interfaces.RpcContext. Only
+ non-None if cardinality is cardinality.Cardinality.UNARY_UNARY and style
+ is style.Service.EVENT.
+ unary_stream_event: The implementation of the RPC method as a callable
+ value that takes a request value, a stream.Consumer to which to pass the
+ the response values of the RPC, and a face_interfaces.RpcContext. Only
+ non-None if cardinality is cardinality.Cardinality.UNARY_STREAM and style
+ is style.Service.EVENT.
+ stream_unary_event: The implementation of the RPC method as a callable
+ value that takes a response callback to which to pass the response value
+ of the RPC and a face_interfaces.RpcContext and returns a stream.Consumer
+ to which the request values of the RPC should be passed. Only non-None if
+ cardinality is cardinality.Cardinality.STREAM_UNARY and style is
+ style.Service.EVENT.
+ stream_stream_event: The implementation of the RPC method as a callable
+ value that takes a stream.Consumer to which to pass the response values
+ of the RPC and a face_interfaces.RpcContext and returns a stream.Consumer
+ to which the request values of the RPC should be passed. Only non-None if
+ cardinality is cardinality.Cardinality.STREAM_STREAM and style is
+ style.Service.EVENT.
+ """
+ __metaclass__ = abc.ABCMeta
diff --git a/src/python/src/grpc/framework/assembly/utilities.py b/src/python/src/grpc/framework/assembly/utilities.py
new file mode 100644
index 0000000000000000000000000000000000000000..80e7f59c03c5f8b49696f2fffefe2827b2803f86
--- /dev/null
+++ b/src/python/src/grpc/framework/assembly/utilities.py
@@ -0,0 +1,179 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Utilities for assembling RPC framework values."""
+
+import collections
+
+from grpc.framework.assembly import interfaces
+from grpc.framework.common import cardinality
+from grpc.framework.common import style
+from grpc.framework.face import interfaces as face_interfaces
+from grpc.framework.foundation import stream
+
+
+class _MethodImplementation(
+ interfaces.MethodImplementation,
+ collections.namedtuple(
+ '_MethodImplementation',
+ ['cardinality', 'style', 'unary_unary_inline', 'unary_stream_inline',
+ 'stream_unary_inline', 'stream_stream_inline', 'unary_unary_event',
+ 'unary_stream_event', 'stream_unary_event', 'stream_stream_event',])):
+ pass
+
+
+def unary_unary_inline(behavior):
+ """Creates an interfaces.MethodImplementation for the given behavior.
+
+ Args:
+ behavior: The implementation of a unary-unary RPC method as a callable value
+ that takes a request value and a face_interfaces.RpcContext object and
+ returns a response value.
+
+ Returns:
+ An interfaces.MethodImplementation derived from the given behavior.
+ """
+ return _MethodImplementation(
+ cardinality.Cardinality.UNARY_UNARY, style.Service.INLINE, behavior,
+ None, None, None, None, None, None, None)
+
+
+def unary_stream_inline(behavior):
+ """Creates an interfaces.MethodImplementation for the given behavior.
+
+ Args:
+ behavior: The implementation of a unary-stream RPC method as a callable
+ value that takes a request value and a face_interfaces.RpcContext object
+ and returns an iterator of response values.
+
+ Returns:
+ An interfaces.MethodImplementation derived from the given behavior.
+ """
+ return _MethodImplementation(
+ cardinality.Cardinality.UNARY_STREAM, style.Service.INLINE, None,
+ behavior, None, None, None, None, None, None)
+
+
+def stream_unary_inline(behavior):
+ """Creates an interfaces.MethodImplementation for the given behavior.
+
+ Args:
+ behavior: The implementation of a stream-unary RPC method as a callable
+ value that takes an iterator of request values and a
+ face_interfaces.RpcContext object and returns a response value.
+
+ Returns:
+ An interfaces.MethodImplementation derived from the given behavior.
+ """
+ return _MethodImplementation(
+ cardinality.Cardinality.STREAM_UNARY, style.Service.INLINE, None, None,
+ behavior, None, None, None, None, None)
+
+
+def stream_stream_inline(behavior):
+ """Creates an interfaces.MethodImplementation for the given behavior.
+
+ Args:
+ behavior: The implementation of a stream-stream RPC method as a callable
+ value that takes an iterator of request values and a
+ face_interfaces.RpcContext object and returns an iterator of response
+ values.
+
+ Returns:
+ An interfaces.MethodImplementation derived from the given behavior.
+ """
+ return _MethodImplementation(
+ cardinality.Cardinality.STREAM_STREAM, style.Service.INLINE, None, None,
+ None, behavior, None, None, None, None)
+
+
+def unary_unary_event(behavior):
+ """Creates an interfaces.MethodImplementation for the given behavior.
+
+ Args:
+ behavior: The implementation of a unary-unary RPC method as a callable
+ value that takes a request value, a response callback to which to pass
+ the response value of the RPC, and a face_interfaces.RpcContext.
+
+ Returns:
+ An interfaces.MethodImplementation derived from the given behavior.
+ """
+ return _MethodImplementation(
+ cardinality.Cardinality.UNARY_UNARY, style.Service.EVENT, None, None,
+ None, None, behavior, None, None, None)
+
+
+def unary_stream_event(behavior):
+ """Creates an interfaces.MethodImplementation for the given behavior.
+
+ Args:
+ behavior: The implementation of a unary-stream RPC method as a callable
+ value that takes a request value, a stream.Consumer to which to pass the
+ the response values of the RPC, and a face_interfaces.RpcContext.
+
+ Returns:
+ An interfaces.MethodImplementation derived from the given behavior.
+ """
+ return _MethodImplementation(
+ cardinality.Cardinality.UNARY_STREAM, style.Service.EVENT, None, None,
+ None, None, None, behavior, None, None)
+
+
+def stream_unary_event(behavior):
+ """Creates an interfaces.MethodImplementation for the given behavior.
+
+ Args:
+ behavior: The implementation of a stream-unary RPC method as a callable
+ value that takes a response callback to which to pass the response value
+ of the RPC and a face_interfaces.RpcContext and returns a stream.Consumer
+ to which the request values of the RPC should be passed.
+
+ Returns:
+ An interfaces.MethodImplementation derived from the given behavior.
+ """
+ return _MethodImplementation(
+ cardinality.Cardinality.STREAM_UNARY, style.Service.EVENT, None, None,
+ None, None, None, None, behavior, None)
+
+
+def stream_stream_event(behavior):
+ """Creates an interfaces.MethodImplementation for the given behavior.
+
+ Args:
+ behavior: The implementation of a stream-stream RPC method as a callable
+ value that takes a stream.Consumer to which to pass the response values
+ of the RPC and a face_interfaces.RpcContext and returns a stream.Consumer
+ to which the request values of the RPC should be passed.
+
+ Returns:
+ An interfaces.MethodImplementation derived from the given behavior.
+ """
+ return _MethodImplementation(
+ cardinality.Cardinality.STREAM_STREAM, style.Service.EVENT, None, None,
+ None, None, None, None, None, behavior)
diff --git a/src/python/src/grpc/framework/common/style.py b/src/python/src/grpc/framework/common/style.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ae694bdcb40d2c178b2659a4fe76261223795d0
--- /dev/null
+++ b/src/python/src/grpc/framework/common/style.py
@@ -0,0 +1,40 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Defines an enum for classifying RPC methods by control flow semantics."""
+
+import enum
+
+
+@enum.unique
+class Service(enum.Enum):
+ """Describes the control flow style of RPC method implementation."""
+
+ INLINE = 'inline'
+ EVENT = 'event'
diff --git a/src/python/src/grpc/framework/face/utilities.py b/src/python/src/grpc/framework/face/utilities.py
new file mode 100644
index 0000000000000000000000000000000000000000..5e34be37da7a5e9c537db9f280b609bd6d649ece
--- /dev/null
+++ b/src/python/src/grpc/framework/face/utilities.py
@@ -0,0 +1,221 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Utilities for the face layer of RPC Framework."""
+
+# stream is referenced from specification in this module.
+from grpc.framework.face import interfaces
+from grpc.framework.foundation import stream # pylint: disable=unused-import
+
+
+class _InlineUnaryUnaryMethod(interfaces.InlineValueInValueOutMethod):
+
+ def __init__(self, behavior):
+ self._behavior = behavior
+
+ def service(self, request, context):
+ return self._behavior(request, context)
+
+
+class _InlineUnaryStreamMethod(interfaces.InlineValueInStreamOutMethod):
+
+ def __init__(self, behavior):
+ self._behavior = behavior
+
+ def service(self, request, context):
+ return self._behavior(request, context)
+
+
+class _InlineStreamUnaryMethod(interfaces.InlineStreamInValueOutMethod):
+
+ def __init__(self, behavior):
+ self._behavior = behavior
+
+ def service(self, request_iterator, context):
+ return self._behavior(request_iterator, context)
+
+
+class _InlineStreamStreamMethod(interfaces.InlineStreamInStreamOutMethod):
+
+ def __init__(self, behavior):
+ self._behavior = behavior
+
+ def service(self, request_iterator, context):
+ return self._behavior(request_iterator, context)
+
+
+class _EventUnaryUnaryMethod(interfaces.EventValueInValueOutMethod):
+
+ def __init__(self, behavior):
+ self._behavior = behavior
+
+ def service(self, request, response_callback, context):
+ return self._behavior(request, response_callback, context)
+
+
+class _EventUnaryStreamMethod(interfaces.EventValueInStreamOutMethod):
+
+ def __init__(self, behavior):
+ self._behavior = behavior
+
+ def service(self, request, response_consumer, context):
+ return self._behavior(request, response_consumer, context)
+
+
+class _EventStreamUnaryMethod(interfaces.EventStreamInValueOutMethod):
+
+ def __init__(self, behavior):
+ self._behavior = behavior
+
+ def service(self, response_callback, context):
+ return self._behavior(response_callback, context)
+
+
+class _EventStreamStreamMethod(interfaces.EventStreamInStreamOutMethod):
+
+ def __init__(self, behavior):
+ self._behavior = behavior
+
+ def service(self, response_consumer, context):
+ return self._behavior(response_consumer, context)
+
+
+def inline_unary_unary_method(behavior):
+ """Creates an interfaces.InlineValueInValueOutMethod from a behavior.
+
+ Args:
+ behavior: The implementation of a unary-unary RPC method as a callable
+ value that takes a request value and an interfaces.RpcContext object and
+ returns a response value.
+
+ Returns:
+ An interfaces.InlineValueInValueOutMethod derived from the given behavior.
+ """
+ return _InlineUnaryUnaryMethod(behavior)
+
+
+def inline_unary_stream_method(behavior):
+ """Creates an interfaces.InlineValueInStreamOutMethod from a behavior.
+
+ Args:
+ behavior: The implementation of a unary-stream RPC method as a callable
+ value that takes a request value and an interfaces.RpcContext object and
+ returns an iterator of response values.
+
+ Returns:
+ An interfaces.InlineValueInStreamOutMethod derived from the given behavior.
+ """
+ return _InlineUnaryStreamMethod(behavior)
+
+
+def inline_stream_unary_method(behavior):
+ """Creates an interfaces.InlineStreamInValueOutMethod from a behavior.
+
+ Args:
+ behavior: The implementation of a stream-unary RPC method as a callable
+ value that takes an iterator of request values and an
+ interfaces.RpcContext object and returns a response value.
+
+ Returns:
+ An interfaces.InlineStreamInValueOutMethod derived from the given behavior.
+ """
+ return _InlineStreamUnaryMethod(behavior)
+
+
+def inline_stream_stream_method(behavior):
+ """Creates an interfaces.InlineStreamInStreamOutMethod from a behavior.
+
+ Args:
+ behavior: The implementation of a stream-stream RPC method as a callable
+ value that takes an iterator of request values and an
+ interfaces.RpcContext object and returns an iterator of response values.
+
+ Returns:
+ An interfaces.InlineStreamInStreamOutMethod derived from the given
+ behavior.
+ """
+ return _InlineStreamStreamMethod(behavior)
+
+
+def event_unary_unary_method(behavior):
+ """Creates an interfaces.EventValueInValueOutMethod from a behavior.
+
+ Args:
+ behavior: The implementation of a unary-unary RPC method as a callable
+ value that takes a request value, a response callback to which to pass
+ the response value of the RPC, and an interfaces.RpcContext.
+
+ Returns:
+ An interfaces.EventValueInValueOutMethod derived from the given behavior.
+ """
+ return _EventUnaryUnaryMethod(behavior)
+
+
+def event_unary_stream_method(behavior):
+ """Creates an interfaces.EventValueInStreamOutMethod from a behavior.
+
+ Args:
+ behavior: The implementation of a unary-stream RPC method as a callable
+ value that takes a request value, a stream.Consumer to which to pass the
+ response values of the RPC, and an interfaces.RpcContext.
+
+ Returns:
+ An interfaces.EventValueInStreamOutMethod derived from the given behavior.
+ """
+ return _EventUnaryStreamMethod(behavior)
+
+
+def event_stream_unary_method(behavior):
+ """Creates an interfaces.EventStreamInValueOutMethod from a behavior.
+
+ Args:
+ behavior: The implementation of a stream-unary RPC method as a callable
+ value that takes a response callback to which to pass the response value
+ of the RPC and an interfaces.RpcContext and returns a stream.Consumer to
+ which the request values of the RPC should be passed.
+
+ Returns:
+ An interfaces.EventStreamInValueOutMethod derived from the given behavior.
+ """
+ return _EventStreamUnaryMethod(behavior)
+
+
+def event_stream_stream_method(behavior):
+ """Creates an interfaces.EventStreamInStreamOutMethod from a behavior.
+
+ Args:
+ behavior: The implementation of a stream-stream RPC method as a callable
+ value that takes a stream.Consumer to which to pass the response values
+ of the RPC and an interfaces.RpcContext and returns a stream.Consumer to
+ which the request values of the RPC should be passed.
+
+ Returns:
+ An interfaces.EventStreamInStreamOutMethod derived from the given behavior.
+ """
+ return _EventStreamStreamMethod(behavior)
diff --git a/src/python/src/grpc/framework/foundation/activated.py b/src/python/src/grpc/framework/foundation/activated.py
new file mode 100644
index 0000000000000000000000000000000000000000..426a71c7059eb7c866865c3d898e69eef504c6b6
--- /dev/null
+++ b/src/python/src/grpc/framework/foundation/activated.py
@@ -0,0 +1,65 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""Interfaces related to streams of values or objects."""
+
+import abc
+
+
+class Activated(object):
+ """Interface for objects that may be started and stopped.
+
+ Values implementing this type must also implement the context manager
+ protocol.
+ """
+ __metaclass__ = abc.ABCMeta
+
+ @abc.abstractmethod
+ def __enter__(self):
+ """See the context manager protocol for specification."""
+ raise NotImplementedError()
+
+ @abc.abstractmethod
+ def __exit__(self, exc_type, exc_val, exc_tb):
+ """See the context manager protocol for specification."""
+ raise NotImplementedError()
+
+ @abc.abstractmethod
+ def start(self):
+ """Activates this object.
+
+ Returns:
+ A value equal to the value returned by this object's __enter__ method.
+ """
+ raise NotImplementedError()
+
+ @abc.abstractmethod
+ def stop(self):
+ """Deactivates this object."""
+ raise NotImplementedError()
diff --git a/src/python/src/setup.py b/src/python/src/setup.py
index 8e33ebb31c4060cc3f7bac8b2ee846505bfce80b..e3f13fa5c8f523d2014c0b6077dd7ff34d47bc48 100644
--- a/src/python/src/setup.py
+++ b/src/python/src/setup.py
@@ -56,12 +56,13 @@ _EXTENSION_MODULE = _core.Extension(
libraries=_EXTENSION_LIBRARIES,
)
-_PACKAGES=(
+_PACKAGES = (
'grpc',
'grpc._adapter',
'grpc._junkdrawer',
'grpc.early_adopter',
'grpc.framework',
+ 'grpc.framework.assembly',
'grpc.framework.base',
'grpc.framework.base.packets',
'grpc.framework.common',
diff --git a/templates/tools/run_tests/tests.json.template b/templates/tools/run_tests/tests.json.template
index 04a5137f39d669f210ce4848da78fbb36ff6a018..bb54489861550794513fabc5e32fd41f1eab39e4 100644
--- a/templates/tools/run_tests/tests.json.template
+++ b/templates/tools/run_tests/tests.json.template
@@ -4,6 +4,6 @@ import json
${json.dumps([{"name": tgt.name, "language": tgt.language}
for tgt in targets
- if tgt.build == "test" and tgt.name[-5:] == "_test"],
+ if tgt.get('run', True) and tgt.build == 'test'],
sort_keys=True, indent=2)}
diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c
index 22090ead0ac275bf02137755efdf3ca7b2e2494a..57e2c6fc177ad16ecd2d90a3ce1c4316b26f3059 100644
--- a/test/core/iomgr/fd_posix_test.c
+++ b/test/core/iomgr/fd_posix_test.c
@@ -97,6 +97,7 @@ typedef struct {
gpr_mu mu; /* protect done and done_cv */
gpr_cv done_cv; /* signaled when a server finishes serving */
int done; /* set to 1 when a server finishes serving */
+ grpc_iomgr_closure listen_closure;
} server;
static void server_init(server *sv) {
@@ -112,6 +113,7 @@ typedef struct {
server *sv; /* not owned by a single session */
grpc_fd *em_fd; /* fd to read upload bytes */
char read_buf[BUF_SIZE]; /* buffer to store upload bytes */
+ grpc_iomgr_closure session_read_closure;
} session;
/* Called when an upload session can be safely shutdown.
@@ -162,7 +164,7 @@ static void session_read_cb(void *arg, /*session*/
TODO(chenw): in multi-threaded version, callback and polling can be
run in different threads. polling may catch a persist read edge event
before notify_on_read is called. */
- grpc_fd_notify_on_read(se->em_fd, session_read_cb, se);
+ grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure);
} else {
gpr_log(GPR_ERROR, "Unhandled read error %s", strerror(errno));
abort();
@@ -207,9 +209,11 @@ static void listen_cb(void *arg, /*=sv_arg*/
se = gpr_malloc(sizeof(*se));
se->sv = sv;
se->em_fd = grpc_fd_create(fd);
- grpc_fd_notify_on_read(se->em_fd, session_read_cb, se);
+ se->session_read_closure.cb = session_read_cb;
+ se->session_read_closure.cb_arg = se;
+ grpc_fd_notify_on_read(se->em_fd, &se->session_read_closure);
- grpc_fd_notify_on_read(listen_em_fd, listen_cb, sv);
+ grpc_fd_notify_on_read(listen_em_fd, &sv->listen_closure);
}
/* Max number of connections pending to be accepted by listen(). */
@@ -234,7 +238,9 @@ static int server_start(server *sv) {
sv->em_fd = grpc_fd_create(fd);
/* Register to be interested in reading from listen_fd. */
- grpc_fd_notify_on_read(sv->em_fd, listen_cb, sv);
+ sv->listen_closure.cb = listen_cb;
+ sv->listen_closure.cb_arg = sv;
+ grpc_fd_notify_on_read(sv->em_fd, &sv->listen_closure);
return port;
}
@@ -268,6 +274,7 @@ typedef struct {
gpr_mu mu; /* protect done and done_cv */
gpr_cv done_cv; /* signaled when a client finishes sending */
int done; /* set to 1 when a client finishes sending */
+ grpc_iomgr_closure write_closure;
} client;
static void client_init(client *cl) {
@@ -309,7 +316,9 @@ static void client_session_write(void *arg, /*client*/
if (errno == EAGAIN) {
gpr_mu_lock(&cl->mu);
if (cl->client_write_cnt < CLIENT_TOTAL_WRITE_CNT) {
- grpc_fd_notify_on_write(cl->em_fd, client_session_write, cl);
+ cl->write_closure.cb = client_session_write;
+ cl->write_closure.cb_arg = cl;
+ grpc_fd_notify_on_write(cl->em_fd, &cl->write_closure);
cl->client_write_cnt++;
} else {
client_session_shutdown_cb(arg, 1);
@@ -421,6 +430,13 @@ static void test_grpc_fd_change(void) {
int sv[2];
char data;
int result;
+ grpc_iomgr_closure first_closure;
+ grpc_iomgr_closure second_closure;
+
+ first_closure.cb = first_read_callback;
+ first_closure.cb_arg = &a;
+ second_closure.cb = second_read_callback;
+ second_closure.cb_arg = &b;
init_change_data(&a);
init_change_data(&b);
@@ -434,7 +450,7 @@ static void test_grpc_fd_change(void) {
em_fd = grpc_fd_create(sv[0]);
/* Register the first callback, then make its FD readable */
- grpc_fd_notify_on_read(em_fd, first_read_callback, &a);
+ grpc_fd_notify_on_read(em_fd, &first_closure);
data = 0;
result = write(sv[1], &data, 1);
GPR_ASSERT(result == 1);
@@ -453,7 +469,7 @@ static void test_grpc_fd_change(void) {
/* Now register a second callback with distinct change data, and do the same
thing again. */
- grpc_fd_notify_on_read(em_fd, second_read_callback, &b);
+ grpc_fd_notify_on_read(em_fd, &second_closure);
data = 0;
result = write(sv[1], &data, 1);
GPR_ASSERT(result == 1);
diff --git a/test/cpp/interop/empty.proto b/test/cpp/interop/empty.proto
index f66a108c19b7b46f4afe2b55d09bfc4f03a359a9..4295a0a960c0a07a7cf1df88438d3a8715a1b48b 100644
--- a/test/cpp/interop/empty.proto
+++ b/test/cpp/interop/empty.proto
@@ -40,10 +40,4 @@ package grpc.testing;
// rpc Bar (grpc.testing.Empty) returns (grpc.testing.Empty) { };
// };
//
-// MOE:begin_strip
-// The difference between this one and net/rpc/empty-message.proto is that
-// 1) The generated message here is in proto2 C++ API.
-// 2) The proto2.Empty has minimum dependencies
-// (no message_set or net/rpc dependencies)
-// MOE:end_strip
message Empty {}
diff --git a/test/cpp/qps/client.cc b/test/cpp/qps/client.cc
index 666f25054ab608ec521f7b6a99c074e7fa757641..11c39eb4f52619a9695c1dedc391cf196b8219fa 100644
--- a/test/cpp/qps/client.cc
+++ b/test/cpp/qps/client.cc
@@ -127,7 +127,7 @@ void RunTest(const int client_threads, const int client_channels,
}
std::vector<std::thread> threads; // Will add threads when ready to execute
- std::vector<::gpr_histogram *> thread_stats(client_threads);
+ std::vector< ::gpr_histogram *> thread_stats(client_threads);
TestService::Stub *stub_stats = channels[0].get_stub();
grpc::ClientContext context_stats_begin;
diff --git a/tools/README.md b/tools/README.md
index 7cee610e35b27d86458ef29c6c77d5cbd8bbd067..1dbbad886f93728f1028df379b9c59959721d41d 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -1,4 +1,5 @@
buildgen: contains the template renderer for our build system.
+distpackages: contains script to generate debian packages.
dockerfile: contains all of the docker files to test gRPC.
gce_setup: contains boilerplate for running the docker files under GCE.
run_tests: contains python scripts to properly run the tests in parallel.
diff --git a/tools/buildgen/generate_projects.sh b/tools/buildgen/generate_projects.sh
index d37288a078c555c830e20fbedf77207bc0ed1a04..7a12440db2c0b277a5ade6d8c7b131409953c2d5 100755
--- a/tools/buildgen/generate_projects.sh
+++ b/tools/buildgen/generate_projects.sh
@@ -40,6 +40,8 @@ cd `dirname $0`/../..
mako_renderer=tools/buildgen/mako_renderer.py
gen_build_json=test/core/end2end/gen_build_json.py
+tools/buildgen/build-cleaner.py build.json
+
end2end_test_build=`mktemp /tmp/genXXXXXX`
$gen_build_json > $end2end_test_build
diff --git a/tools/distpackages/.gitignore b/tools/distpackages/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..7a7d3f3fa989d01bedf7592dbcb8f85046f87c3b
--- /dev/null
+++ b/tools/distpackages/.gitignore
@@ -0,0 +1 @@
+deb_out
diff --git a/tools/distpackages/build_deb_packages.sh b/tools/distpackages/build_deb_packages.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f9cf8023402c8b36cee5ce1a2912f2d138d8eb8c
--- /dev/null
+++ b/tools/distpackages/build_deb_packages.sh
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Where to put resulting .deb packages.
+deb_dest="deb_out"
+mkdir -p $deb_dest
+
+version='0.8.0.0'
+
+arch=`uname -p`
+if [ $arch != "x86_64" ]
+then
+ echo Unsupported architecture.
+ exit 1
+fi
+
+# Build debian packages
+for pkg_name in libgrpc libgrpc-dev
+do
+ echo
+ echo "Building package $pkg_name"
+ tmp_dir=`mktemp -d`
+ echo "Using tmp dir $tmp_dir to build the package"
+
+ cp -a templates/$pkg_name $tmp_dir
+
+ arch_lib_dir=$tmp_dir/$pkg_name/usr/lib/$arch-linux-gnu
+
+ if [ $pkg_name == "libgrpc" ]
+ then
+ # Copy shared libraries
+ (cd ../..; make install-shared_c prefix=$tmp_dir/$pkg_name/usr/lib)
+ mv $tmp_dir/$pkg_name/usr/lib/lib $arch_lib_dir
+
+ # non-dev package should contain so.0 symlinks
+ for symlink in $arch_lib_dir/*.so
+ do
+ mv $symlink $symlink.0
+ done
+ fi
+
+ if [ $pkg_name == "libgrpc-dev" ]
+ then
+ # Copy headers and static libraries
+ (cd ../..; make install-headers_c install-static_c prefix=$tmp_dir/$pkg_name/usr/lib)
+ mv $tmp_dir/$pkg_name/usr/lib/include $tmp_dir/$pkg_name/usr/include
+ mv $tmp_dir/$pkg_name/usr/lib/lib $arch_lib_dir
+
+ # create symlinks to shared libraries
+ for libname in $arch_lib_dir/*.a
+ do
+ base=`basename -s .a $libname`
+ ln -s $base.so.$version $arch_lib_dir/$base.so
+ done
+ fi
+
+ # Adjust mode for some files in the package
+ find $tmp_dir/$pkg_name -type d | xargs chmod 755
+ find $tmp_dir/$pkg_name -type f | xargs chmod 644
+ chmod 755 $tmp_dir/$pkg_name/DEBIAN/{postinst,postrm}
+
+ # Build the debian package
+ fakeroot dpkg-deb --build $tmp_dir/$pkg_name || { echo "dpkg-deb failed"; exit 1; }
+
+ deb_path=$deb_dest/${pkg_name}_amd64.deb
+
+ # Copy the .deb file to destination dir
+ cp $tmp_dir/$pkg_name.deb $deb_path
+
+ echo "Resulting package: $deb_path"
+ echo "Package info:"
+ dpkg-deb -I $deb_path
+ echo "Package contents:"
+ dpkg-deb -c $deb_path
+ echo "Problems reported by lintian:"
+ lintian $deb_path
+
+ echo
+done
+
+
diff --git a/tools/distpackages/templates/libgrpc-dev/DEBIAN/control b/tools/distpackages/templates/libgrpc-dev/DEBIAN/control
new file mode 100644
index 0000000000000000000000000000000000000000..64dc79af1956a487e39e7ee88494826bdb45a375
--- /dev/null
+++ b/tools/distpackages/templates/libgrpc-dev/DEBIAN/control
@@ -0,0 +1,10 @@
+Package: libgrpc-dev
+Version: 0.8.0
+Architecture: amd64
+Maintainer: Jan Tattermusch <jtattermusch@google.com>
+Depends: libgrpc, libc6-dev | libc-dev
+Section: libdevel
+Priority: optional
+Homepage: https://github.com/grpc/grpc
+Description: gRPC C Core - header files
+ Core C libraries for gRPC - An RPC library and framework.
diff --git a/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/changelog.gz b/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/changelog.gz
new file mode 100644
index 0000000000000000000000000000000000000000..eabdf46e6e2d798dab32e8ea88029448c988e330
Binary files /dev/null and b/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/changelog.gz differ
diff --git a/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/copyright b/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/copyright
new file mode 100644
index 0000000000000000000000000000000000000000..83fb6f45774159427f419fa5ea14ca3170bcabc6
--- /dev/null
+++ b/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/copyright
@@ -0,0 +1,34 @@
+Copyright:
+
+ Copyright (C) 2015 Google Inc.
+
+License (new style BSD, with Google Inc. as copyright holder):
+
+ Copyright 2015, Google Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/distpackages/templates/libgrpc/DEBIAN/control b/tools/distpackages/templates/libgrpc/DEBIAN/control
new file mode 100644
index 0000000000000000000000000000000000000000..75c224e9a491ae1591d513ea2c13a7e82b428171
--- /dev/null
+++ b/tools/distpackages/templates/libgrpc/DEBIAN/control
@@ -0,0 +1,10 @@
+Package: libgrpc
+Version: 0.8.0
+Architecture: amd64
+Maintainer: Jan Tattermusch <jtattermusch@google.com>
+Depends: libc6
+Section: libs
+Priority: optional
+Homepage: https://github.com/grpc/grpc
+Description: gRPC C Core
+ Core C libraries for gRPC - An RPC library and framework.
diff --git a/tools/distpackages/templates/libgrpc/DEBIAN/postinst b/tools/distpackages/templates/libgrpc/DEBIAN/postinst
new file mode 100644
index 0000000000000000000000000000000000000000..379f1fae0c1af00a36f211b27f094b44eeeedc24
--- /dev/null
+++ b/tools/distpackages/templates/libgrpc/DEBIAN/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+# Automatically added by dh_makeshlibs
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+# End automatically added section
diff --git a/tools/distpackages/templates/libgrpc/DEBIAN/postrm b/tools/distpackages/templates/libgrpc/DEBIAN/postrm
new file mode 100644
index 0000000000000000000000000000000000000000..3e73d38a7e3f68c36ec05e471accdf0e5e1cb60c
--- /dev/null
+++ b/tools/distpackages/templates/libgrpc/DEBIAN/postrm
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+# Automatically added by dh_makeshlibs
+if [ "$1" = "remove" ]; then
+ ldconfig
+fi
+# End automatically added section
diff --git a/tools/distpackages/templates/libgrpc/DEBIAN/shlibs b/tools/distpackages/templates/libgrpc/DEBIAN/shlibs
new file mode 100644
index 0000000000000000000000000000000000000000..31d0e0a3b3d5035c79f0928aa4ab0f0779ce185e
--- /dev/null
+++ b/tools/distpackages/templates/libgrpc/DEBIAN/shlibs
@@ -0,0 +1,3 @@
+libgpr 0
+libgrpc 0
+libgrpc_unsecure 0
diff --git a/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/changelog.gz b/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/changelog.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c07b4d2637133dc9f0f7d8eb373bb203dd4af141
Binary files /dev/null and b/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/changelog.gz differ
diff --git a/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/copyright b/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/copyright
new file mode 100644
index 0000000000000000000000000000000000000000..83fb6f45774159427f419fa5ea14ca3170bcabc6
--- /dev/null
+++ b/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/copyright
@@ -0,0 +1,34 @@
+Copyright:
+
+ Copyright (C) 2015 Google Inc.
+
+License (new style BSD, with Google Inc. as copyright holder):
+
+ Copyright 2015, Google Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_python/Dockerfile b/tools/dockerfile/grpc_python/Dockerfile
index d434b47351089d19c908e42e7854e793e855f900..362227bb6528ad4a200db4665829c74750960c69 100644
--- a/tools/dockerfile/grpc_python/Dockerfile
+++ b/tools/dockerfile/grpc_python/Dockerfile
@@ -24,12 +24,13 @@ RUN cd /var/local/git/grpc \
&& python2.7 -B -m grpc._adapter._links_test
&& python2.7 -B -m grpc._adapter._lonely_rear_link_test
&& python2.7 -B -m grpc._adapter._low_test
- && python2.7 -B -m grpc._framework.base.packets.implementations_test
- && python2.7 -B -m grpc._framework.face.blocking_invocation_inline_service_test
- && python2.7 -B -m grpc._framework.face.event_invocation_synchronous_event_service_test
- && python2.7 -B -m grpc._framework.face.future_invocation_asynchronous_event_service_test
- && python2.7 -B -m grpc._framework.foundation._later_test
- && python2.7 -B -m grpc._framework.foundation._logging_pool_test
+ && python2.7 -B -m grpc.framework.assembly.implementations_test
+ && python2.7 -B -m grpc.framework.base.packets.implementations_test
+ && python2.7 -B -m grpc.framework.face.blocking_invocation_inline_service_test
+ && python2.7 -B -m grpc.framework.face.event_invocation_synchronous_event_service_test
+ && python2.7 -B -m grpc.framework.face.future_invocation_asynchronous_event_service_test
+ && python2.7 -B -m grpc.framework.foundation._later_test
+ && python2.7 -B -m grpc.framework.foundation._logging_pool_test
# Add a cacerts directory containing the Google root pem file, allowing the interop client to access the production test instance
ADD cacerts cacerts
diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh
index f21f854b09a3b15906eff24f524abfb5d4fc8fb6..1b8fe1982d160e0b49e8c5b72b99d6b41d6294d4 100755
--- a/tools/run_tests/run_python.sh
+++ b/tools/run_tests/run_python.sh
@@ -44,6 +44,7 @@ python2.7 -B -m grpc._adapter._future_invocation_asynchronous_event_service_test
python2.7 -B -m grpc._adapter._links_test
python2.7 -B -m grpc._adapter._lonely_rear_link_test
python2.7 -B -m grpc._adapter._low_test
+python2.7 -B -m grpc.framework.assembly.implementations_test
python2.7 -B -m grpc.framework.base.packets.implementations_test
python2.7 -B -m grpc.framework.face.blocking_invocation_inline_service_test
python2.7 -B -m grpc.framework.face.event_invocation_synchronous_event_service_test
diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj
index 36eade99de3a730df5c10873e129671686748cda..b55c7f926bafe6be9640947696ba011b74d329ac 100644
--- a/vsprojects/vs2013/grpc.vcxproj
+++ b/vsprojects/vs2013/grpc.vcxproj
@@ -113,6 +113,7 @@
<ClInclude Include="..\..\src\core\channel\noop_filter.h" />
<ClInclude Include="..\..\src\core\compression\algorithm.h" />
<ClInclude Include="..\..\src\core\compression\message_compress.h" />
+ <ClInclude Include="..\..\src\core\debug\trace.h" />
<ClInclude Include="..\..\src\core\iomgr\alarm.h" />
<ClInclude Include="..\..\src\core\iomgr\alarm_heap.h" />
<ClInclude Include="..\..\src\core\iomgr\alarm_internal.h" />
@@ -252,6 +253,8 @@
</ClCompile>
<ClCompile Include="..\..\src\core\compression\message_compress.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\debug\trace.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\alarm.c">
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\alarm_heap.c">
diff --git a/vsprojects/vs2013/grpc.vcxproj.filters b/vsprojects/vs2013/grpc.vcxproj.filters
index cae1c20f2f1fd8ec38204819c048c94ae0466897..9505c37ef4e99f795df487e534085f5d81fe82d7 100644
--- a/vsprojects/vs2013/grpc.vcxproj.filters
+++ b/vsprojects/vs2013/grpc.vcxproj.filters
@@ -100,6 +100,9 @@
<ClCompile Include="..\..\src\core\compression\message_compress.c">
<Filter>src\core\compression</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\debug\trace.c">
+ <Filter>src\core\debug</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\alarm.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
@@ -434,6 +437,9 @@
<ClInclude Include="..\..\src\core\compression\message_compress.h">
<Filter>src\core\compression</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\core\debug\trace.h">
+ <Filter>src\core\debug</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\alarm.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
@@ -668,6 +674,9 @@
<Filter Include="src\core\compression">
<UniqueIdentifier>{263cb913-dfe6-42a4-096b-cac231f76305}</UniqueIdentifier>
</Filter>
+ <Filter Include="src\core\debug">
+ <UniqueIdentifier>{1da7ef8a-a06d-5499-b3de-19fee4a4214d}</UniqueIdentifier>
+ </Filter>
<Filter Include="src\core\httpcli">
<UniqueIdentifier>{a9bc00ad-835f-c625-c6d9-6a1324f98b9f}</UniqueIdentifier>
</Filter>
diff --git a/vsprojects/vs2013/grpc_shared.vcxproj b/vsprojects/vs2013/grpc_shared.vcxproj
index 85fa8ec9f0119ad5c4ccdb57f089b14a6ce98a61..dfb08991380606d4eaf1ce8a7b8174a4b662b418 100644
--- a/vsprojects/vs2013/grpc_shared.vcxproj
+++ b/vsprojects/vs2013/grpc_shared.vcxproj
@@ -117,6 +117,7 @@
<ClInclude Include="..\..\src\core\channel\noop_filter.h" />
<ClInclude Include="..\..\src\core\compression\algorithm.h" />
<ClInclude Include="..\..\src\core\compression\message_compress.h" />
+ <ClInclude Include="..\..\src\core\debug\trace.h" />
<ClInclude Include="..\..\src\core\iomgr\alarm.h" />
<ClInclude Include="..\..\src\core\iomgr\alarm_heap.h" />
<ClInclude Include="..\..\src\core\iomgr\alarm_internal.h" />
@@ -256,6 +257,8 @@
</ClCompile>
<ClCompile Include="..\..\src\core\compression\message_compress.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\debug\trace.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\alarm.c">
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\alarm_heap.c">
diff --git a/vsprojects/vs2013/grpc_shared.vcxproj.filters b/vsprojects/vs2013/grpc_shared.vcxproj.filters
index cae1c20f2f1fd8ec38204819c048c94ae0466897..9505c37ef4e99f795df487e534085f5d81fe82d7 100644
--- a/vsprojects/vs2013/grpc_shared.vcxproj.filters
+++ b/vsprojects/vs2013/grpc_shared.vcxproj.filters
@@ -100,6 +100,9 @@
<ClCompile Include="..\..\src\core\compression\message_compress.c">
<Filter>src\core\compression</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\debug\trace.c">
+ <Filter>src\core\debug</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\alarm.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
@@ -434,6 +437,9 @@
<ClInclude Include="..\..\src\core\compression\message_compress.h">
<Filter>src\core\compression</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\core\debug\trace.h">
+ <Filter>src\core\debug</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\alarm.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
@@ -668,6 +674,9 @@
<Filter Include="src\core\compression">
<UniqueIdentifier>{263cb913-dfe6-42a4-096b-cac231f76305}</UniqueIdentifier>
</Filter>
+ <Filter Include="src\core\debug">
+ <UniqueIdentifier>{1da7ef8a-a06d-5499-b3de-19fee4a4214d}</UniqueIdentifier>
+ </Filter>
<Filter Include="src\core\httpcli">
<UniqueIdentifier>{a9bc00ad-835f-c625-c6d9-6a1324f98b9f}</UniqueIdentifier>
</Filter>
diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj b/vsprojects/vs2013/grpc_unsecure.vcxproj
index 1eebb42b30f978ec0ff6d0cf660f89f5a029ec19..74fc6c96ece59982801bb8419ddd9be746d3333a 100644
--- a/vsprojects/vs2013/grpc_unsecure.vcxproj
+++ b/vsprojects/vs2013/grpc_unsecure.vcxproj
@@ -98,6 +98,7 @@
<ClInclude Include="..\..\src\core\channel\noop_filter.h" />
<ClInclude Include="..\..\src\core\compression\algorithm.h" />
<ClInclude Include="..\..\src\core\compression\message_compress.h" />
+ <ClInclude Include="..\..\src\core\debug\trace.h" />
<ClInclude Include="..\..\src\core\iomgr\alarm.h" />
<ClInclude Include="..\..\src\core\iomgr\alarm_heap.h" />
<ClInclude Include="..\..\src\core\iomgr\alarm_internal.h" />
@@ -201,6 +202,8 @@
</ClCompile>
<ClCompile Include="..\..\src\core\compression\message_compress.c">
</ClCompile>
+ <ClCompile Include="..\..\src\core\debug\trace.c">
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\alarm.c">
</ClCompile>
<ClCompile Include="..\..\src\core\iomgr\alarm_heap.c">
diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters
index 7e97f48318ccb62a98d8c6b9fc003f2f3993e9e9..ea34d210bfe55c911f9ded24d8bcc9bf1d9d813b 100644
--- a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters
@@ -46,6 +46,9 @@
<ClCompile Include="..\..\src\core\compression\message_compress.c">
<Filter>src\core\compression</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\core\debug\trace.c">
+ <Filter>src\core\debug</Filter>
+ </ClCompile>
<ClCompile Include="..\..\src\core\iomgr\alarm.c">
<Filter>src\core\iomgr</Filter>
</ClCompile>
@@ -335,6 +338,9 @@
<ClInclude Include="..\..\src\core\compression\message_compress.h">
<Filter>src\core\compression</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\core\debug\trace.h">
+ <Filter>src\core\debug</Filter>
+ </ClInclude>
<ClInclude Include="..\..\src\core\iomgr\alarm.h">
<Filter>src\core\iomgr</Filter>
</ClInclude>
@@ -569,6 +575,9 @@
<Filter Include="src\core\compression">
<UniqueIdentifier>{2e3aca1d-223d-10a1-b282-7f9fc68ee6f5}</UniqueIdentifier>
</Filter>
+ <Filter Include="src\core\debug">
+ <UniqueIdentifier>{6d8d5774-7291-554d-fafa-583463cd3fd9}</UniqueIdentifier>
+ </Filter>
<Filter Include="src\core\iomgr">
<UniqueIdentifier>{a9df8b24-ecea-ff6d-8999-d8fa54cd70bf}</UniqueIdentifier>
</Filter>