Merge pull request #213 from grpc/podspec-validation

Fix a few problems found running "pod spec lint".

Author: timburks

Sources/CgRPC/shim/call.c

@@ -27,7 +27,7 @@ void cgrpc_call_destroy(cgrpc_call *call) {
   free(call);
 }
 
-grpc_call_error cgrpc_call_perform(cgrpc_call *call, cgrpc_operations *operations, int64_t tag) {
+grpc_call_error cgrpc_call_perform(cgrpc_call *call, cgrpc_operations *operations, void *tag) {
   grpc_call_error error = grpc_call_start_batch(call->call,
                                                 operations->ops,
                                                 operations->ops_count,

Sources/CgRPC/shim/cgrpc.h

@@ -172,14 +172,14 @@ cgrpc_completion_queue *cgrpc_handler_get_completion_queue(cgrpc_handler *h);
 
 grpc_call_error cgrpc_handler_request_call(cgrpc_handler *h,
                                            cgrpc_metadata_array *metadata,
-                                           long tag);
+                                           void *tag);
 char *cgrpc_handler_copy_host(cgrpc_handler *h);
 char *cgrpc_handler_copy_method(cgrpc_handler *h);
 char *cgrpc_handler_call_peer(cgrpc_handler *h);
 
 // call support
 void cgrpc_call_destroy(cgrpc_call *call);
-grpc_call_error cgrpc_call_perform(cgrpc_call *call, cgrpc_operations *operations, int64_t tag);
+grpc_call_error cgrpc_call_perform(cgrpc_call *call, cgrpc_operations *operations, void *tag);
 void cgrpc_call_cancel(cgrpc_call *call);
 
 // operations
@@ -209,7 +209,7 @@ cgrpc_byte_buffer *cgrpc_byte_buffer_create_by_copying_data(const void *source,
 const void *cgrpc_byte_buffer_copy_data(cgrpc_byte_buffer *bb, size_t *length);
 
 // event support
-int64_t cgrpc_event_tag(grpc_event ev);
+void *cgrpc_event_tag(grpc_event ev);
 
 // observers
 

Sources/CgRPC/shim/event.c

@@ -16,6 +16,6 @@
 #include "internal.h"
 #include "cgrpc.h"
 
-int64_t cgrpc_event_tag(grpc_event ev) {
-  return (int64_t) ev.tag;
+void *cgrpc_event_tag(grpc_event ev) {
+  return ev.tag;
 }

Sources/CgRPC/shim/handler.c

@@ -77,7 +77,7 @@ cgrpc_completion_queue *cgrpc_handler_get_completion_queue(cgrpc_handler *h) {
 
 grpc_call_error cgrpc_handler_request_call(cgrpc_handler *h,
                                            cgrpc_metadata_array *metadata,
-                                           long tag) {
+                                           void *tag) {
   if (h->server_call != NULL) {
     return GRPC_CALL_OK;
   }

Sources/CgRPC/shim/internal.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-void *cgrpc_create_tag(intptr_t t) { return (void *)t; }
+void *cgrpc_create_tag(void *t) { return t; }
 
 gpr_timespec cgrpc_deadline_in_seconds_from_now(float seconds) {
   return gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC),

Sources/CgRPC/shim/internal.h

@@ -105,7 +105,7 @@ typedef struct {
 } cgrpc_observer_recv_close_on_server;
 
 // internal utilities
-void *cgrpc_create_tag(intptr_t t);
+void *cgrpc_create_tag(void *t);
 gpr_timespec cgrpc_deadline_in_seconds_from_now(float seconds);
 
 void cgrpc_observer_apply(cgrpc_observer *observer, grpc_op *op);

Sources/SwiftGRPC/Core/Call.swift

@@ -88,7 +88,7 @@ public class Call {
       Call.callMutex.lock()
       // We need to do the perform *inside* the `completionQueue.register` call, to ensure that the queue can't get
       // shutdown in between registering the operation group and calling `cgrpc_call_perform`.
-      let error = cgrpc_call_perform(underlyingCall, operations.underlyingOperations, operations.tag)
+      let error = cgrpc_call_perform(underlyingCall, operations.underlyingOperations, UnsafeMutableRawPointer(bitPattern:operations.tag))
       Call.callMutex.unlock()
       if error != GRPC_CALL_OK {
         throw CallError.callError(grpcCallError: error)

Sources/SwiftGRPC/Core/CompletionQueue.swift

@@ -44,12 +44,12 @@ enum CompletionType {
 struct CompletionQueueEvent {
   let type: CompletionType
   let success: Int32
-  let tag: Int64
+  let tag: Int
 
   init(_ event: grpc_event) {
     type = CompletionType.completionType(event.type)
     success = event.success
-    tag = cgrpc_event_tag(event)
+    tag = Int(bitPattern: cgrpc_event_tag(event))
   }
 }
 
@@ -62,7 +62,7 @@ class CompletionQueue {
   private let underlyingCompletionQueue: UnsafeMutableRawPointer
 
   /// Operation groups that are awaiting completion, keyed by tag
-  private var operationGroups: [Int64: OperationGroup] = [:]
+  private var operationGroups: [Int: OperationGroup] = [:]
 
   /// Mutex for synchronizing access to operationGroups
   private let operationGroupsMutex: Mutex = Mutex()
@@ -118,7 +118,7 @@ class CompletionQueue {
         let event = cgrpc_completion_queue_get_next_event(self.underlyingCompletionQueue, 600)
         switch event.type {
         case GRPC_OP_COMPLETE:
-          let tag = cgrpc_event_tag(event)
+          let tag = Int(bitPattern:cgrpc_event_tag(event))
           self.operationGroupsMutex.lock()
           let operationGroup = self.operationGroups[tag]
           self.operationGroupsMutex.unlock()

Sources/SwiftGRPC/Core/Handler.swift

@@ -81,7 +81,7 @@ public class Handler {
   /// Fills the handler properties with information about the received request
   ///
   func requestCall(tag: Int) throws {
-    let error = cgrpc_handler_request_call(underlyingHandler, requestMetadata.underlyingArray, tag)
+    let error = cgrpc_handler_request_call(underlyingHandler, requestMetadata.underlyingArray, UnsafeMutableRawPointer(bitPattern: tag))
     if error != GRPC_CALL_OK {
       throw CallError.callError(grpcCallError: error)
     }

Sources/SwiftGRPC/Core/OperationGroup.swift

@@ -23,10 +23,10 @@ class OperationGroup {
   static let tagMutex = Mutex()
 
   /// Used to generate unique tags for OperationGroups
-  private static var nextTag: Int64 = 1
+  private static var nextTag: Int = 1
 
   /// Automatically-assigned tag that is used by the completion queue that watches this group.
-  let tag: Int64
+  let tag: Int
 
   /// The call associated with the operation group. Retained while the operations are running.
   // FIXME(danielalm): Is this property needed?