Merge github.com:grpc/grpc into we-dont-need-no-backup

.travis.yml

@@ -20,7 +20,8 @@ env:
     - CONFIG=opt TEST=sanity JOBS=1
     - CONFIG=gcov TEST=c JOBS=16
     - CONFIG=gcov TEST=c++ JOBS=16
-    - CONFIG=opt TEST="c c++" JOBS=16
+    - CONFIG=opt TEST=c JOBS=16
+    - CONFIG=opt TEST=c++ JOBS=16
     - CONFIG=opt TEST=node JOBS=16
     - CONFIG=opt TEST=ruby JOBS=16
     - CONFIG=opt TEST=python JOBS=1

doc/interop-test-descriptions.md

@@ -558,20 +558,14 @@ pushback (i.e., attempts to send succeed only after appropriate delays).
 
 Propagation of status code and message (yangg)
 
-Cancel after sent headers (ctiller - done)
+Multiple thousand simultaneous calls on same Channel (ctiller)
-
-Cancel after received first message (ctiller - done)
-
-Zero-message streams (ejona)
-
-Multiple thousand simultaneous calls on same Channel (ctiller - done)
 
 OAuth2 tokens + Service Credentials from GCE metadata server (GCE->prod only)
 (abhishek)
 
 OAuth2 tokens + JWT signing key (GCE->prod only) (abhishek)
 
-Metadata: client headers, server headers + trailers, binary+ascii (chenw)
+Metadata: client headers, server headers + trailers, binary+ascii
 
 #### Normal priority:
 
@@ -600,6 +594,8 @@ Multiple thousand simultaneous calls on different Channels (ctiller)
 
 Failed TLS hostname verification (ejona?)
 
+Large amount of headers to cause CONTINUATIONs; 63K of 'X's, all in one header.
+
 #### To priorize:
 
 Start streaming RPC but don't send any requests, server responds

include/grpc/grpc.h

@@ -92,12 +92,13 @@ typedef struct {
   } value;
 } grpc_arg;
 
-/* An array of arguments that can be passed around.
+/** An array of arguments that can be passed around.
-   Used to set optional channel-level configuration.
+    
-   These configuration options are modelled as key-value pairs as defined
+    Used to set optional channel-level configuration.
-   by grpc_arg; keys are strings to allow easy backwards-compatible extension
+    These configuration options are modelled as key-value pairs as defined
-   by arbitrary parties.
+    by grpc_arg; keys are strings to allow easy backwards-compatible extension
-   All evaluation is performed at channel creation time. */
+    by arbitrary parties.
+    All evaluation is performed at channel creation time. */
 typedef struct {
   size_t num_args;
   grpc_arg *args;
@@ -192,15 +193,27 @@ typedef struct grpc_metadata {
   } internal_data;
 } grpc_metadata;
 
+/** The type of completion (for grpc_event) */
 typedef enum grpc_completion_type {
-  GRPC_QUEUE_SHUTDOWN, /* Shutting down */
+  /** Shutting down */
-  GRPC_QUEUE_TIMEOUT,  /* No event before timeout */
+  GRPC_QUEUE_SHUTDOWN, 
-  GRPC_OP_COMPLETE     /* operation completion */
+  /** No event before timeout */
+  GRPC_QUEUE_TIMEOUT,  
+  /** Operation completion */
+  GRPC_OP_COMPLETE     
 } grpc_completion_type;
 
+/** The result of an operation.
+
+    Returned by a completion queue when the operation started with tag. */
 typedef struct grpc_event {
+  /** The type of the completion. */
   grpc_completion_type type;
+  /** non-zero if the operation was successful, 0 upon failure. 
+      Only GRPC_OP_COMPLETE can succeed or fail. */
   int success;
+  /** The tag passed to grpc_call_start_batch etc to start this operation.
+      Only GRPC_OP_COMPLETE has a tag. */
   void *tag;
 } grpc_event;
 
@@ -322,37 +335,42 @@ typedef struct grpc_op {
   } data;
 } grpc_op;
 
