aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2019-01-02 15:59:19 -0800
committerGravatar Muxi Yan <mxyan@google.com>2019-01-07 10:27:20 -0800
commit3cdc0db838626ab1d186a4980125bc3e6219c0e0 (patch)
treefb83534ecd127ca8e19afde723c3dc0d096ff711 /src
parent03232ba46fba25465341b5e9632344f102f9df83 (diff)
clang-format
Diffstat (limited to 'src')
-rw-r--r--src/objective-c/GRPCClient/GRPCCall.m77
-rw-r--r--src/objective-c/RxLibrary/GRXBufferedPipe.m4
-rw-r--r--src/objective-c/RxLibrary/GRXConcurrentWriteable.h8
-rw-r--r--src/objective-c/RxLibrary/GRXConcurrentWriteable.m6
-rw-r--r--src/objective-c/RxLibrary/GRXForwardingWriter.m12
-rw-r--r--src/objective-c/RxLibrary/GRXImmediateSingleWriter.m4
6 files changed, 56 insertions, 55 deletions
diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m
index 5ea1755c58..c18dfae635 100644
--- a/src/objective-c/GRPCClient/GRPCCall.m
+++ b/src/objective-c/GRPCClient/GRPCCall.m
@@ -448,7 +448,7 @@ const char *kCFStreamVarName = "grpc_cfstream";
return;
}
NSString *hostAndPath = [NSString stringWithFormat:@"%@/%@", host, path];
- @synchronized (callFlags) {
+ @synchronized(callFlags) {
switch (callSafety) {
case GRPCCallSafetyDefault:
callFlags[hostAndPath] = @0;
@@ -468,7 +468,7 @@ const char *kCFStreamVarName = "grpc_cfstream";
+ (uint32_t)callFlagsForHost:(NSString *)host path:(NSString *)path {
NSString *hostAndPath = [NSString stringWithFormat:@"%@/%@", host, path];
uint32_t flags = 0;
- @synchronized (callFlags) {
+ @synchronized(callFlags) {
flags = [callFlags[hostAndPath] intValue];
}
return flags;
@@ -529,7 +529,7 @@ const char *kCFStreamVarName = "grpc_cfstream";
}
- (void)setResponseDispatchQueue:(dispatch_queue_t)queue {
- @synchronized (self) {
+ @synchronized(self) {
if (_state != GRXWriterStateNotStarted) {
return;
}
@@ -562,14 +562,14 @@ const char *kCFStreamVarName = "grpc_cfstream";
}
- (void)cancel {
- @synchronized (self) {
+ @synchronized(self) {
if (_state == GRXWriterStateFinished) {
return;
}
[self finishWithError:[NSError
- errorWithDomain:kGRPCErrorDomain
- code:GRPCErrorCodeCancelled
- userInfo:@{NSLocalizedDescriptionKey : @"Canceled by app"}]];
+ errorWithDomain:kGRPCErrorDomain
+ code:GRPCErrorCodeCancelled
+ userInfo:@{NSLocalizedDescriptionKey : @"Canceled by app"}]];
[_wrappedCall cancel];
}
}
@@ -636,19 +636,19 @@ const char *kCFStreamVarName = "grpc_cfstream";
// don't want to throw, because the app shouldn't crash for a behavior
// that's on the hands of any server to have. Instead we finish and ask
// the server to cancel.
- @synchronized (strongSelf) {
+ @synchronized(strongSelf) {
[strongSelf
- finishWithError:[NSError errorWithDomain:kGRPCErrorDomain
- code:GRPCErrorCodeResourceExhausted
- userInfo:@{
- NSLocalizedDescriptionKey :
- @"Client does not have enough memory to "
- @"hold the server response."
- }]];
+ finishWithError:[NSError errorWithDomain:kGRPCErrorDomain
+ code:GRPCErrorCodeResourceExhausted
+ userInfo:@{
+ NSLocalizedDescriptionKey :
+ @"Client does not have enough memory to "
+ @"hold the server response."
+ }]];
[strongSelf->_wrappedCall cancel];
}
} else {
- @synchronized (strongSelf) {
+ @synchronized(strongSelf) {
[strongSelf->_responseWriteable enqueueValue:data
completionHandler:^{
[strongSelf startNextRead];
@@ -689,9 +689,10 @@ const char *kCFStreamVarName = "grpc_cfstream";
}
// TODO(jcanizales): Add error handlers for async failures
- GRPCOpSendMetadata *op = [[GRPCOpSendMetadata alloc] initWithMetadata:headers
- flags:callSafetyFlags
- handler:nil]; // No clean-up needed after SEND_INITIAL_METADATA
+ GRPCOpSendMetadata *op = [[GRPCOpSendMetadata alloc]
+ initWithMetadata:headers
+ flags:callSafetyFlags
+ handler:nil]; // No clean-up needed after SEND_INITIAL_METADATA
dispatch_async(_callQueue, ^{
if (!self->_unaryCall) {
[self->_wrappedCall startBatchWithOperations:@[ op ]];
@@ -731,7 +732,7 @@ const char *kCFStreamVarName = "grpc_cfstream";
- (void)writeValue:(id)value {
NSAssert([value isKindOfClass:[NSData class]], @"value must be of type NSData");
- @synchronized (self) {
+ @synchronized(self) {
if (_state == GRXWriterStateFinished) {
return;
}
@@ -782,9 +783,9 @@ const char *kCFStreamVarName = "grpc_cfstream";
dispatch_async(_callQueue, ^{
// TODO(jcanizales): Add error handlers for async failures
[self->_wrappedCall
- startBatchWithOperations:@[ [[GRPCOpRecvMetadata alloc] initWithHandler:headersHandler] ]];
+ startBatchWithOperations:@[ [[GRPCOpRecvMetadata alloc] initWithHandler:headersHandler] ]];
[self->_wrappedCall
- startBatchWithOperations:@[ [[GRPCOpRecvStatus alloc] initWithHandler:completionHandler] ]];
+ startBatchWithOperations:@[ [[GRPCOpRecvStatus alloc] initWithHandler:completionHandler] ]];
});
}
@@ -825,16 +826,16 @@ const char *kCFStreamVarName = "grpc_cfstream";
// Lock acquired inside startWithWriteable:
- (void)startCallWithWriteable:(id<GRXWriteable>)writeable {
- @synchronized (self) {
+ @synchronized(self) {
if (_state == GRXWriterStateFinished) {
return;
}
_responseWriteable =
- [[GRXConcurrentWriteable alloc] initWithWriteable:writeable dispatchQueue:_responseQueue];
+ [[GRXConcurrentWriteable alloc] initWithWriteable:writeable dispatchQueue:_responseQueue];
GRPCPooledChannel *channel =
- [[GRPCChannelPool sharedInstance] channelWithHost:_host callOptions:_callOptions];
+ [[GRPCChannelPool sharedInstance] channelWithHost:_host callOptions:_callOptions];
_wrappedCall = [channel wrappedCallWithPath:_path
completionQueue:[GRPCCompletionQueue completionQueue]
callOptions:_callOptions];
@@ -843,9 +844,9 @@ const char *kCFStreamVarName = "grpc_cfstream";
[self maybeFinishWithError:[NSError errorWithDomain:kGRPCErrorDomain
code:GRPCErrorCodeUnavailable
userInfo:@{
- NSLocalizedDescriptionKey :
- @"Failed to create call or channel."
- }]];
+ NSLocalizedDescriptionKey :
+ @"Failed to create call or channel."
+ }]];
return;
}
@@ -869,10 +870,10 @@ const char *kCFStreamVarName = "grpc_cfstream";
_state = GRXWriterStateStarted;
// Create a retain cycle so that this instance lives until the RPC finishes (or is cancelled).
- // This makes RPCs in which the call isn't externally retained possible (as long as it is started
- // before being autoreleased).
- // Care is taken not to retain self strongly in any of the blocks used in this implementation, so
- // that the life of the instance is determined by this retain cycle.
+ // This makes RPCs in which the call isn't externally retained possible (as long as it is
+ // started before being autoreleased). Care is taken not to retain self strongly in any of the
+ // blocks used in this implementation, so that the life of the instance is determined by this
+ // retain cycle.
_retainSelf = self;
if (_callOptions == nil) {
@@ -961,14 +962,14 @@ const char *kCFStreamVarName = "grpc_cfstream";
// Retain because connectivity manager only keeps weak reference to GRPCCall.
__strong GRPCCall *strongSelf = self;
if (strongSelf) {
- @synchronized (strongSelf) {
+ @synchronized(strongSelf) {
[_wrappedCall cancel];
[strongSelf
- finishWithError:[NSError errorWithDomain:kGRPCErrorDomain
- code:GRPCErrorCodeUnavailable
- userInfo:@{
- NSLocalizedDescriptionKey : @"Connectivity lost."
- }]];
+ finishWithError:[NSError errorWithDomain:kGRPCErrorDomain
+ code:GRPCErrorCodeUnavailable
+ userInfo:@{
+ NSLocalizedDescriptionKey : @"Connectivity lost."
+ }]];
}
}
}
diff --git a/src/objective-c/RxLibrary/GRXBufferedPipe.m b/src/objective-c/RxLibrary/GRXBufferedPipe.m
index d0064a5cfa..74e2f03da6 100644
--- a/src/objective-c/RxLibrary/GRXBufferedPipe.m
+++ b/src/objective-c/RxLibrary/GRXBufferedPipe.m
@@ -52,7 +52,7 @@
value = [value copy];
}
dispatch_async(_writeQueue, ^(void) {
- @synchronized (self) {
+ @synchronized(self) {
if (self->_state == GRXWriterStateFinished) {
return;
}
@@ -106,7 +106,7 @@
}
- (void)startWithWriteable:(id<GRXWriteable>)writeable {
- @synchronized (self) {
+ @synchronized(self) {
self.writeable = writeable;
_state = GRXWriterStateStarted;
}
diff --git a/src/objective-c/RxLibrary/GRXConcurrentWriteable.h b/src/objective-c/RxLibrary/GRXConcurrentWriteable.h
index 55468b3c07..5beca9d41e 100644
--- a/src/objective-c/RxLibrary/GRXConcurrentWriteable.h
+++ b/src/objective-c/RxLibrary/GRXConcurrentWriteable.h
@@ -23,10 +23,10 @@
/**
* This is a thread-safe wrapper over a GRXWriteable instance. It lets one enqueue calls to a
- * GRXWriteable instance for the thread user provided, guaranteeing that writesFinishedWithError: is the last
- * message sent to it (no matter what messages are sent to the wrapper, in what order, nor from
- * which thread). It also guarantees that, if cancelWithError: is called (e.g.
- * by the app cancelling the writes), no further messages are sent to the writeable except
+ * GRXWriteable instance for the thread user provided, guaranteeing that writesFinishedWithError: is
+ * the last message sent to it (no matter what messages are sent to the wrapper, in what order, nor
+ * from which thread). It also guarantees that, if cancelWithError: is called (e.g. by the app
+ * cancelling the writes), no further messages are sent to the writeable except
* writesFinishedWithError:.
*
* TODO(jcanizales): Let the user specify another queue for the writeable callbacks.
diff --git a/src/objective-c/RxLibrary/GRXConcurrentWriteable.m b/src/objective-c/RxLibrary/GRXConcurrentWriteable.m
index d9d0e8c31e..e50cdf240d 100644
--- a/src/objective-c/RxLibrary/GRXConcurrentWriteable.m
+++ b/src/objective-c/RxLibrary/GRXConcurrentWriteable.m
@@ -63,7 +63,7 @@
- (void)enqueueSuccessfulCompletion {
dispatch_async(_writeableQueue, ^{
- @synchronized (self) {
+ @synchronized(self) {
if (self->_alreadyFinished) {
return;
}
@@ -76,7 +76,7 @@
- (void)cancelWithError:(NSError *)error {
NSAssert(error != nil, @"For a successful completion, use enqueueSuccessfulCompletion.");
- @synchronized (self) {
+ @synchronized(self) {
if (self->_alreadyFinished) {
return;
}
@@ -91,7 +91,7 @@
- (void)cancelSilently {
dispatch_async(_writeableQueue, ^{
- @synchronized (self) {
+ @synchronized(self) {
if (self->_alreadyFinished) {
return;
}
diff --git a/src/objective-c/RxLibrary/GRXForwardingWriter.m b/src/objective-c/RxLibrary/GRXForwardingWriter.m
index 376c196b4f..f5ed603698 100644
--- a/src/objective-c/RxLibrary/GRXForwardingWriter.m
+++ b/src/objective-c/RxLibrary/GRXForwardingWriter.m
@@ -57,13 +57,13 @@
#pragma mark GRXWriteable implementation
- (void)writeValue:(id)value {
- @synchronized (self) {
+ @synchronized(self) {
[_writeable writeValue:value];
}
}
- (void)writesFinishedWithError:(NSError *)errorOrNil {
- @synchronized (self) {
+ @synchronized(self) {
_writer = nil;
[self finishOutputWithError:errorOrNil];
}
@@ -78,14 +78,14 @@
- (void)setState:(GRXWriterState)state {
GRXWriter *copiedWriter = nil;
if (state == GRXWriterStateFinished) {
- @synchronized (self) {
+ @synchronized(self) {
_writeable = nil;
copiedWriter = _writer;
_writer = nil;
}
copiedWriter.state = GRXWriterStateFinished;
} else {
- @synchronized (self) {
+ @synchronized(self) {
copiedWriter = _writer;
}
copiedWriter.state = state;
@@ -94,7 +94,7 @@
- (void)startWithWriteable:(id<GRXWriteable>)writeable {
GRXWriter *copiedWriter = nil;
- @synchronized (self) {
+ @synchronized(self) {
_writeable = writeable;
copiedWriter = _writer;
}
@@ -103,7 +103,7 @@
- (void)finishWithError:(NSError *)errorOrNil {
GRXWriter *copiedWriter = nil;
- @synchronized (self) {
+ @synchronized(self) {
[self finishOutputWithError:errorOrNil];
copiedWriter = _writer;
}
diff --git a/src/objective-c/RxLibrary/GRXImmediateSingleWriter.m b/src/objective-c/RxLibrary/GRXImmediateSingleWriter.m
index eadad6c3b6..079c11b94f 100644
--- a/src/objective-c/RxLibrary/GRXImmediateSingleWriter.m
+++ b/src/objective-c/RxLibrary/GRXImmediateSingleWriter.m
@@ -38,7 +38,7 @@
- (void)startWithWriteable:(id<GRXWriteable>)writeable {
id copiedValue = nil;
- @synchronized (self) {
+ @synchronized(self) {
if (_state != GRXWriterStateNotStarted) {
return;
}
@@ -63,7 +63,7 @@
// the original \a map function returns a new Writer of another type. So we
// need to override this function here.
- (GRXWriter *)map:(id (^)(id))map {
- @synchronized (self) {
+ @synchronized(self) {
// Since _value is available when creating the object, we can simply
// apply the map and store the output.
_value = map(_value);