Commit fc87f6e417d206a88b581b77d3a5494ae4c978dd | zig | Meg's Mirrors

author	Andrew Kelley <andrew@ziglang.org> 2018-06-13 11:57:57-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-06-13 11:57:57-04:00
log	fc87f6e417d206a88b581b77d3a5494ae4c978dd
tree	63cdc891c10a1a00fa0d554e59fbf095848b3069
parent	e1f56c9af6fd9ab495e0c499e2c545e7d048fa9e

fix race condition bug in test harness of std.atomic

2 files changed, 6 insertions(+), 8 deletions(-)

std
- atomic
  - queue.zig
  - stack.zig

std/atomic/queue.zig+3-4

...	...	@@ -124,15 +124,14 @@ fn startPuts(ctx: *Context) u8 {
124	124
125	125	fn startGets(ctx: *Context) u8 {
126	126	while (true) {
	127	const last = @atomicLoad(u8, &ctx.puts_done, builtin.AtomicOrder.SeqCst) == 1;
	128
127	129	while (ctx.queue.get()) \|node\| {
128	130	std.os.time.sleep(0, 1); // let the os scheduler be our fuzz
129	131	_ = @atomicRmw(isize, &ctx.get_sum, builtin.AtomicRmwOp.Add, node.data, builtin.AtomicOrder.SeqCst);
130	132	_ = @atomicRmw(usize, &ctx.get_count, builtin.AtomicRmwOp.Add, 1, builtin.AtomicOrder.SeqCst);
131	133	}
132	134
133		if (@atomicLoad(u8, &ctx.puts_done, builtin.AtomicOrder.SeqCst) == 1) {
134		break;
135		}
	135	if (last) return 0;
136	136	}
137		return 0;
138	137	}

std/atomic/stack.zig+3-4

...	...	@@ -127,15 +127,14 @@ fn startPuts(ctx: *Context) u8 {
127	127
128	128	fn startGets(ctx: *Context) u8 {
129	129	while (true) {
	130	const last = @atomicLoad(u8, &ctx.puts_done, builtin.AtomicOrder.SeqCst) == 1;
	131
130	132	while (ctx.stack.pop()) \|node\| {
131	133	std.os.time.sleep(0, 1); // let the os scheduler be our fuzz
132	134	_ = @atomicRmw(isize, &ctx.get_sum, builtin.AtomicRmwOp.Add, node.data, builtin.AtomicOrder.SeqCst);
133	135	_ = @atomicRmw(usize, &ctx.get_count, builtin.AtomicRmwOp.Add, 1, builtin.AtomicOrder.SeqCst);
134	136	}
135	137
136		if (@atomicLoad(u8, &ctx.puts_done, builtin.AtomicOrder.SeqCst) == 1) {
137		break;
138		}
	138	if (last) return 0;
139	139	}
140		return 0;
141	140	}