From aed1de9d2a315ab88d49444fb1314b3845b4046b Mon Sep 17 00:00:00 2001
From: Makarand Dharmapurikar <makarandd@google.com>
Date: Thu, 26 May 2016 09:39:26 -0700
Subject: [PATCH] Style guide related feedback fixes.
---
src/objective-c/GRPCClient/GRPCCall+Cronet.h | 11 +++++++++--
src/objective-c/GRPCClient/GRPCCall+Cronet.m | 16 ++++++++--------
src/objective-c/GRPCClient/private/GRPCChannel.m | 2 +-
src/objective-c/GRPCClient/private/GRPCHost.m | 4 ++--
src/objective-c/tests/InteropTests.m | 10 +++++-----
5 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/src/objective-c/GRPCClient/GRPCCall+Cronet.h b/src/objective-c/GRPCClient/GRPCCall+Cronet.h
index d623ed61a3..b7676d0245 100644
--- a/src/objective-c/GRPCClient/GRPCCall+Cronet.h
+++ b/src/objective-c/GRPCClient/GRPCCall+Cronet.h
@@ -39,9 +39,16 @@
*/
@interface GRPCCall (Cronet)
-+(void)useCronet:(cronet_engine *)cronet_engine;
+/* This method should be called before issuing the first RPC. It should be
+ * called only once. Create an instance of Cronet engine in your app elsewhere
+ * and pass the instance pointer in the cronet_engine parameter. Once set,
+ * all subsequent RPCs will use Cronet transport. The method is not thread
+ * safe.
+ */
+
++(void)useCronetWithEngine:(cronet_engine *)engine;
-+(void *)getCronetEngine;
++(cronet_engine *)cronetEngine;
+(BOOL)isUsingCronet;
diff --git a/src/objective-c/GRPCClient/GRPCCall+Cronet.m b/src/objective-c/GRPCClient/GRPCCall+Cronet.m
index 2409cd4645..69a410e95a 100644
--- a/src/objective-c/GRPCClient/GRPCCall+Cronet.m
+++ b/src/objective-c/GRPCClient/GRPCCall+Cronet.m
@@ -33,22 +33,22 @@
#import "GRPCCall+Cronet.h"
-static BOOL use_cronet = NO;
-static void *g_cronet_engine;
+static BOOL useCronet = NO;
+static cronet_engine *globalCronetEngine;
@implementation GRPCCall (Cronet)
-+ (void)useCronet:(cronet_engine *)cronet_engine {
- use_cronet = YES;
- g_cronet_engine = cronet_engine;
++ (void)useCronetWithEngine:(cronet_engine *)engine {
+ useCronet = YES;
+ globalCronetEngine = engine;
}
-+ (void *)getCronetEngine {
- return g_cronet_engine;
++ (cronet_engine *)cronetEngine {
+ return globalCronetEngine;
}
+ (BOOL)isUsingCronet {
- return use_cronet;
+ return useCronet;
}
@end
diff --git a/src/objective-c/GRPCClient/private/GRPCChannel.m b/src/objective-c/GRPCClient/private/GRPCChannel.m
index 412e8b01fb..e4e0dbe6d2 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannel.m
+++ b/src/objective-c/GRPCClient/private/GRPCChannel.m
@@ -154,7 +154,7 @@ grpc_channel_args * buildChannelArgs(NSDictionary *dictionary) {
+ (GRPCChannel *)secureCronetChannelWithHost:(NSString *)host
channelArgs:(NSDictionary *)channelArgs {
- void *engine = [GRPCCall getCronetEngine];
+ cronet_engine *engine = [GRPCCall cronetEngine];
if (!engine) {
[NSException raise:NSInvalidArgumentException
format:@"cronet_engine is NULL. Set it first."];
diff --git a/src/objective-c/GRPCClient/private/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCHost.m
index 06ed56d546..7da508810c 100644
--- a/src/objective-c/GRPCClient/private/GRPCHost.m
+++ b/src/objective-c/GRPCClient/private/GRPCHost.m
@@ -201,14 +201,14 @@ NS_ASSUME_NONNULL_BEGIN
- (GRPCChannel *)newChannel {
NSDictionary *args = [self channelArgs];
- BOOL use_cronet = [GRPCCall isUsingCronet];
+ BOOL useCronet = [GRPCCall isUsingCronet];
if (_secure) {
GRPCChannel *channel;
@synchronized(self) {
if (_channelCreds == nil) {
[self setTLSPEMRootCerts:nil withPrivateKey:nil withCertChain:nil error:nil];
}
- if (use_cronet) {
+ if (useCronet) {
channel = [GRPCChannel secureCronetChannelWithHost:_address
channelArgs:args];
} else {
diff --git a/src/objective-c/tests/InteropTests.m b/src/objective-c/tests/InteropTests.m
index 361294d4ac..781c500f73 100644
--- a/src/objective-c/tests/InteropTests.m
+++ b/src/objective-c/tests/InteropTests.m
@@ -80,7 +80,7 @@
#pragma mark Tests
-static cronet_engine *_engine = NULL;
+static cronet_engine *cronetEngine = NULL;
@implementation InteropTests {
RMTTestService *_service;
@@ -93,12 +93,12 @@ static cronet_engine *_engine = NULL;
- (void)setUp {
_service = self.class.host ? [RMTTestService serviceWithHost:self.class.host] : nil;
#ifdef GRPC_COMPILE_WITH_CRONET
- if (_engine == NULL) {
+ if (cronetEngine == NULL) {
+ // Cronet setup
[Cronet setHttp2Enabled:YES];
- [Cronet setSslKeyLogFileName:@"cronetkeylogfile.pem"];
[Cronet start];
- _engine = [Cronet getGlobalEngine];
- [GRPCCall useCronet:_engine];
+ cronetEngine = [Cronet getGlobalEngine];
+ [GRPCCall useCronetWithEngine:cronetEngine];
}
#endif
}
--
GitLab