-/* Initialize the grpc library.
+/** Initialize the grpc library.
-   It is not safe to call any other grpc functions before calling this.
+    
-   (To avoid overhead, little checking is done, and some things may work. We
+    It is not safe to call any other grpc functions before calling this.
-   do not warrant that they will continue to do so in future revisions of this
+    (To avoid overhead, little checking is done, and some things may work. We
-   library). */
+    do not warrant that they will continue to do so in future revisions of this
+    library). */
 void grpc_init(void);
 
-/* Shut down the grpc library.
+/** Shut down the grpc library.
-   No memory is used by grpc after this call returns, nor are any instructions
+    
-   executing within the grpc library.
+    No memory is used by grpc after this call returns, nor are any instructions
-   Prior to calling, all application owned grpc objects must have been
+    executing within the grpc library.
-   destroyed. */
+    Prior to calling, all application owned grpc objects must have been
+    destroyed. */
 void grpc_shutdown(void);
 
+/** Create a completion queue */
 grpc_completion_queue *grpc_completion_queue_create(void);
 
-/* Blocks until an event is available, the completion queue is being shut down,
+/** Blocks until an event is available, the completion queue is being shut down,
-   or deadline is reached. Returns NULL on timeout, otherwise the event that
+    or deadline is reached. 
-   occurred.
+
+    Returns NULL on timeout, otherwise the event that occurred.
 
-   Callers must not call grpc_completion_queue_next and
+    Callers must not call grpc_completion_queue_next and
-   grpc_completion_queue_pluck simultaneously on the same completion queue. */
+    grpc_completion_queue_pluck simultaneously on the same completion queue. */
 grpc_event grpc_completion_queue_next(grpc_completion_queue *cq,
                                       gpr_timespec deadline);
 
-/* Blocks until an event with tag 'tag' is available, the completion queue is
+/** Blocks until an event with tag 'tag' is available, the completion queue is
-   being shutdown or deadline is reached. Returns NULL on timeout, or a pointer
+    being shutdown or deadline is reached. 
-   to the event that occurred.
+
+    Returns NULL on timeout, or a pointer to the event that occurred.
 
-   Callers must not call grpc_completion_queue_next and
+    Callers must not call grpc_completion_queue_next and
-   grpc_completion_queue_pluck simultaneously on the same completion queue. */
+    grpc_completion_queue_pluck simultaneously on the same completion queue. */
 grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cq, void *tag,
                                        gpr_timespec deadline);
 

src/core/surface/server.c

@@ -1131,3 +1131,12 @@ static void publish_registered_or_batch(grpc_call *call, int success,
 const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server) {
   return server->channel_args;
 }
+
+int grpc_server_has_open_connections(grpc_server *server) {
+  int r;
+  gpr_mu_lock(&server->mu);
+  r = server->root_channel_data.next != &server->root_channel_data;
+  gpr_mu_unlock(&server->mu);
+  return r;
+}
+

src/core/surface/server.h

