Skip to content

Commit 2906a07

Browse files
committed
Fix Examples: remove CountDownLatch from Simple, add ssl.* to Echo2
1 parent 08309ec commit 2906a07

File tree

3 files changed

+52
-7
lines changed

3 files changed

+52
-7
lines changed

Examples/Echo2/ssl.crt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIICqDCCAZACCQCqiXoqUJivWDANBgkqhkiG9w0BAQUFADAWMRQwEgYDVQQDEwtl
3+
eGFtcGxlLmNvbTAeFw0xNzA5MDIwMDI5NDVaFw0xODA5MDIwMDI5NDVaMBYxFDAS
4+
BgNVBAMTC2V4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
5+
AQEA1VsheX+pqTrOV23/BZlUselhrguBI1wt0IvY3hcEPddTzjzG33LDCw2DsY5m
6+
zfITDjar0DaOcqGNdgoMFOOnja47BZgqgZS5hdl5XzC1N7QVZ4KrdYeY6N8eaVI4
7+
sHreD0oUDcHtLjRY8dSI/UcyeWmJQFNrf/nQVYD1Z57WTJrTbk+L7svRAKK41+Gv
8+
h3Y5QPl07yBGLyMMTCO4mWeslFekSDnmknniUMq+7U8s7tCTi04U33h6UhBRm328
9+
RJLXiSbe6D5N2X5mf4MwXyqYKaYQRnloTJfRxWk33O/zhy688/cHxHU/H4YrjN2z
10+
IowoHMg52KUCuZgr7F48mq6F3QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB6GMt8
11+
31wrtZtFm9GSDmYKbTUTItzME42H67KnkcLoTiBDOEC1cKSIIlxZsVgTIVgF09Ko
12+
3HBbJ6JSDXbsgTZIzVcmHxEPsmxsNCEa2zmaSCZ57DE48iOekBi+Ts0oiSo2LjpB
13+
fWARUNXEDHCE4EKwVzDwO0/DujFFj7PeZSU1WWU0qQbTagglOGEYgLPJYfYNVw9F
14+
8CoZIdRJV3QH6XW21WS2/dRebEbTw3wDU3QJ4P7eRDmAoZGfR6Lvk0wKcZRdtwTf
15+
2HfM/m0AsUSB5bo9ywp2Tdhh3CGSNz//h19RrgzQpwaX2+ncSajkODHGzZAkGTRo
16+
mqj68/iiCGEfImUe
17+
-----END CERTIFICATE-----

