1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

time: consolidate the different sleep functions into time.wait(Duration) (#8853)

This commit is contained in:
zakuro
2021-02-22 00:05:03 +09:00
committed by GitHub
parent b1209aac1b
commit ac4791045f
49 changed files with 156 additions and 179 deletions

View File

@ -5,10 +5,10 @@ import os
import x.websocket
fn main() {
println('press enter to quit...\n')
go start_server()
time.sleep_ms(100)
time.wait(100 * time.millisecond)
go start_client()
println('press enter to quit...')
os.get_line()
}
@ -23,25 +23,21 @@ fn start_server() ? {
return false
}
return true
})?
}) ?
s.on_message(fn (mut ws websocket.Client, msg &websocket.Message) ? {
ws.write(msg.payload, msg.opcode) or {
panic(err)
}
ws.write(msg.payload, msg.opcode) or { panic(err) }
})
s.on_close(fn (mut ws websocket.Client, code int, reason string) ? {
// println('client ($ws.id) closed connection')
})
s.listen() or {
// println('error on server listen: $err')
}
s.listen() or { println('error on server listen: $err') }
unsafe {
s.free()
}
}
fn start_client() ? {
mut ws := websocket.new_client('ws://localhost:30000')?
mut ws := websocket.new_client('ws://localhost:30000') ?
// mut ws := websocket.new_client('wss://echo.websocket.org:443')?
// use on_open_ref if you want to send any reference object
ws.on_open(fn (mut ws websocket.Client) ? {
@ -67,15 +63,9 @@ fn start_client() ? {
// ws.on_message_ref(fn (mut ws websocket.Client, msg &websocket.Message, r &SomeRef)? {
// // println('type: $msg.opcode payload:\n$msg.payload ref: $r')
// }, &r)
ws.connect() or {
println('error on connect: $err')
}
go write_echo(mut ws) or {
println('error on write_echo $err')
}
ws.listen() or {
println('error on listen $err')
}
ws.connect() or { println('error on connect: $err') }
go write_echo(mut ws) or { println('error on write_echo $err') }
ws.listen() or { println('error on listen $err') }
unsafe {
ws.free()
}
@ -85,12 +75,8 @@ fn write_echo(mut ws websocket.Client) ? {
message := 'echo this'
for i := 0; i <= 10; i++ {
// Server will send pings every 30 seconds
ws.write_str(message) or {
println('panicing writing $err')
}
time.sleep_ms(100)
}
ws.close(1000, 'normal') or {
println('panicing $err')
ws.write_str(message) or { println('panicing writing $err') }
time.wait(100 * time.millisecond)
}
ws.close(1000, 'normal') or { println('panicing $err') }
}