Commit 913f7d045020f7f3301201cf69e1d788439d8886 | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-11-06 15:08:29-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-11-06 15:08:29-05:00
log	913f7d045020f7f3301201cf69e1d788439d8886
tree	9af3f086918a054e8b56b3f7355aebc31b080155
parent	c1e8fdf812692edb9c7e496b00294aa749e81079
signature	Commit is signed but in an unrecognized format.

When evented I/O is being used, prevent event loop from terminating
at least until main() has returned.

1 files changed, 9 insertions(+), 2 deletions(-)

lib/std/special/start.zig+9-2

 @@ -202,8 +202,8 @@ inline fn initEventLoopAndCallMain() u8 {
             defer loop.deinit();
             var result: u8 = undefined;
-            var frame: @Frame(callMain) = undefined;
+            var frame: @Frame(callMainAsync) = undefined;
-            _ = @asyncCall(&frame, &result, callMain);
+            _ = @asyncCall(&frame, &result, callMainAsync, loop);
             loop.run();
             return result;
         }
 @@ -214,6 +214,13 @@ inline fn initEventLoopAndCallMain() u8 {
     return @inlineCall(callMain);
 }
+fn callMainAsync(loop: *std.event.Loop) u8 {
+    // This prevents the event loop from terminating at least until main() has returned.
+    loop.beginOneEvent();
+    defer loop.finishOneEvent();
+    return callMain();
+}
 // This is not marked inline because it is called with @asyncCall when
 // there is an event loop.
 fn callMain() u8 {