authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-07-10 15:17:01-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-07-10 15:17:01-04:00
log8fba0a6ae862993afa2aeca774347adc399b3605
tree1f0edaca796666c73ab578b2bb3d1c1d4bc5f264
parent0ce6934e2631eb3beca817d3bce12ecb13aafa13

introduce std.event.Group for making parallel async calls

4 files changed, 189 insertions(+), 8 deletions(-)

CMakeLists.txt+1
...@@ -459,6 +459,7 @@ set(ZIG_STD_FILES...@@ -459,6 +459,7 @@ set(ZIG_STD_FILES
459 "empty.zig"459 "empty.zig"
460 "event.zig"460 "event.zig"
461 "event/channel.zig"461 "event/channel.zig"
462 "event/group.zig"
462 "event/lock.zig"463 "event/lock.zig"
463 "event/locked.zig"464 "event/locked.zig"
464 "event/loop.zig"465 "event/loop.zig"
src-self-hosted/module.zig+28-8
...@@ -85,6 +85,17 @@ pub const Module = struct {...@@ -85,6 +85,17 @@ pub const Module = struct {
8585
86 exported_symbol_names: event.Locked(Decl.Table),86 exported_symbol_names: event.Locked(Decl.Table),
8787
88 /// Before code generation starts, must wait on this group to make sure
89 /// the build is complete.
90 build_group: event.Group(BuildError!void),
91
92 const BuildErrorsList = std.SegmentedList(BuildErrorDesc, 1);
93
94 pub const BuildErrorDesc = struct {
95 code: BuildError,
96 text: []const u8,
97 };
98
88 // TODO handle some of these earlier and report them in a way other than error codes99 // TODO handle some of these earlier and report them in a way other than error codes
89 pub const BuildError = error{100 pub const BuildError = error{
90 OutOfMemory,101 OutOfMemory,
...@@ -237,6 +248,7 @@ pub const Module = struct {...@@ -237,6 +248,7 @@ pub const Module = struct {
237 .emit_file_type = Emit.Binary,248 .emit_file_type = Emit.Binary,
238 .link_out_file = null,249 .link_out_file = null,
239 .exported_symbol_names = event.Locked(Decl.Table).init(loop, Decl.Table.init(loop.allocator)),250 .exported_symbol_names = event.Locked(Decl.Table).init(loop, Decl.Table.init(loop.allocator)),
251 .build_group = event.Group(BuildError!void).init(loop),
240 });252 });
241 }253 }
242254
...@@ -310,6 +322,9 @@ pub const Module = struct {...@@ -310,6 +322,9 @@ pub const Module = struct {
310 const decls = try Scope.Decls.create(self.a(), null);322 const decls = try Scope.Decls.create(self.a(), null);
311 errdefer decls.destroy();323 errdefer decls.destroy();
312324
325 var decl_group = event.Group(BuildError!void).init(self.loop);
326 errdefer decl_group.cancelAll();
327
313 var it = tree.root_node.decls.iterator(0);328 var it = tree.root_node.decls.iterator(0);
314 while (it.next()) |decl_ptr| {329 while (it.next()) |decl_ptr| {
315 const decl = decl_ptr.*;330 const decl = decl_ptr.*;
...@@ -342,25 +357,30 @@ pub const Module = struct {...@@ -342,25 +357,30 @@ pub const Module = struct {
342 });357 });
343 errdefer self.a().destroy(fn_decl);358 errdefer self.a().destroy(fn_decl);
344359
345 // TODO make this parallel360 try decl_group.call(addTopLevelDecl, self, tree, &fn_decl.base);
346 try await try async self.addTopLevelDecl(tree, &fn_decl.base);
347 },361 },
348 ast.Node.Id.TestDecl => @panic("TODO"),362 ast.Node.Id.TestDecl => @panic("TODO"),
349 else => unreachable,363 else => unreachable,
350 }364 }
351 }365 }
366 try await (async decl_group.wait() catch unreachable);
367 try await (async self.build_group.wait() catch unreachable);
352 }368 }
353369
354 async fn addTopLevelDecl(self: *Module, tree: *ast.Tree, decl: *Decl) !void {370 async fn addTopLevelDecl(self: *Module, tree: *ast.Tree, decl: *Decl) !void {
355 const is_export = decl.isExported(tree);371 const is_export = decl.isExported(tree);
356372
357 {373 if (is_export) {
358 const exported_symbol_names = await try async self.exported_symbol_names.acquire();374 try self.build_group.call(verifyUniqueSymbol, self, decl);
359 defer exported_symbol_names.release();375 }
376 }
360377
361 if (try exported_symbol_names.value.put(decl.name, decl)) |other_decl| {378 async fn verifyUniqueSymbol(self: *Module, decl: *Decl) !void {
362 @panic("TODO report compile error");379 const exported_symbol_names = await (async self.exported_symbol_names.acquire() catch unreachable);
363 }380 defer exported_symbol_names.release();
381
382 if (try exported_symbol_names.value.put(decl.name, decl)) |other_decl| {
383 @panic("TODO report compile error");
364 }384 }
365 }385 }
366386
std/event.zig+2
...@@ -3,6 +3,7 @@ pub const Loop = @import("event/loop.zig").Loop;...@@ -3,6 +3,7 @@ pub const Loop = @import("event/loop.zig").Loop;
3pub const Lock = @import("event/lock.zig").Lock;3pub const Lock = @import("event/lock.zig").Lock;
4pub const tcp = @import("event/tcp.zig");4pub const tcp = @import("event/tcp.zig");
5pub const Channel = @import("event/channel.zig").Channel;5pub const Channel = @import("event/channel.zig").Channel;
6pub const Group = @import("event/group.zig").Group;
67
7test "import event tests" {8test "import event tests" {
8 _ = @import("event/locked.zig");9 _ = @import("event/locked.zig");
...@@ -10,4 +11,5 @@ test "import event tests" {...@@ -10,4 +11,5 @@ test "import event tests" {
10 _ = @import("event/lock.zig");11 _ = @import("event/lock.zig");
11 _ = @import("event/tcp.zig");12 _ = @import("event/tcp.zig");
12 _ = @import("event/channel.zig");13 _ = @import("event/channel.zig");
14 _ = @import("event/group.zig");
13}15}
std/event/group.zig created+158
...@@ -0,0 +1,158 @@
1const std = @import("../index.zig");
2const builtin = @import("builtin");
3const Lock = std.event.Lock;
4const Loop = std.event.Loop;
5const AtomicRmwOp = builtin.AtomicRmwOp;
6const AtomicOrder = builtin.AtomicOrder;
7const assert = std.debug.assert;
8
9/// ReturnType should be `void` or `E!void`
10pub fn Group(comptime ReturnType: type) type {
11 return struct {
12 coro_stack: Stack,
13 alloc_stack: Stack,
14 lock: Lock,
15
16 const Self = this;
17
18 const Error = switch (@typeInfo(ReturnType)) {
19 builtin.TypeId.ErrorUnion => |payload| payload.error_set,
20 else => void,
21 };
22 const Stack = std.atomic.Stack(promise->ReturnType);
23
24 pub fn init(loop: *Loop) Self {
25 return Self{
26 .coro_stack = Stack.init(),
27 .alloc_stack = Stack.init(),
28 .lock = Lock.init(loop),
29 };
30 }
31
32 /// Add a promise to the group. Thread-safe.
33 pub fn add(self: *Self, handle: promise->ReturnType) (error{OutOfMemory}!void) {
34 const node = try self.lock.loop.allocator.create(Stack.Node{
35 .next = undefined,
36 .data = handle,
37 });
38 self.alloc_stack.push(node);
39 }
40
41 /// This is equivalent to an async call, but the async function is added to the group, instead
42 /// of returning a promise. func must be async and have return type void.
43 /// Thread-safe.
44 pub fn call(self: *Self, comptime func: var, args: ...) (error{OutOfMemory}!void) {
45 const S = struct {
46 async fn asyncFunc(node: **Stack.Node, args2: ...) ReturnType {
47 // TODO this is a hack to make the memory following be inside the coro frame
48 suspend |p| {
49 var my_node: Stack.Node = undefined;
50 node.* = &my_node;
51 resume p;
52 }
53
54 // TODO this allocation elision should be guaranteed because we await it in
55 // this coro frame
56 return await (async func(args2) catch unreachable);
57 }
58 };
59 var node: *Stack.Node = undefined;
60 const handle = try async<self.lock.loop.allocator> S.asyncFunc(&node, args);
61 node.* = Stack.Node{
62 .next = undefined,
63 .data = handle,
64 };
65 self.coro_stack.push(node);
66 }
67
68 /// Wait for all the calls and promises of the group to complete.
69 /// Thread-safe.
70 pub async fn wait(self: *Self) ReturnType {
71 // TODO catch unreachable because the allocation can be grouped with
72 // the coro frame allocation
73 const held = await (async self.lock.acquire() catch unreachable);
74 defer held.release();
75
76 while (self.coro_stack.pop()) |node| {
77 if (Error == void) {
78 await node.data;
79 } else {
80 (await node.data) catch |err| {
81 self.cancelAll();
82 return err;
83 };
84 }
85 }
86 while (self.alloc_stack.pop()) |node| {
87 const handle = node.data;
88 self.lock.loop.allocator.destroy(node);
89 if (Error == void) {
90 await handle;
91 } else {
92 (await handle) catch |err| {
93 self.cancelAll();
94 return err;
95 };
96 }
97 }
98 }
99
100 /// Cancel all the outstanding promises. May only be called if wait was never called.
101 pub fn cancelAll(self: *Self) void {
102 while (self.coro_stack.pop()) |node| {
103 cancel node.data;
104 }
105 while (self.alloc_stack.pop()) |node| {
106 cancel node.data;
107 self.lock.loop.allocator.destroy(node);
108 }
109 }
110 };
111}
112
113test "std.event.Group" {
114 var da = std.heap.DirectAllocator.init();
115 defer da.deinit();
116
117 const allocator = &da.allocator;
118
119 var loop: Loop = undefined;
120 try loop.initMultiThreaded(allocator);
121 defer loop.deinit();
122
123 const handle = try async<allocator> testGroup(&loop);
124 defer cancel handle;
125
126 loop.run();
127}
128
129async fn testGroup(loop: *Loop) void {
130 var count: usize = 0;
131 var group = Group(void).init(loop);
132 group.add(async sleepALittle(&count) catch @panic("memory")) catch @panic("memory");
133 group.call(increaseByTen, &count) catch @panic("memory");
134 await (async group.wait() catch @panic("memory"));
135 assert(count == 11);
136
137 var another = Group(error!void).init(loop);
138 another.add(async somethingElse() catch @panic("memory")) catch @panic("memory");
139 another.call(doSomethingThatFails) catch @panic("memory");
140 std.debug.assertError(await (async another.wait() catch @panic("memory")), error.ItBroke);
141}
142
143async fn sleepALittle(count: *usize) void {
144 std.os.time.sleep(0, 1000000);
145 _ = @atomicRmw(usize, count, AtomicRmwOp.Add, 1, AtomicOrder.SeqCst);
146}
147
148async fn increaseByTen(count: *usize) void {
149 var i: usize = 0;
150 while (i < 10) : (i += 1) {
151 _ = @atomicRmw(usize, count, AtomicRmwOp.Add, 1, AtomicOrder.SeqCst);
152 }
153}
154
155async fn doSomethingThatFails() error!void {}
156async fn somethingElse() error!void {
157 return error.ItBroke;
158}