Fix C asan error and check_sources_and_headers.py

8 years ago · 3f182df7de
parent c1a32fa46e
commit 3f182df7de
4 changed files with 2 additions and 2 deletions
--- a/include/grpc++/impl/codegen/completion_queue.h
+++ b/include/grpc++/impl/codegen/completion_queue.h
@ -52,7 +52,6 @@
 #include <grpc++/impl/codegen/grpc_library.h>
 #include <grpc++/impl/codegen/status.h>
 #include <grpc++/impl/codegen/time.h>
-#include <grpc/grpc.h>
 #include <grpc/impl/codegen/atm.h>

 struct grpc_completion_queue;
--- a/include/grpc++/impl/codegen/core_codegen_interface.h
+++ b/include/grpc++/impl/codegen/core_codegen_interface.h
@ -36,7 +36,6 @@

 #include <grpc++/impl/codegen/config.h>
 #include <grpc++/impl/codegen/status.h>
-#include <grpc/grpc.h>
 #include <grpc/impl/codegen/byte_buffer_reader.h>
 #include <grpc/impl/codegen/grpc_types.h>
 #include <grpc/impl/codegen/sync.h>
--- a/test/core/end2end/tests/max_connection_age.c
+++ b/test/core/end2end/tests/max_connection_age.c
@ -88,6 +88,7 @@ static void end_test(grpc_end2end_test_fixture *f) {
  grpc_completion_queue_shutdown(f->cq);
  drain_cq(f->cq);
  grpc_completion_queue_destroy(f->cq);
+  grpc_completion_queue_destroy(f->shutdown_cq);
 }

 static void test_max_age_forcibly_close(grpc_end2end_test_config config) {
--- a/test/core/end2end/tests/max_connection_idle.c
+++ b/test/core/end2end/tests/max_connection_idle.c
@ -105,6 +105,7 @@ static void test_max_connection_idle(grpc_end2end_test_config config) {
  grpc_channel_destroy(f.client);
  grpc_completion_queue_shutdown(f.cq);
  grpc_completion_queue_destroy(f.cq);
+  grpc_completion_queue_destroy(f.shutdown_cq);
  config.tear_down_data(&f);

  cq_verifier_destroy(cqv);