@@ -62,4 +62,6 @@ grpc_transport_setup_result grpc_server_setup_transport(
 
 const grpc_channel_args *grpc_server_get_channel_args(grpc_server *server);
 
+int grpc_server_has_open_connections(grpc_server *server);
+
 #endif /* GRPC_INTERNAL_CORE_SURFACE_SERVER_H */

src/core/transport/chttp2/alpn.c

@@ -36,7 +36,8 @@
 #include <grpc/support/useful.h>
 
 /* in order of preference */
-static const char *const supported_versions[] = {"h2-16", "h2-15", "h2-14"};
+static const char *const supported_versions[] = {"h2", "h2-17", "h2-16",
+                                                 "h2-15", "h2-14"};
 
 int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size) {
   size_t i;

src/objective-c/ProtoRPC/ProtoRPC.m

@@ -59,7 +59,7 @@
                responseClass:(Class)responseClass
           responsesWriteable:(id<GRXWriteable>)responsesWriteable {
   // Because we can't tell the type system to constrain the class, we need to check at runtime:
-  if (![responseClass respondsToSelector:@selector(parseFromData:)]) {
+  if (![responseClass respondsToSelector:@selector(parseFromData:error:)]) {
     [NSException raise:NSInvalidArgumentException
                 format:@"A protobuf class to parse the responses must be provided."];
   }
@@ -71,7 +71,7 @@
   if ((self = [super initWithHost:host method:method requestsWriter:bytesWriter])) {
     // A writeable that parses the proto messages received.
     _responseWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) {
-      [responsesWriteable writeValue:[responseClass parseFromData:value]];
+      [responsesWriteable writeValue:[responseClass parseFromData:value error:NULL]];
     } completionHandler:^(NSError *errorOrNil) {
       [responsesWriteable writesFinishedWithError:errorOrNil];
     }];

src/objective-c/examples/Sample/Sample/ViewController.m

@@ -80,7 +80,7 @@
                                    requestsWriter:requestsWriter];
 
   id<GRXWriteable> responsesWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) {
-    RMTSimpleResponse *response = [RMTSimpleResponse parseFromData:value];
+    RMTSimpleResponse *response = [RMTSimpleResponse parseFromData:value error:NULL];
     NSLog(@"Received response:\n%@", response);
   } completionHandler:^(NSError *errorOrNil) {
     if (errorOrNil) {

src/objective-c/examples/Sample/SampleTests/RemoteTests.m

@@ -125,7 +125,7 @@
     XCTAssertNotNil(value, @"nil value received as response.");
     [response fulfill];
     XCTAssertGreaterThan(value.length, 0, @"Empty response received.");
-    RMTSimpleResponse *response = [RMTSimpleResponse parseFromData:value];
+    RMTSimpleResponse *response = [RMTSimpleResponse parseFromData:value error:NULL];
     // We expect empty strings, not nil:
     XCTAssertNotNil(response.username, @"Response's username is nil.");
     XCTAssertNotNil(response.oauthScope, @"Response's OAuth scope is nil.");

src/objective-c/examples/Sample/SampleTests/SampleTests.m

@@ -123,7 +123,7 @@
 
   id<GRXWriteable> responsesWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) {
     XCTAssertNotNil(value, @"nil value received as response.");
-    RGDFeature *feature = [RGDFeature parseFromData:value];
+    RGDFeature *feature = [RGDFeature parseFromData:value error:NULL];
     XCTAssertEqualObjects(point, feature.location);
     XCTAssertNotNil(feature.name, @"Response's name is nil.");
     [response fulfill];

templates/tools/doxygen/Doxyfile.c++.template

@@ -0,0 +1,2 @@
+<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
+${gen_doxyfile(['grpc++'], 'C++', libs)}

templates/tools/doxygen/Doxyfile.core.template

@@ -0,0 +1,2 @@
+<%namespace file="Doxyfile.include" import="gen_doxyfile"/>\
+${gen_doxyfile(['grpc', 'gpr'], 'Core', libs)}

test/core/bad_client/bad_client.c

@@ -0,0 +1,136 @@
+/*
+ *
+ * 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 "test/core/bad_client/bad_client.h"
+
+#include "src/core/channel/channel_stack.h"
+#include "src/core/channel/http_server_filter.h"
+#include "src/core/iomgr/endpoint_pair.h"
+#include "src/core/surface/completion_queue.h"
+#include "src/core/surface/server.h"
+#include "src/core/transport/chttp2_transport.h"
+
+#include <grpc/support/sync.h>
+#include <grpc/support/thd.h>
+
+typedef struct {
+  grpc_server *server;
+  grpc_completion_queue *cq;
+  grpc_bad_client_server_side_validator validator;
+  gpr_event done_thd;
+  gpr_event done_write;
+} thd_args;
+
+static void thd_func(void *arg) {
+  thd_args *a = arg;
+  a->validator(a->server, a->cq);
+  gpr_event_set(&a->done_thd, (void *)1);
+}
+
+static void done_write(void *arg, grpc_endpoint_cb_status status) {
+  thd_args *a = arg;
+  gpr_event_set(&a->done_write, (void *)1);
+}
+
+static grpc_transport_setup_result server_setup_transport(
+    void *ts, grpc_transport *transport, grpc_mdctx *mdctx) {
+  thd_args *a = ts;
+  static grpc_channel_filter const *extra_filters[] = {
+      &grpc_http_server_filter};
+  return grpc_server_setup_transport(a->server, transport, extra_filters,
+                                     GPR_ARRAY_SIZE(extra_filters), mdctx);
+}
+
+void grpc_run_bad_client_test(const char *name, const char *client_payload,
+                              size_t client_payload_length,
+                              grpc_bad_client_server_side_validator validator) {
+  grpc_endpoint_pair sfd;
+  thd_args a;
+  gpr_thd_id id;
+  gpr_slice slice =
+      gpr_slice_from_copied_buffer(client_payload, client_payload_length);
+
+  /* Add a debug log */
+  gpr_log(GPR_INFO, "TEST: %s", name);
+
+  /* Init grpc */
+  grpc_init();
+
+  /* Create endpoints */
+  sfd = grpc_iomgr_create_endpoint_pair(65536);
+
+  /* Create server, completion events */
+  a.server = grpc_server_create_from_filters(NULL, 0, NULL);
+  a.cq = grpc_completion_queue_create();
+  gpr_event_init(&a.done_thd);
+  gpr_event_init(&a.done_write);
+  a.validator = validator;
+  grpc_server_register_completion_queue(a.server, a.cq);
+  grpc_server_start(a.server);
+  grpc_create_chttp2_transport(server_setup_transport, &a, NULL, sfd.server,
+                               NULL, 0, grpc_mdctx_create(), 0);
+
+  /* Bind everything into the same pollset */
+  grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq));
+  grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq));
+
+  /* Check a ground truth */
+  GPR_ASSERT(grpc_server_has_open_connections(a.server));
+
+  /* Start validator */
+  gpr_thd_new(&id, thd_func, &a, NULL);
+
+  /* Write data */
+  switch (grpc_endpoint_write(sfd.client, &slice, 1, done_write, &a)) {
+    case GRPC_ENDPOINT_WRITE_DONE:
+      done_write(&a, 1);
+      break;
+    case GRPC_ENDPOINT_WRITE_PENDING:
+      break;
+    case GRPC_ENDPOINT_WRITE_ERROR:
+      done_write(&a, 0);
+      break;
+  }
+
+  /* Await completion */
+  GPR_ASSERT(
+      gpr_event_wait(&a.done_write, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5)));
+  GPR_ASSERT(gpr_event_wait(&a.done_thd, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5)));
+
+  /* Shutdown */
+  grpc_endpoint_destroy(sfd.client);
+  grpc_server_destroy(a.server);
+  grpc_completion_queue_destroy(a.cq);
+
+  grpc_shutdown();
+}

