diff options
| author |  Jarred Sumner <jarred@jarredsumner.com>
| 2022-12-28 00:51:22 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-12-28 00:51:22 -0800 |
| commit | c0dd2841362b67fdb5ede262b19688004a4eb9a4 (patch) | |
| tree | a3cd6b353c25c30d66489de61b394af7d5568fed /src/bun.js/event_loop.zig | |
| parent | 504972fa5deb92f2d0510d42f11b085351915a32 (diff) | |
| download | bun-c0dd2841362b67fdb5ede262b19688004a4eb9a4.tar.gz bun-c0dd2841362b67fdb5ede262b19688004a4eb9a4.tar.zst bun-c0dd2841362b67fdb5ede262b19688004a4eb9a4.zip | |
Upgrade to latest Zig (#1610)
* @min and @max
* builtins and some trivial ones
* Most of them
* more
* more!
* More Progress
* wip
* Update tagged_pointer.zig
* Update http_client_async.zig
* Most of the iterable dir changes
* alright
* Remove usages of deprecated formatters
* :camera:
* fmt
* Update shimmer.zig
* wip
* wip
* wip
* progress
* more
* Latest
* stuck on error
* latest
* workaround stage2
* wip
* Update string_immutable.zig
* wip
* Migrate `Dirent` and `require("fs')` to use JSC<>Zig bindings
* Fix build errors
* Fixup most of the test failures
* Fix `make headers`
* Fix "outside package path" error
* Fixup aligned alloc
* Add missing file
* linux
* More linux fixes
* use latest peechy
* Fix transpiler test failure
* Forgot about these
* Fixup test failure
* Update node-timers.test.ts
* [node:htt] Fix `undefined is not an object` error
Fixes https://github.com/oven-sh/bun/issues/1618
* Update http.exports.js
* Make this test less flaky
* fix hashes
* Fix hex formatting and zls issues
* Download zig version
* Update Dockerfile
* Update Dockerfile
* Update uws
* Update Dockerfile
* Set llvm version
* Update README.md
* Update uws
* Update Dockerfile
* Update io_linux.zig
* Update bun.zig
* Log output
* workaround strange @cInclude error
* Make ffi tests better
* Don't use cImport
* Update c.zig
* Update c-bindings.cpp
* call setOutputDir
* Update Dockerfile
* Use a longer name
* latest
* Update serve.test.ts
Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Co-authored-by: Veikka Tuominen <git@vexu.eu>
Diffstat (limited to 'src/bun.js/event_loop.zig')
| -rw-r--r-- | src/bun.js/event_loop.zig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bun.js/event_loop.zig b/src/bun.js/event_loop.zig index b770fe3e4..56e68cce0 100644 --- a/src/bun.js/event_loop.zig +++ b/src/bun.js/event_loop.zig @@ -28,7 +28,7 @@ pub fn ConcurrentPromiseTask(comptime Context: type) type { return struct { const This = @This(); ctx: *Context, - task: WorkPoolTask = .{ .callback = runFromThreadPool }, + task: WorkPoolTask = .{ .callback = &runFromThreadPool }, event_loop: *JSC.EventLoop, allocator: std.mem.Allocator, promise: JSC.JSPromise.Strong = .{}, @@ -41,7 +41,7 @@ pub fn ConcurrentPromiseTask(comptime Context: type) type { pub fn createOnJSThread(allocator: std.mem.Allocator, globalThis: *JSGlobalObject, value: *Context) !*This { var this = try allocator.create(This); this.* = .{ - .event_loop = VirtualMachine.vm.event_loop, + .event_loop = VirtualMachine.get().event_loop, .ctx = value, .allocator = allocator, .globalThis = globalThis, @@ -86,7 +86,7 @@ pub fn IOTask(comptime Context: type) type { return struct { const This = @This(); ctx: *Context, - task: NetworkThread.Task = .{ .callback = runFromThreadPool }, + task: NetworkThread.Task = .{ .callback = &runFromThreadPool }, event_loop: *JSC.EventLoop, allocator: std.mem.Allocator, globalThis: *JSGlobalObject, @@ -140,7 +140,7 @@ pub fn IOTask(comptime Context: type) type { pub const AnyTask = struct { ctx: ?*anyopaque, - callback: fn (*anyopaque) void, + callback: *const (fn (*anyopaque) void), pub fn run(this: *AnyTask) void { @setRuntimeSafety(false); @@ -586,7 +586,7 @@ pub const EventLoop = struct { var task = Task.from(timer.as(*anyopaque)); timer.deinit(); - JSC.VirtualMachine.vm.enqueueTask(task); + JSC.VirtualMachine.get().enqueueTask(task); } pub fn ensureWaker(this: *EventLoop) void { |