Merge branch 'mmm-mmm-mmm-mmm' of github.com:ctiller/grpc into mmm-mmm-mmm-mmm

src/core/surface/completion_queue.c

@@ -275,14 +275,14 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag,
       gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset));
       memset(&ret, 0, sizeof(ret));
       ret.type = GRPC_QUEUE_TIMEOUT;
-      GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ev->base);
+      GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret);
       return ret;
     }
   }
   gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset));
   ret = ev->base;
   gpr_free(ev);
-  GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ev->base);
+  GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret);
   return ret;
 }
 

test/cpp/end2end/crash_test.cc

@@ -73,7 +73,8 @@ class CrashTest : public ::testing::Test {
  protected:
   CrashTest() {}
 
-  std::unique_ptr<grpc::cpp::test::util::TestService::Stub> CreateServerAndStub() {
+  std::unique_ptr<grpc::cpp::test::util::TestService::Stub>
+  CreateServerAndStub() {
     auto port = grpc_pick_unused_port_or_die();
     auto addr = (std::ostringstream() << "localhost:" << port).str();
     server_.reset(new SubProcess({
@@ -81,7 +82,8 @@ class CrashTest : public ::testing::Test {
         (std::ostringstream() << "--address=" << addr).str(),
     }));
     GPR_ASSERT(server_);
-    return grpc::cpp::test::util::TestService::NewStub(CreateChannel(addr, InsecureCredentials(), ChannelArguments()));
+    return grpc::cpp::test::util::TestService::NewStub(
+        CreateChannel(addr, InsecureCredentials(), ChannelArguments()));
   }
 
   void KillServer() {

test/cpp/end2end/crash_test_server.cc

@@ -83,7 +83,6 @@ void RunServer() {
   std::cout << "Server listening on " << FLAGS_address << std::endl;
   server->Wait();
 }
-
 }
 }
 

test/cpp/util/subprocess.cc

@@ -48,19 +48,12 @@ static gpr_subprocess *MakeProcess(std::initializer_list<std::string> args) {
 }
 
 SubProcess::SubProcess(std::initializer_list<std::string> args)
-		: subprocess_(MakeProcess(args)) {
-}
+    : subprocess_(MakeProcess(args)) {}
 
-SubProcess::~SubProcess() {
-	gpr_subprocess_destroy(subprocess_);
-}
+SubProcess::~SubProcess() { gpr_subprocess_destroy(subprocess_); }
 
-int SubProcess::Join() {
-	return gpr_subprocess_join(subprocess_);
-}
+int SubProcess::Join() { return gpr_subprocess_join(subprocess_); }
 
-void SubProcess::Interrupt() {
-	gpr_subprocess_interrupt(subprocess_);
-}
+void SubProcess::Interrupt() { gpr_subprocess_interrupt(subprocess_); }
 
 }  // namespace grpc
\ No newline at end of file