test/core/bad_client/bad_client.h

@@ -0,0 +1,52 @@
+/*
+ *
+ * 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_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H
+#define GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H
+
+#include <grpc/grpc.h>
+#include "test/core/util/test_config.h"
+
+typedef void (*grpc_bad_client_server_side_validator)(
+    grpc_server *server, grpc_completion_queue *cq);
+
+/* Test runner.
+
+   Create a server, and send client_payload to it as bytes from a client.
+   Execute validator in a separate thread to assert that the bytes are
+   handled as expected. */
+void grpc_run_bad_client_test(const char *name, const char *client_payload,
+                              size_t client_payload_length,
+                              grpc_bad_client_server_side_validator validator);
+
+#endif /* GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H */

test/core/bad_client/gen_build_json.py

@@ -0,0 +1,79 @@
+#!/usr/bin/env python
+# 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.
+
+
+"""Generates the appropriate build.json data for all the end2end tests."""
+
+
+import simplejson
+import collections
+
+TestOptions = collections.namedtuple('TestOptions', 'flaky')
+default_test_options = TestOptions(False)
+
+# maps test names to options
+BAD_CLIENT_TESTS = {
+    'connection_prefix': default_test_options,
+}
+
+def main():
+  json = {
+      '#': 'generated with test/bad_client/gen_build_json.py',
+      'libs': [
+          {
+            'name': 'bad_client_test',
+            'build': 'private',
+            'language': 'c',
+            'src': [
+              'test/core/bad_client/bad_client.c'
+            ]
+          }],
+      'targets': [
+          {
+              'name': '%s_bad_client_test' % t,
+              'build': 'test',
+              'language': 'c',
+              'secure': 'no',
+              'src': ['test/core/bad_client/tests/%s.c' % t],
+              'flaky': 'invoke_large_request' in t,
+              'deps': [
+                  'bad_client_test',
+                  'grpc_test_util_unsecure',
+                  'grpc_unsecure',
+                  'gpr_test_util',
+                  'gpr'
+              ]
+          }
+      for t in sorted(BAD_CLIENT_TESTS.keys())]}
+  print simplejson.dumps(json, sort_keys=True, indent=2 * ' ')
+
+
+if __name__ == '__main__':
+  main()

