From 0a2fae9aedeef98b39c5f825cb28b5ca32ecc6a2 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Wed, 1 Feb 2017 14:49:03 -0800 Subject: Dynamically enable packet coalescing by channel args --- templates/gRPC-Core.podspec.template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'templates/gRPC-Core.podspec.template') diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 1b97d18f16..0738b7221b 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -161,7 +161,8 @@ s.subspec 'Cronet-Interface' do |ss| ss.header_mappings_dir = 'include/grpc' - ss.source_files = 'include/grpc/grpc_cronet.h' + ss.source_files = 'include/grpc/grpc_cronet.h', + 'src/core/ext/transport/cronet/transport/cronet_transport.h' end s.subspec 'Cronet-Implementation' do |ss| -- cgit v1.2.3 From d5923578c0c43a5716dd78c6467ccdd5199feff2 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Mon, 6 Feb 2017 11:25:59 -0800 Subject: nit fixes --- gRPC-Core.podspec | 1 + src/objective-c/tests/CronetUnitTests/CronetUnitTests.m | 10 +++++----- templates/gRPC-Core.podspec.template | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'templates/gRPC-Core.podspec.template') diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 840d8132c6..0ef61442a4 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -883,6 +883,7 @@ Pod::Spec.new do |s| 'test/core/end2end/end2end_test_utils.c', 'test/core/end2end/tests/*.{c,h}', 'test/core/end2end/data/*.{c,h}', + 'test/core/util/debugger_macros.c', 'test/core/util/test_config.{c,h}', 'test/core/util/port.h', 'test/core/util/port_posix.c', diff --git a/src/objective-c/tests/CronetUnitTests/CronetUnitTests.m b/src/objective-c/tests/CronetUnitTests/CronetUnitTests.m index 9589926d8b..408952a091 100644 --- a/src/objective-c/tests/CronetUnitTests/CronetUnitTests.m +++ b/src/objective-c/tests/CronetUnitTests/CronetUnitTests.m @@ -273,7 +273,7 @@ unsigned int parse_h2_length(const char *field) { grpc_completion_queue_destroy(cq); } -- (void)PacketCoalescing:(bool)use_coalescing { +- (void)packetCoalescing:(BOOL)use_coalescing { grpc_arg arg; arg.key = GRPC_ARG_USE_CRONET_PACKET_COALESCING; arg.type = GRPC_ARG_INTEGER; @@ -390,7 +390,7 @@ unsigned int parse_h2_length(const char *field) { char buf[4096]; long len; - bool coalesced = false; + BOOL coalesced = NO; while ((len = SSL_read(ssl, buf, sizeof(buf))) > 0) { gpr_log(GPR_DEBUG, "Read len: %ld", len); @@ -408,7 +408,7 @@ unsigned int parse_h2_length(const char *field) { (buf[p + 4] & 1) != 0 && // EOS bit is set 0 == memcmp("hello world", &buf[p + 14], 11)) { // Message is correct - coalesced = true; + coalesced = YES; break; } p += (parse_h2_length(&buf[p]) + 9); @@ -448,8 +448,8 @@ unsigned int parse_h2_length(const char *field) { } - (void)testPacketCoalescing { - [self PacketCoalescing:true]; - [self PacketCoalescing:false]; + [self packetCoalescing:YES]; + [self packetCoalescing:NO]; } @end diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 0738b7221b..0c1ff64a00 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -179,6 +179,7 @@ 'test/core/end2end/end2end_test_utils.c', 'test/core/end2end/tests/*.{c,h}', 'test/core/end2end/data/*.{c,h}', + 'test/core/util/debugger_macros.c', 'test/core/util/test_config.{c,h}', 'test/core/util/port.h', 'test/core/util/port_posix.c', -- cgit v1.2.3