Browse Source

Fix Examples: remove CountDownLatch from Simple, add ssl.* to Echo2

Tim Burks 8 năm trước cách đây
mục cha
commit
2906a07f08
3 tập tin đã thay đổi với 52 bổ sung7 xóa
  1. 17 0
      Examples/Echo2/ssl.crt
  2. 27 0
      Examples/Echo2/ssl.key
  3. 8 7
      Examples/Simple/PackageManager/main.swift

+ 17 - 0
Examples/Echo2/ssl.crt

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICqDCCAZACCQCqiXoqUJivWDANBgkqhkiG9w0BAQUFADAWMRQwEgYDVQQDEwtl
+eGFtcGxlLmNvbTAeFw0xNzA5MDIwMDI5NDVaFw0xODA5MDIwMDI5NDVaMBYxFDAS
+BgNVBAMTC2V4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA1VsheX+pqTrOV23/BZlUselhrguBI1wt0IvY3hcEPddTzjzG33LDCw2DsY5m
+zfITDjar0DaOcqGNdgoMFOOnja47BZgqgZS5hdl5XzC1N7QVZ4KrdYeY6N8eaVI4
+sHreD0oUDcHtLjRY8dSI/UcyeWmJQFNrf/nQVYD1Z57WTJrTbk+L7svRAKK41+Gv
+h3Y5QPl07yBGLyMMTCO4mWeslFekSDnmknniUMq+7U8s7tCTi04U33h6UhBRm328
+RJLXiSbe6D5N2X5mf4MwXyqYKaYQRnloTJfRxWk33O/zhy688/cHxHU/H4YrjN2z
+IowoHMg52KUCuZgr7F48mq6F3QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB6GMt8
+31wrtZtFm9GSDmYKbTUTItzME42H67KnkcLoTiBDOEC1cKSIIlxZsVgTIVgF09Ko
+3HBbJ6JSDXbsgTZIzVcmHxEPsmxsNCEa2zmaSCZ57DE48iOekBi+Ts0oiSo2LjpB
+fWARUNXEDHCE4EKwVzDwO0/DujFFj7PeZSU1WWU0qQbTagglOGEYgLPJYfYNVw9F
+8CoZIdRJV3QH6XW21WS2/dRebEbTw3wDU3QJ4P7eRDmAoZGfR6Lvk0wKcZRdtwTf
+2HfM/m0AsUSB5bo9ywp2Tdhh3CGSNz//h19RrgzQpwaX2+ncSajkODHGzZAkGTRo
+mqj68/iiCGEfImUe
+-----END CERTIFICATE-----

