aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/objective-c/GRPCClient/private
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2018-11-09 11:06:46 -0800
committerGravatar Muxi Yan <mxyan@google.com>2018-11-09 11:06:46 -0800
commit2895ee9b6a63c19ebbd6c188ab475f0a6e7f0ba5 (patch)
tree3c93584393e9dfe723b0fc6aab726c983ee3cba5 /src/objective-c/GRPCClient/private
parent33022c9172bd3cf52c9aa3416ce9c69d9f3c6494 (diff)
clang-format
Diffstat (limited to 'src/objective-c/GRPCClient/private')
-rw-r--r--src/objective-c/GRPCClient/private/GRPCChannel.h11
-rw-r--r--src/objective-c/GRPCClient/private/GRPCChannel.m55
-rw-r--r--src/objective-c/GRPCClient/private/GRPCChannelPool.h3
-rw-r--r--src/objective-c/GRPCClient/private/GRPCChannelPool.m16
-rw-r--r--src/objective-c/GRPCClient/private/GRPCHost.m5
-rw-r--r--src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m3
-rw-r--r--src/objective-c/GRPCClient/private/utilities.h27
7 files changed, 60 insertions, 60 deletions
diff --git a/src/objective-c/GRPCClient/private/GRPCChannel.h b/src/objective-c/GRPCClient/private/GRPCChannel.h
index bbe0ba5390..6c58f4f387 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannel.h
+++ b/src/objective-c/GRPCClient/private/GRPCChannel.h
@@ -64,14 +64,17 @@ NS_ASSUME_NONNULL_BEGIN
* Create a channel with remote \a host and signature \a channelConfigurations. Destroy delay is
* defaulted to 30 seconds.
*/
-- (nullable instancetype)initWithChannelConfiguration:(GRPCChannelConfiguration *)channelConfiguration;
+- (nullable instancetype)initWithChannelConfiguration:
+ (GRPCChannelConfiguration *)channelConfiguration;
/**
* Create a channel with remote \a host, signature \a channelConfigurations, and destroy delay of
* \a destroyDelay.
*/
-- (nullable instancetype)initWithChannelConfiguration:(GRPCChannelConfiguration *)channelConfiguration
- destroyDelay:(NSTimeInterval)destroyDelay NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithChannelConfiguration:
+ (GRPCChannelConfiguration *)channelConfiguration
+ destroyDelay:(NSTimeInterval)destroyDelay
+ NS_DESIGNATED_INITIALIZER;
/**
* Create a grpc core call object from this channel. The channel's refcount is added by 1. If no
@@ -82,7 +85,7 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable grpc_call *)unmanagedCallWithPath:(NSString *)path
completionQueue:(GRPCCompletionQueue *)queue
callOptions:(GRPCCallOptions *)callOptions
- disconnected:(BOOL * _Nullable)disconnected;
+ disconnected:(BOOL *_Nullable)disconnected;
/**
* Unref the channel when a call is done. It also decreases the channel's refcount. If the refcount
diff --git a/src/objective-c/GRPCClient/private/GRPCChannel.m b/src/objective-c/GRPCClient/private/GRPCChannel.m
index 7d0baa91ee..fc0448bb96 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannel.m
+++ b/src/objective-c/GRPCClient/private/GRPCChannel.m
@@ -20,6 +20,7 @@
#include <grpc/support/log.h>
+#import "../internal/GRPCCallOptions+Internal.h"
#import "ChannelArgsUtil.h"
#import "GRPCChannelFactory.h"
#import "GRPCChannelPool.h"
@@ -27,9 +28,8 @@
#import "GRPCCronetChannelFactory.h"
#import "GRPCInsecureChannelFactory.h"
#import "GRPCSecureChannelFactory.h"
-#import "version.h"
#import "utilities.h"
-#import "../internal/GRPCCallOptions+Internal.h"
+#import "version.h"
#import <GRPCClient/GRPCCall+Cronet.h>
#import <GRPCClient/GRPCCallOptions.h>
@@ -60,10 +60,10 @@ static const NSTimeInterval kDefaultChannelDestroyDelay = 30;
if (![GRPCCall isUsingCronet]) {
#endif
factory = [GRPCSecureChannelFactory
- factoryWithPEMRootCertificates:_callOptions.PEMRootCertificates
- privateKey:_callOptions.PEMPrivateKey
- certChain:_callOptions.PEMCertChain
- error:&error];
+ factoryWithPEMRootCertificates:_callOptions.PEMRootCertificates
+ privateKey:_callOptions.PEMPrivateKey
+ certChain:_callOptions.PEMCertChain
+ error:&error];
if (factory == nil) {
NSLog(@"Error creating secure channel factory: %@", error);
}
@@ -86,7 +86,7 @@ static const NSTimeInterval kDefaultChannelDestroyDelay = 30;
NSString *userAgentPrefix = _callOptions.userAgentPrefix;
if (userAgentPrefix) {
args[@GRPC_ARG_PRIMARY_USER_AGENT_STRING] =
- [_callOptions.userAgentPrefix stringByAppendingFormat:@" %@", userAgent];
+ [_callOptions.userAgentPrefix stringByAppendingFormat:@" %@", userAgent];
} else {
args[@GRPC_ARG_PRIMARY_USER_AGENT_STRING] = userAgent;
}
@@ -98,19 +98,19 @@ static const NSTimeInterval kDefaultChannelDestroyDelay = 30;
if (_callOptions.responseSizeLimit) {
args[@GRPC_ARG_MAX_RECEIVE_MESSAGE_LENGTH] =
- [NSNumber numberWithUnsignedInteger:_callOptions.responseSizeLimit];
+ [NSNumber numberWithUnsignedInteger:_callOptions.responseSizeLimit];
}
if (_callOptions.compressionAlgorithm != GRPC_COMPRESS_NONE) {
args[@GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM] =
- [NSNumber numberWithInt:_callOptions.compressionAlgorithm];
+ [NSNumber numberWithInt:_callOptions.compressionAlgorithm];
}
if (_callOptions.keepaliveInterval != 0) {
args[@GRPC_ARG_KEEPALIVE_TIME_MS] =
- [NSNumber numberWithUnsignedInteger:(NSUInteger)(_callOptions.keepaliveInterval * 1000)];
+ [NSNumber numberWithUnsignedInteger:(NSUInteger)(_callOptions.keepaliveInterval * 1000)];
args[@GRPC_ARG_KEEPALIVE_TIMEOUT_MS] =
- [NSNumber numberWithUnsignedInteger:(NSUInteger)(_callOptions.keepaliveTimeout * 1000)];
+ [NSNumber numberWithUnsignedInteger:(NSUInteger)(_callOptions.keepaliveTimeout * 1000)];
}
if (_callOptions.retryEnabled == NO) {
@@ -119,15 +119,15 @@ static const NSTimeInterval kDefaultChannelDestroyDelay = 30;
if (_callOptions.connectMinTimeout > 0) {
args[@GRPC_ARG_MIN_RECONNECT_BACKOFF_MS] =
- [NSNumber numberWithUnsignedInteger:(NSUInteger)(_callOptions.connectMinTimeout * 1000)];
+ [NSNumber numberWithUnsignedInteger:(NSUInteger)(_callOptions.connectMinTimeout * 1000)];
}
if (_callOptions.connectInitialBackoff > 0) {
args[@GRPC_ARG_INITIAL_RECONNECT_BACKOFF_MS] = [NSNumber
- numberWithUnsignedInteger:(NSUInteger)(_callOptions.connectInitialBackoff * 1000)];
+ numberWithUnsignedInteger:(NSUInteger)(_callOptions.connectInitialBackoff * 1000)];
}
if (_callOptions.connectMaxBackoff > 0) {
args[@GRPC_ARG_MAX_RECONNECT_BACKOFF_MS] =
- [NSNumber numberWithUnsignedInteger:(NSUInteger)(_callOptions.connectMaxBackoff * 1000)];
+ [NSNumber numberWithUnsignedInteger:(NSUInteger)(_callOptions.connectMaxBackoff * 1000)];
}
if (_callOptions.logContext != nil) {
@@ -145,7 +145,7 @@ static const NSTimeInterval kDefaultChannelDestroyDelay = 30;
- (nonnull id)copyWithZone:(nullable NSZone *)zone {
GRPCChannelConfiguration *newConfig =
- [[GRPCChannelConfiguration alloc] initWithHost:_host callOptions:_callOptions];
+ [[GRPCChannelConfiguration alloc] initWithHost:_host callOptions:_callOptions];
return newConfig;
}
@@ -172,8 +172,6 @@ static const NSTimeInterval kDefaultChannelDestroyDelay = 30;
@end
-
-
@implementation GRPCChannel {
GRPCChannelConfiguration *_configuration;
@@ -186,21 +184,24 @@ static const NSTimeInterval kDefaultChannelDestroyDelay = 30;
}
@synthesize disconnected = _disconnected;
-- (nullable instancetype)initWithChannelConfiguration:(GRPCChannelConfiguration *)channelConfiguration {
+- (nullable instancetype)initWithChannelConfiguration:
+ (GRPCChannelConfiguration *)channelConfiguration {
return [self initWithChannelConfiguration:channelConfiguration
destroyDelay:kDefaultChannelDestroyDelay];
}
-- (nullable instancetype)initWithChannelConfiguration:(GRPCChannelConfiguration *)channelConfiguration
+- (nullable instancetype)initWithChannelConfiguration:
+ (GRPCChannelConfiguration *)channelConfiguration
destroyDelay:(NSTimeInterval)destroyDelay {
- GRPCAssert(channelConfiguration != nil, NSInvalidArgumentException, @"channelConfiguration must not be empty.");
+ GRPCAssert(channelConfiguration != nil, NSInvalidArgumentException,
+ @"channelConfiguration must not be empty.");
GRPCAssert(destroyDelay > 0, NSInvalidArgumentException, @"destroyDelay must be greater than 0.");
if ((self = [super init])) {
_configuration = [channelConfiguration copy];
if (@available(iOS 8.0, *)) {
_dispatchQueue = dispatch_queue_create(
- NULL,
- dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, -1));
+ NULL,
+ dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, -1));
} else {
_dispatchQueue = dispatch_queue_create(NULL, DISPATCH_QUEUE_SERIAL);
}
@@ -244,7 +245,7 @@ static const NSTimeInterval kDefaultChannelDestroyDelay = 30;
GRPCAssert(self->_unmanagedChannel != NULL, NSInvalidArgumentException, @"Invalid channel.");
NSString *serverAuthority =
- callOptions.transportType == GRPCTransportTypeCronet ? nil : callOptions.serverAuthority;
+ callOptions.transportType == GRPCTransportTypeCronet ? nil : callOptions.serverAuthority;
NSTimeInterval timeout = callOptions.timeout;
GRPCAssert(timeout >= 0, NSInvalidArgumentException, @"Invalid timeout");
grpc_slice host_slice = grpc_empty_slice();
@@ -253,10 +254,10 @@ static const NSTimeInterval kDefaultChannelDestroyDelay = 30;
}
grpc_slice path_slice = grpc_slice_from_copied_string(path.UTF8String);
gpr_timespec deadline_ms =
- timeout == 0
- ? gpr_inf_future(GPR_CLOCK_REALTIME)
- : gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC),
- gpr_time_from_millis((int64_t)(timeout * 1000), GPR_TIMESPAN));
+ timeout == 0
+ ? gpr_inf_future(GPR_CLOCK_REALTIME)
+ : gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC),
+ gpr_time_from_millis((int64_t)(timeout * 1000), GPR_TIMESPAN));
call = grpc_channel_create_call(self->_unmanagedChannel, NULL, GRPC_PROPAGATE_DEFAULTS,
queue.unmanagedQueue, path_slice,
serverAuthority ? &host_slice : NULL, deadline_ms, NULL);
diff --git a/src/objective-c/GRPCClient/private/GRPCChannelPool.h b/src/objective-c/GRPCClient/private/GRPCChannelPool.h
index 24c0a8df11..48779c4449 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannelPool.h
+++ b/src/objective-c/GRPCClient/private/GRPCChannelPool.h
@@ -44,8 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
* Return a channel with a particular configuration. If the channel does not exist, execute \a
* createChannel then add it in the pool. If the channel exists, increase its reference count.
*/
-- (GRPCChannel *)channelWithHost:(NSString *)host
- callOptions:(GRPCCallOptions *)callOptions;
+- (GRPCChannel *)channelWithHost:(NSString *)host callOptions:(GRPCCallOptions *)callOptions;
/**
* This method is deprecated.
diff --git a/src/objective-c/GRPCClient/private/GRPCChannelPool.m b/src/objective-c/GRPCClient/private/GRPCChannelPool.m
index 8a3b5edfa1..85ca527277 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannelPool.m
+++ b/src/objective-c/GRPCClient/private/GRPCChannelPool.m
@@ -26,8 +26,8 @@
#import "GRPCCronetChannelFactory.h"
#import "GRPCInsecureChannelFactory.h"
#import "GRPCSecureChannelFactory.h"
-#import "version.h"
#import "utilities.h"
+#import "version.h"
#import <GRPCClient/GRPCCall+Cronet.h>
#include <grpc/support/log.h>
@@ -62,11 +62,8 @@ static dispatch_once_t gInitChannelPool;
return self;
}
-- (GRPCChannel *)channelWithHost:(NSString *)host
- callOptions:(GRPCCallOptions *)callOptions {
- return [self channelWithHost:host
- callOptions:callOptions
- destroyDelay:0];
+- (GRPCChannel *)channelWithHost:(NSString *)host callOptions:(GRPCCallOptions *)callOptions {
+ return [self channelWithHost:host callOptions:callOptions destroyDelay:0];
}
- (GRPCChannel *)channelWithHost:(NSString *)host
@@ -76,14 +73,15 @@ static dispatch_once_t gInitChannelPool;
GRPCAssert(callOptions != nil, NSInvalidArgumentException, @"callOptions must not be empty.");
GRPCChannel *channel;
GRPCChannelConfiguration *configuration =
- [[GRPCChannelConfiguration alloc] initWithHost:host callOptions:callOptions];
+ [[GRPCChannelConfiguration alloc] initWithHost:host callOptions:callOptions];
@synchronized(self) {
channel = _channelPool[configuration];
if (channel == nil || channel.disconnected) {
if (destroyDelay == 0) {
channel = [[GRPCChannel alloc] initWithChannelConfiguration:configuration];
} else {
- channel = [[GRPCChannel alloc] initWithChannelConfiguration:configuration destroyDelay:destroyDelay];
+ channel = [[GRPCChannel alloc] initWithChannelConfiguration:configuration
+ destroyDelay:destroyDelay];
}
_channelPool[configuration] = channel;
}
@@ -91,8 +89,6 @@ static dispatch_once_t gInitChannelPool;
return channel;
}
-
-
+ (void)closeOpenConnections {
[[GRPCChannelPool sharedInstance] destroyAllChannels];
}
diff --git a/src/objective-c/GRPCClient/private/GRPCHost.m b/src/objective-c/GRPCClient/private/GRPCHost.m
index 14d07e949b..5fc7427b68 100644
--- a/src/objective-c/GRPCClient/private/GRPCHost.m
+++ b/src/objective-c/GRPCClient/private/GRPCHost.m
@@ -32,8 +32,8 @@
#import "GRPCCronetChannelFactory.h"
#import "GRPCSecureChannelFactory.h"
#import "NSDictionary+GRPC.h"
-#import "version.h"
#import "utilities.h"
+#import "version.h"
NS_ASSUME_NONNULL_BEGIN
@@ -122,7 +122,8 @@ static NSMutableDictionary *gHostCache;
if (_transportType == GRPCTransportTypeInsecure) {
options.transportType = GRPCTransportTypeInsecure;
} else {
- GRPCAssert(_transportType == GRPCTransportTypeDefault, NSInvalidArgumentException, @"Invalid transport type");
+ GRPCAssert(_transportType == GRPCTransportTypeDefault, NSInvalidArgumentException,
+ @"Invalid transport type");
options.transportType = GRPCTransportTypeCronet;
}
} else
diff --git a/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m b/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m
index 3079394ed8..57bd40d678 100644
--- a/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m
+++ b/src/objective-c/GRPCClient/private/GRPCSecureChannelFactory.m
@@ -84,8 +84,7 @@ NS_ASSUME_NONNULL_BEGIN
*errorPtr = defaultRootsError;
}
GRPCAssertWithArgument(
- defaultRootsASCII,
- NSObjectNotAvailableException,
+ defaultRootsASCII, NSObjectNotAvailableException,
@"Could not read gRPCCertificates.bundle/roots.pem. This file, "
"with the root certificates, is needed to establish secure (TLS) connections. "
"Because the file is distributed with the gRPC library, this error is usually a sign "
diff --git a/src/objective-c/GRPCClient/private/utilities.h b/src/objective-c/GRPCClient/private/utilities.h
index c664e8bf9d..3e51730d63 100644
--- a/src/objective-c/GRPCClient/private/utilities.h
+++ b/src/objective-c/GRPCClient/private/utilities.h
@@ -19,17 +19,18 @@
#import <Foundation/Foundation.h>
/** Raise exception when condition not met. Disregard NS_BLOCK_ASSERTIONS. */
-#define GRPCAssert(condition, errorType, errorString) \
-do { \
-if (!(condition)) { \
-[NSException raise:(errorType) format:(errorString)]; \
-} \
-} while (0)
+#define GRPCAssert(condition, errorType, errorString) \
+ do { \
+ if (!(condition)) { \
+ [NSException raise:(errorType)format:(errorString)]; \
+ } \
+ } while (0)
-/** The same as GRPCAssert but allows arguments to be put in the raised string. */
-#define GRPCAssertWithArgument(condition, errorType, errorFormat, ...) \
- do { \
- if (!(condition)) { \
- [NSException raise:(errorType) format:(errorFormat), __VA_ARGS__]; \
- } \
- } while (0)
+/** The same as GRPCAssert but allows arguments to be put in the raised string.
+ */
+#define GRPCAssertWithArgument(condition, errorType, errorFormat, ...) \
+ do { \
+ if (!(condition)) { \
+ [NSException raise:(errorType)format:(errorFormat), __VA_ARGS__]; \
+ } \
+ } while (0)