mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

all: experimental locked concurrency support, part 1 (#5637)

Browse Source
This commit is contained in:
Uwe Krüger
2020-07-04 12:44:25 +02:00
committed by GitHub
parent 27149ba8bc
commit 3b067f5f85
27 changed files with 510 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/net/websocket/io.v
View File

@@ -2,7 +2,7 @@ module websocket
fn (mut ws Client) write_to_server(buf voidptr, len int) int {
mut bytes_written := 0
ws.write_lock.lock()
ws.write_lock.m_lock()
bytes_written = if ws.is_ssl {
C.SSL_write(ws.ssl, buf, len)
} else {

22
vlib/net/websocket/ws.v
View File

@@ -19,7 +19,7 @@ pub struct Client {
// cwebsocket_subprotocol *subprotocol;
// cwebsocket_subprotocol *subprotocols[];
mut:
lock &sync.Mutex = sync.new_mutex()
mtx &sync.Mutex = sync.new_mutex()
write_lock &sync.Mutex = sync.new_mutex()
state State
socket net.Socket
@@ -132,9 +132,9 @@ pub fn (mut ws Client) connect() int {
// do nothing
}
}
ws.lock.lock()
ws.mtx.m_lock()
ws.state = .connecting
ws.lock.unlock()
ws.mtx.unlock()
uri := ws.parse_uri()
nonce := get_nonce(ws.nonce_size)
seckey := base64.encode(nonce)
@@ -160,17 +160,17 @@ pub fn (mut ws Client) connect() int {
if ws.is_ssl {
ws.connect_ssl()
}
ws.lock.lock()
ws.mtx.m_lock()
ws.state = .connected
ws.lock.unlock()
ws.mtx.unlock()
res := ws.write_to_server(handshake.str, handshake.len)
if res <= 0 {
l.f('Handshake failed.')
}
ws.read_handshake(seckey)
ws.lock.lock()
ws.mtx.m_lock()
ws.state = .open
ws.lock.unlock()
ws.mtx.unlock()
ws.send_open_event()
unsafe {
handshake.free()
@@ -182,9 +182,9 @@ pub fn (mut ws Client) connect() int {
pub fn (mut ws Client) close(code int, message string) {
if ws.state != .closed && ws.socket.sockfd > 1 {
ws.lock.lock()
ws.mtx.m_lock()
ws.state = .closing
ws.lock.unlock()
ws.mtx.unlock()
mut code32 := 0
if code > 0 {
code_ := C.htons(code)
@@ -223,9 +223,9 @@ pub fn (mut ws Client) close(code int, message string) {
}
ws.fragments = []
ws.send_close_event()
ws.lock.lock()
ws.mtx.m_lock()
ws.state = .closed
ws.lock.unlock()
ws.mtx.unlock()
unsafe {
}
// TODO impl autoreconnect