test/core/bad_client/tests/connection_prefix.c

@@ -0,0 +1,79 @@
+/*
+ *
+ * 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 "test/core/bad_client/bad_client.h"
+#include "src/core/surface/server.h"
+
+static void verifier(grpc_server *server, grpc_completion_queue *cq) {
+  while (grpc_server_has_open_connections(server)) {
+    GPR_ASSERT(grpc_completion_queue_next(
+                   cq, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(20)).type ==
+               GRPC_QUEUE_TIMEOUT);
+  }
+}
+
+int main(int argc, char **argv) {
+  grpc_test_init(argc, argv);
+
+  grpc_run_bad_client_test("conpfx_1", "X", 1, verifier);
+  grpc_run_bad_client_test("conpfx_2", "PX", 2, verifier);
+  grpc_run_bad_client_test("conpfx_3", "PRX", 3, verifier);
+  grpc_run_bad_client_test("conpfx_4", "PRIX", 4, verifier);
+  grpc_run_bad_client_test("conpfx_5", "PRI X", 5, verifier);
+  grpc_run_bad_client_test("conpfx_6", "PRI *X", 6, verifier);
+  grpc_run_bad_client_test("conpfx_7", "PRI * X", 7, verifier);
+  grpc_run_bad_client_test("conpfx_8", "PRI * HX", 8, verifier);
+  grpc_run_bad_client_test("conpfx_9", "PRI * HTX", 9, verifier);
+  grpc_run_bad_client_test("conpfx_10", "PRI * HTTX", 10, verifier);
+  grpc_run_bad_client_test("conpfx_11", "PRI * HTTPX", 11, verifier);
+  grpc_run_bad_client_test("conpfx_12", "PRI * HTTP/X", 12, verifier);
+  grpc_run_bad_client_test("conpfx_13", "PRI * HTTP/2X", 13, verifier);
+  grpc_run_bad_client_test("conpfx_14", "PRI * HTTP/2.X", 14, verifier);
+  grpc_run_bad_client_test("conpfx_15", "PRI * HTTP/2.0X", 15, verifier);
+  grpc_run_bad_client_test("conpfx_16", "PRI * HTTP/2.0\rX", 16, verifier);
+  grpc_run_bad_client_test("conpfx_17", "PRI * HTTP/2.0\r\nX", 17, verifier);
+  grpc_run_bad_client_test("conpfx_18", "PRI * HTTP/2.0\r\n\rX", 18, verifier);
+  grpc_run_bad_client_test("conpfx_19", "PRI * HTTP/2.0\r\n\r\nX", 19,
+                           verifier);
+  grpc_run_bad_client_test("conpfx_20", "PRI * HTTP/2.0\r\n\r\nSX", 20,
+                           verifier);
+  grpc_run_bad_client_test("conpfx_21", "PRI * HTTP/2.0\r\n\r\nSMX", 21,
+                           verifier);
+  grpc_run_bad_client_test("conpfx_22", "PRI * HTTP/2.0\r\n\r\nSM\rX", 22,
+                           verifier);
+  grpc_run_bad_client_test("conpfx_23", "PRI * HTTP/2.0\r\n\r\nSM\r\nX", 23,
+                           verifier);
+  grpc_run_bad_client_test("conpfx_24", "PRI * HTTP/2.0\r\n\r\nSM\r\n\rX", 24,
+                           verifier);
+  return 0;
+}

test/cpp/end2end/server_crash_test.cc

@@ -69,10 +69,15 @@ namespace testing {
 
 namespace {
 
-class ServiceImpl GRPC_FINAL : public ::grpc::cpp::test::util::TestService::Service {
+class ServiceImpl GRPC_FINAL
+    : public ::grpc::cpp::test::util::TestService::Service {
+ public:
+  ServiceImpl() : bidi_stream_count_(0), response_stream_count_(0) {}
+
   Status BidiStream(ServerContext* context,
                     ServerReaderWriter<EchoResponse, EchoRequest>* stream)
       GRPC_OVERRIDE {
+    bidi_stream_count_++;
     EchoRequest request;
     EchoResponse response;
     while (stream->Read(&request)) {
@@ -87,6 +92,7 @@ class ServiceImpl GRPC_FINAL : public ::grpc::cpp::test::util::TestService::Serv
   Status ResponseStream(ServerContext* context, const EchoRequest* request,
                         ServerWriter<EchoResponse>* writer) GRPC_OVERRIDE {
     EchoResponse response;
+    response_stream_count_++;
     for (int i = 0;; i++) {
       std::ostringstream msg;
       msg << "Hello " << i;
@@ -96,23 +102,27 @@ class ServiceImpl GRPC_FINAL : public ::grpc::cpp::test::util::TestService::Serv
     }
     return Status::OK;
   }
+
+  int bidi_stream_count() { return bidi_stream_count_; }
+
+  int response_stream_count() { return response_stream_count_; }
+
+ private:
+  int bidi_stream_count_;
+  int response_stream_count_;
 };
 
 class CrashTest : public ::testing::Test {
  protected:
   CrashTest() {}
 
-  std::unique_ptr<Server>
+  std::unique_ptr<Server> CreateServerAndClient(const std::string& mode) {
-  CreateServerAndClient(const std::string& mode) {
     auto port = grpc_pick_unused_port_or_die();
     std::ostringstream addr_stream;
     addr_stream << "localhost:" << port;
     auto addr = addr_stream.str();
-    client_.reset(new SubProcess({
+    client_.reset(new SubProcess({g_root + "/server_crash_test_client",
-      g_root + "/server_crash_test_client",
+                                  "--address=" + addr, "--mode=" + mode}));
-      "--address=" + addr,
-      "--mode=" + mode
-    }));
     GPR_ASSERT(client_);
 
     ServerBuilder builder;
@@ -121,9 +131,11 @@ class CrashTest : public ::testing::Test {
     return builder.BuildAndStart();
   }
 
-  void KillClient() {
+  void KillClient() { client_.reset(); }
-    client_.reset();
+
-  }
+  bool HadOneBidiStream() { return service_.bidi_stream_count() == 1; }
+
+  bool HadOneResponseStream() { return service_.response_stream_count() == 1; }
 
  private:
   std::unique_ptr<SubProcess> client_;
@@ -136,6 +148,7 @@ TEST_F(CrashTest, ResponseStream) {
   gpr_sleep_until(gpr_time_add(gpr_now(), gpr_time_from_seconds(5)));
   KillClient();
   server->Shutdown();
+  GPR_ASSERT(HadOneResponseStream());
 }
 
 TEST_F(CrashTest, BidiStream) {
@@ -144,6 +157,7 @@ TEST_F(CrashTest, BidiStream) {
   gpr_sleep_until(gpr_time_add(gpr_now(), gpr_time_from_seconds(5)));
   KillClient();
   server->Shutdown();
+  GPR_ASSERT(HadOneBidiStream());
 }
 
 }  // namespace

tools/buildgen/bunch.py

@@ -57,6 +57,7 @@ def merge_json(dst, add):
   if isinstance(dst, dict) and isinstance(add, dict):
     for k, v in add.items():
       if k in dst:
+        if k == '#': continue
         merge_json(dst[k], v)
       else:
         dst[k] = v

tools/buildgen/generate_projects.sh

@@ -38,14 +38,19 @@ fi
 
 cd `dirname $0`/../..
 mako_renderer=tools/buildgen/mako_renderer.py
-gen_build_json=test/core/end2end/gen_build_json.py
+gen_build_json_dirs="test/core/end2end test/core/bad_client"
 
 if [ "x$TEST" != "x" ] ; then
   tools/buildgen/build-cleaner.py build.json
 fi
 
-end2end_test_build=`mktemp /tmp/genXXXXXX`
+gen_build_files=""
-$gen_build_json > $end2end_test_build
+for gen_build_json in $gen_build_json_dirs
+do
+  output_file=`mktemp /tmp/genXXXXXX`
+  $gen_build_json/gen_build_json.py > $output_file
+  gen_build_files="$gen_build_files $output_file"
+done
 
 global_plugins=`find ./tools/buildgen/plugins -name '*.py' |
   sort | grep -v __init__ | awk ' { printf "-p %s ", $0 } '`
@@ -60,7 +65,7 @@ for dir in . ; do
     out=${dir}/${file#$dir/templates/}  # strip templates dir prefix
     out=${out%.*}  # strip template extension
     echo "generating file: $out"
-    json_files="build.json $end2end_test_build"
+    json_files="build.json $gen_build_files"
     data=`for i in $json_files ; do echo $i ; done | awk ' { printf "-d %s ", $0 } '`
     if [ "x$TEST" = "xtrue" ] ; then
       actual_out=$out
@@ -75,4 +80,4 @@ for dir in . ; do
   done
 done
 
-rm $end2end_test_build
+rm $gen_build_files

tools/doxygen/run_doxygen.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# 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.
+
+set -ex
+
+# change to grpc repo root
+cd $(dirname $0)/../..
+
+for i in core c++
+do
+	mkdir -p doc/ref/$i
+	doxygen tools/doxygen/Doxyfile.$i
+done

tools/run_tests/run_tests.py

@@ -57,7 +57,6 @@ class SimpleConfig(object):
     if environ is None:
       environ = {}
     self.build_config = config
-    self.maxjobs = 2 * multiprocessing.cpu_count()
     self.allow_hashing = (config != 'gcov')
     self.environ = environ
     self.environ['CONFIG'] = config
@@ -93,7 +92,6 @@ class ValgrindConfig(object):
     self.build_config = config
     self.tool = tool
     self.args = args
-    self.maxjobs = 2 * multiprocessing.cpu_count()
     self.allow_hashing = False
 
   def job_spec(self, cmdline, hash_targets):
@@ -333,7 +331,7 @@ argp.add_argument('-c', '--config',
                   default=_DEFAULT)
 argp.add_argument('-n', '--runs_per_test', default=1, type=int)
 argp.add_argument('-r', '--regex', default='.*', type=str)
-argp.add_argument('-j', '--jobs', default=1000, type=int)
+argp.add_argument('-j', '--jobs', default=2 * multiprocessing.cpu_count(), type=int)
 argp.add_argument('-s', '--slowdown', default=1.0, type=float)
 argp.add_argument('-f', '--forever',
                   default=False,
@@ -458,7 +456,7 @@ def _build_and_run(check_cancelled, newline_on_success, travis, cache):
         itertools.repeat(one_run, runs_per_test))
     if not jobset.run(all_runs, check_cancelled,
                       newline_on_success=newline_on_success, travis=travis,
-                      maxjobs=min(args.jobs, min(c.maxjobs for c in run_configs)),
+                      maxjobs=args.jobs,
                       cache=cache):
       return 2
   finally:

tools/run_tests/tests.json

@@ -4039,6 +4039,15 @@
       "windows", 
       "posix"
     ]
+  }, 
+  {
+    "flaky": false, 
+    "language": "c", 
+    "name": "connection_prefix_bad_client_test", 
+    "platforms": [
+      "windows", 
+      "posix"
+    ]
   }
 ]