Examples/Echo2/ssl.key

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEpAIBAAKCAQEA1VsheX+pqTrOV23/BZlUselhrguBI1wt0IvY3hcEPddTzjzG
3+
33LDCw2DsY5mzfITDjar0DaOcqGNdgoMFOOnja47BZgqgZS5hdl5XzC1N7QVZ4Kr
4+
dYeY6N8eaVI4sHreD0oUDcHtLjRY8dSI/UcyeWmJQFNrf/nQVYD1Z57WTJrTbk+L
5+
7svRAKK41+Gvh3Y5QPl07yBGLyMMTCO4mWeslFekSDnmknniUMq+7U8s7tCTi04U
6+
33h6UhBRm328RJLXiSbe6D5N2X5mf4MwXyqYKaYQRnloTJfRxWk33O/zhy688/cH
7+
xHU/H4YrjN2zIowoHMg52KUCuZgr7F48mq6F3QIDAQABAoIBAQDMDuoYQ5Koidb6
8+
ZfjoiPspYhaLmPM9N5eWA3s7BvaGkyDTeuuWoTOMqbNQKeuHg8TX7lArx1I8rukW
9+
gYuGmyoQ5xgKRLw6zV0XeKWN9o8MJM/n/WEx+quz5lo2z23q1Mj4BJjjg5vueiCr
10+
wuP2opbS6q5b+K0zbGHmtX2BSriZ8CdzRyMwD2fY9x21q0k7onVw1jhMtRTi6spf
11+
CPegLOndhdscE08QDvFr0x6++VWaijV3lKFzI093opzWDfJN4VLBz0Wyod1puB2C
12+
OoVHi++czinQ4p3Ru0vstUW7gy37sq6dhhlAp5RzVmX9RPcdrYK5G+YS8cINSuak
13+
v2uD+YdhAoGBAPKybPshE0XBJv0YC8XOiy4twEdCwgQb24lJHMVIJcQMKXrXNGCV
14+
9p6IlVqAYYZ7TXX/hyv4/+XxteoDctJqPjSL5M6hjIfOdV7i3bhMoJHqcpV2NzJD
15+
52MZ28TCPyGfGU7x80ohx4xBNgMFpstglAf0YPF5gtkSPgqH563OWF2lAoGBAOEM
16+
/HH0fU/CsAEDgqY8XUkRSfGBbgMt1wx/frhetmzuTVZ+iM3wmFlyCdpJQb/GCrOk
17+
72JACbM0NP3hbIDZeGper5UpyuMSLi/FKUaDyc1cCDzyPs9mv0ikcwkViGJ2V0Pq
18+
YXP4YrNb3YKbH//rzhCvOCzUHwSV55knb+lqi4HZAoGAVLBIcTVweTXWehjq+sKB
19+
NMMIRpWYCEEEUZqurHTpoMixrMjt4QpTfayhmWwVHA1o0VUygPipqz62QQulBKHI
20+
RSPP2v7qf/VeZZb60bYDjgdmppsS1bp2QtGiK72ws/XFqhOp1uOEs3+J7nIJawyv
21+
ezsenQTO0RqZhak5AiBwG3UCgYEAv8d5OQLH5rhZlAORymeWdzWsdYl+Xmcp4xSi
22+
wCq1+o34icS6gASPT2nGy6WxyeLSK9RZyrgXjAbpQZBgDk1EOCEIL2y14FsV0M+L
23+
JPQZfE75Fja5H7THPPgmr48R8hY2t0F8Wn9IXN/kG/BljIk9ySoIDOuWoym7euAI
24+
ljidOcECgYALG9yPR4Kmc/WG5DzN3aMZqSEo5Jwt7L9T63RG+c5mo2BSbpTYGjnS
25+
vumUg0l1tZERuDWKSbFkFhYRlcOpMlmcWf0cDdb4WeE8/mQZMq0tTI9gkdhdGgPq
26+
LvsXSk4yVNt8SUAJI5QQpdPGMslRWNKS0D24ikqrGswRjdikJyyF8A==
27+
-----END RSA PRIVATE KEY-----

Examples/Simple/PackageManager/main.swift

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
import gRPC
1716
import Foundation
17+
import Dispatch
18+
import gRPC
1819

1920
let address = "localhost:8001"
2021
let host = "foo.test.google.fr"
@@ -47,7 +48,7 @@ func client() throws {
4748
let c = gRPC.Channel(address:address, secure:false)
4849
let steps = 3
4950
for i in 0..<steps {
50-
let latch = CountDownLatch(1)
51+
let sem = DispatchSemaphore(value: 0)
5152

5253
let method = (i < steps-1) ? "/hello" : "/quit"
5354
print("calling " + method)
@@ -75,9 +76,9 @@ func client() throws {
7576
for i in 0..<trailingMetadata.count() {
7677
print("TRAILING METADATA ->", trailingMetadata.key(i), ":", trailingMetadata.value(i))
7778
}
78-
latch.signal()
79+
sem.signal()
7980
}
80-
latch.wait()
81+
_ = sem.wait(timeout: DispatchTime.distantFuture)
8182
}
8283
print("Done")
8384
}
@@ -86,7 +87,7 @@ func server() throws {
8687
let server = gRPC.Server(address:address)
8788
var requestCount = 0
8889

89-
let latch = CountDownLatch(1)
90+
let sem = DispatchSemaphore(value: 0)
9091

9192
server.run() {(requestHandler) in
9293

@@ -114,7 +115,7 @@ func server() throws {
114115

115116
if requestHandler.method == "/quit" {
116117
print("quitting")
117-
latch.signal()
118+
sem.signal()
118119
}
119120

120121
let replyMessage = "hello, client!"
@@ -136,7 +137,7 @@ func server() throws {
136137
print("Server Stopped")
137138
}
138139

139-
latch.wait()
140+
_ = sem.wait(timeout: DispatchTime.distantFuture)
140141
}
141142

142143
try main()

0 commit comments

Comments
 (0)