Update sync.Channel

This commit is contained in:
gingerBill
2020-06-22 17:45:01 +01:00
parent 910ab7b3d4
commit 2a598aa061
+18 -9
View File
@@ -8,7 +8,6 @@ _, _ :: time, rand;
Channel :: struct(T: typeid) { Channel :: struct(T: typeid) {
using internal: ^_Channel_Internal(T), using internal: ^_Channel_Internal(T),
_: bool,
} }
_Channel_Internal :: struct(T: typeid) { _Channel_Internal :: struct(T: typeid) {
@@ -27,6 +26,10 @@ _Channel_Internal :: struct(T: typeid) {
w_waiting: int, w_waiting: int,
} }
channel_init :: proc(c: ^$C/Channel($T), cap: int = 0, allocator := context.allocator) {
c^ = cast(C)channel_make(T, cap, allocator);
}
channel_make :: proc($T: typeid, cap: int = 0, allocator := context.allocator) -> (ch: Channel(T)) { channel_make :: proc($T: typeid, cap: int = 0, allocator := context.allocator) -> (ch: Channel(T)) {
ch.internal = new(_Channel_Internal(T), allocator); ch.internal = new(_Channel_Internal(T), allocator);
if ch.internal == nil { if ch.internal == nil {
@@ -166,6 +169,12 @@ channel_can_read :: proc(ch: $C/Channel($T)) -> bool {
return len(ch.queue) > 0; return len(ch.queue) > 0;
} }
channel_can_read_write :: proc(ch: $C/Channel($T)) -> bool {
mutex_lock(&ch.mutex);
defer mutex_unlock(&ch.mutex);
return 0 < len(ch.queue) && len(ch.queue) < cap(ch.queue);
}
channel_iterator :: proc(ch: $C/Channel($T)) -> (elem: T, ok: bool) { channel_iterator :: proc(ch: $C/Channel($T)) -> (elem: T, ok: bool) {
mutex_lock(&ch.mutex); mutex_lock(&ch.mutex);
defer mutex_unlock(&ch.mutex); defer mutex_unlock(&ch.mutex);
@@ -179,7 +188,7 @@ channel_iterator :: proc(ch: $C/Channel($T)) -> (elem: T, ok: bool) {
channel_select :: proc(read_channels, write_channels: []$C/Channel($T), write_msgs: []T) -> (read_msg: T, index: int) { channel_select :: proc(readers, writers: []$C/Channel($T), write_msgs: []T) -> (read_msg: T, index: int) {
Candidate :: struct { Candidate :: struct {
ch: C, ch: C,
msg: T, msg: T,
@@ -188,10 +197,10 @@ channel_select :: proc(read_channels, write_channels: []$C/Channel($T), write_ms
}; };
count := 0; count := 0;
candidates := make([]Candidate, len(read_channels) + len(write_channels)); candidates := make([]Candidate, len(readers) + len(writers));
defer delete(candidates); defer delete(candidates);
for c, i in read_channels { for c, i in readers {
if channel_can_read(c) { if channel_can_read(c) {
candidates[count] = { candidates[count] = {
ch = c, ch = c,
@@ -202,7 +211,7 @@ channel_select :: proc(read_channels, write_channels: []$C/Channel($T), write_ms
} }
} }
for c, i in write_channels { for c, i in writers {
if channel_can_write(c) { if channel_can_write(c) {
candidates[count] = { candidates[count] = {
ch = c, ch = c,
@@ -239,10 +248,10 @@ channel_select :: proc(read_channels, write_channels: []$C/Channel($T), write_ms
} }
channel_select_write :: proc(write_channels: []$C/Channel($T), write_msgs: []T) -> (read_msg: T, index: int) { channel_select_write :: proc(writers: []$C/Channel($T), write_msgs: []T) -> (read_msg: T, index: int) {
return channel_select([]C{}, write_channels, msg); return channel_select([]C{}, writers, msg);
} }
channel_select_read :: proc(read_channels: []$C/Channel($T)) -> (index: int) { channel_select_read :: proc(readers: []$C/Channel($T)) -> (index: int) {
_, index = channel_select(read_channels, []C{}, nil); _, index = channel_select(readers, []C{}, nil);
return; return;
} }