+ 27 - 0
Examples/Echo2/ssl.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA1VsheX+pqTrOV23/BZlUselhrguBI1wt0IvY3hcEPddTzjzG
+33LDCw2DsY5mzfITDjar0DaOcqGNdgoMFOOnja47BZgqgZS5hdl5XzC1N7QVZ4Kr
+dYeY6N8eaVI4sHreD0oUDcHtLjRY8dSI/UcyeWmJQFNrf/nQVYD1Z57WTJrTbk+L
+7svRAKK41+Gvh3Y5QPl07yBGLyMMTCO4mWeslFekSDnmknniUMq+7U8s7tCTi04U
+33h6UhBRm328RJLXiSbe6D5N2X5mf4MwXyqYKaYQRnloTJfRxWk33O/zhy688/cH
+xHU/H4YrjN2zIowoHMg52KUCuZgr7F48mq6F3QIDAQABAoIBAQDMDuoYQ5Koidb6
+ZfjoiPspYhaLmPM9N5eWA3s7BvaGkyDTeuuWoTOMqbNQKeuHg8TX7lArx1I8rukW
+gYuGmyoQ5xgKRLw6zV0XeKWN9o8MJM/n/WEx+quz5lo2z23q1Mj4BJjjg5vueiCr
+wuP2opbS6q5b+K0zbGHmtX2BSriZ8CdzRyMwD2fY9x21q0k7onVw1jhMtRTi6spf
+CPegLOndhdscE08QDvFr0x6++VWaijV3lKFzI093opzWDfJN4VLBz0Wyod1puB2C
+OoVHi++czinQ4p3Ru0vstUW7gy37sq6dhhlAp5RzVmX9RPcdrYK5G+YS8cINSuak
+v2uD+YdhAoGBAPKybPshE0XBJv0YC8XOiy4twEdCwgQb24lJHMVIJcQMKXrXNGCV
+9p6IlVqAYYZ7TXX/hyv4/+XxteoDctJqPjSL5M6hjIfOdV7i3bhMoJHqcpV2NzJD
+52MZ28TCPyGfGU7x80ohx4xBNgMFpstglAf0YPF5gtkSPgqH563OWF2lAoGBAOEM
+/HH0fU/CsAEDgqY8XUkRSfGBbgMt1wx/frhetmzuTVZ+iM3wmFlyCdpJQb/GCrOk
+72JACbM0NP3hbIDZeGper5UpyuMSLi/FKUaDyc1cCDzyPs9mv0ikcwkViGJ2V0Pq
+YXP4YrNb3YKbH//rzhCvOCzUHwSV55knb+lqi4HZAoGAVLBIcTVweTXWehjq+sKB
+NMMIRpWYCEEEUZqurHTpoMixrMjt4QpTfayhmWwVHA1o0VUygPipqz62QQulBKHI
+RSPP2v7qf/VeZZb60bYDjgdmppsS1bp2QtGiK72ws/XFqhOp1uOEs3+J7nIJawyv
+ezsenQTO0RqZhak5AiBwG3UCgYEAv8d5OQLH5rhZlAORymeWdzWsdYl+Xmcp4xSi
+wCq1+o34icS6gASPT2nGy6WxyeLSK9RZyrgXjAbpQZBgDk1EOCEIL2y14FsV0M+L
+JPQZfE75Fja5H7THPPgmr48R8hY2t0F8Wn9IXN/kG/BljIk9ySoIDOuWoym7euAI
+ljidOcECgYALG9yPR4Kmc/WG5DzN3aMZqSEo5Jwt7L9T63RG+c5mo2BSbpTYGjnS
+vumUg0l1tZERuDWKSbFkFhYRlcOpMlmcWf0cDdb4WeE8/mQZMq0tTI9gkdhdGgPq
+LvsXSk4yVNt8SUAJI5QQpdPGMslRWNKS0D24ikqrGswRjdikJyyF8A==
+-----END RSA PRIVATE KEY-----

+ 8 - 7
Examples/Simple/PackageManager/main.swift

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import gRPC
 import Foundation
+import Dispatch
+import gRPC
 
 let address = "localhost:8001"
 let host = "foo.test.google.fr"
@@ -47,7 +48,7 @@ func client() throws {
   let c = gRPC.Channel(address:address, secure:false)
   let steps = 3
   for i in 0..<steps {
-    let latch = CountDownLatch(1)
+    let sem = DispatchSemaphore(value: 0)
 
     let method = (i < steps-1) ? "/hello" : "/quit"
     print("calling " + method)
@@ -75,9 +76,9 @@ func client() throws {
       for i in 0..<trailingMetadata.count() {
         print("TRAILING METADATA ->", trailingMetadata.key(i), ":", trailingMetadata.value(i))
       }
-      latch.signal()
+      sem.signal()
     }
-    latch.wait()
+    _ = sem.wait(timeout: DispatchTime.distantFuture)
   }
   print("Done")
 }
@@ -86,7 +87,7 @@ func server() throws {
   let server = gRPC.Server(address:address)
   var requestCount = 0
 
-  let latch = CountDownLatch(1)
+  let sem = DispatchSemaphore(value: 0)
 
   server.run() {(requestHandler) in
 
@@ -114,7 +115,7 @@ func server() throws {
 
       if requestHandler.method == "/quit" {
         print("quitting")
-        latch.signal()
+        sem.signal()
       }
 
       let replyMessage = "hello, client!"
@@ -136,7 +137,7 @@ func server() throws {
     print("Server Stopped")
   }
 
-  latch.wait()
+  _ = sem.wait(timeout: DispatchTime.distantFuture)
 }
 
 try main()