From b631ea7d725a42954c577ea686ae711ef04f63e1 Mon Sep 17 00:00:00 2001 From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Date: Tue, 29 Nov 2022 02:42:56 -0800 Subject: import everything from "bun" where possible --- src/network_thread.zig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/network_thread.zig') diff --git a/src/network_thread.zig b/src/network_thread.zig index f48e94e5a..5590dafa8 100644 --- a/src/network_thread.zig +++ b/src/network_thread.zig @@ -1,15 +1,15 @@ -const ThreadPool = @import("thread_pool"); +const ThreadPool = @import("bun").ThreadPool; pub const Batch = ThreadPool.Batch; pub const Task = ThreadPool.Task; const Node = ThreadPool.Node; pub const Completion = AsyncIO.Completion; const std = @import("std"); -pub const AsyncIO = @import("io"); -const Output = @import("./global.zig").Output; +pub const AsyncIO = @import("bun").AsyncIO; +const Output = @import("bun").Output; const IdentityContext = @import("./identity_context.zig").IdentityContext; const HTTP = @import("./http_client_async.zig"); const NetworkThread = @This(); -const Environment = @import("./global.zig").Environment; +const Environment = @import("bun").Environment; const Lock = @import("./lock.zig").Lock; const FIFO = @import("./io/fifo.zig").FIFO; @@ -26,9 +26,9 @@ pub var global: NetworkThread = undefined; pub var global_loaded: std.atomic.Atomic(u32) = std.atomic.Atomic(u32).init(0); const log = Output.scoped(.NetworkThread, true); -const Global = @import("./global.zig").Global; +const Global = @import("bun").Global; pub fn onStartIOThread(waker: AsyncIO.Waker) void { - NetworkThread.address_list_cached = NetworkThread.AddressListCache.init(@import("./global.zig").default_allocator); + NetworkThread.address_list_cached = NetworkThread.AddressListCache.init(@import("bun").default_allocator); AsyncIO.global = AsyncIO.init(1024, 0, waker) catch |err| { log: { if (comptime Environment.isLinux) { @@ -234,7 +234,7 @@ pub fn init() !void { const fd = try std.os.eventfd(0, std.os.linux.EFD.CLOEXEC | 0); global.waker = .{ .fd = fd }; } else if (comptime Environment.isMac) { - global.waker = try AsyncIO.Waker.init(@import("./global.zig").default_allocator); + global.waker = try AsyncIO.Waker.init(@import("bun").default_allocator); } else { @compileLog("TODO: Waker"); } -- cgit v1.2.3