diff --git a/src/buntime/bindings/GeneratedJS2Native.zig b/src/buntime/bindings/GeneratedJS2Native.zig index 00db177d7f..42613401d2 100644 --- a/src/buntime/bindings/GeneratedJS2Native.zig +++ b/src/buntime/bindings/GeneratedJS2Native.zig @@ -316,7 +316,7 @@ export fn JS2Zig___src_buntime_api_bun_socket_zig__jsSetSocketOptions(global: *j return @call(bun.callmod_inline, jsc.toJSHostFn(function.jsSetSocketOptions), .{ global, call_frame }); } export fn JS2Zig___src_buntime_event_loop_zig__getActiveTasks(global: *jsc.JSGlobalObject, call_frame: *jsc.CallFrame) callconv(jsc.conv) jsc.JSValue { - const function = @import("../event_loop.zig"); + const function = @import("../core/event_loop.zig"); return @call(bun.callmod_inline, jsc.toJSHostFn(function.getActiveTasks), .{ global, call_frame }); } export fn JS2Zig___src_install_hosted_git_info_zig__TestingAPIs_jsParseUrl(global: *jsc.JSGlobalObject, call_frame: *jsc.CallFrame) callconv(jsc.conv) jsc.JSValue { diff --git a/src/buntime/event_loop.zig b/src/buntime/core/event_loop.zig similarity index 99% rename from src/buntime/event_loop.zig rename to src/buntime/core/event_loop.zig index cd017e7fb3..bd26f9ad62 100644 --- a/src/buntime/event_loop.zig +++ b/src/buntime/core/event_loop.zig @@ -697,8 +697,8 @@ pub const EventLoopHandle = @import("./event_loop/EventLoopHandle.zig").EventLoo pub const EventLoopTask = @import("./event_loop/EventLoopHandle.zig").EventLoopTask; pub const EventLoopTaskPtr = @import("./event_loop/EventLoopHandle.zig").EventLoopTaskPtr; -pub const WorkPool = @import("../work_pool.zig").WorkPool; -pub const WorkPoolTask = @import("../work_pool.zig").Task; +pub const WorkPool = @import("../../work_pool.zig").WorkPool; +pub const WorkPoolTask = @import("../../work_pool.zig").Task; const std = @import("std"); const tickQueueWithCount = @import("./event_loop/Task.zig").tickQueueWithCount; diff --git a/src/buntime/event_loop/AnyEventLoop.zig b/src/buntime/core/event_loop/AnyEventLoop.zig similarity index 100% rename from src/buntime/event_loop/AnyEventLoop.zig rename to src/buntime/core/event_loop/AnyEventLoop.zig diff --git a/src/buntime/event_loop/AnyTask.zig b/src/buntime/core/event_loop/AnyTask.zig similarity index 100% rename from src/buntime/event_loop/AnyTask.zig rename to src/buntime/core/event_loop/AnyTask.zig diff --git a/src/buntime/event_loop/AnyTaskWithExtraContext.zig b/src/buntime/core/event_loop/AnyTaskWithExtraContext.zig similarity index 100% rename from src/buntime/event_loop/AnyTaskWithExtraContext.zig rename to src/buntime/core/event_loop/AnyTaskWithExtraContext.zig diff --git a/src/buntime/event_loop/ConcurrentPromiseTask.zig b/src/buntime/core/event_loop/ConcurrentPromiseTask.zig similarity index 100% rename from src/buntime/event_loop/ConcurrentPromiseTask.zig rename to src/buntime/core/event_loop/ConcurrentPromiseTask.zig diff --git a/src/buntime/event_loop/ConcurrentTask.zig b/src/buntime/core/event_loop/ConcurrentTask.zig similarity index 100% rename from src/buntime/event_loop/ConcurrentTask.zig rename to src/buntime/core/event_loop/ConcurrentTask.zig diff --git a/src/buntime/event_loop/CppTask.zig b/src/buntime/core/event_loop/CppTask.zig similarity index 100% rename from src/buntime/event_loop/CppTask.zig rename to src/buntime/core/event_loop/CppTask.zig diff --git a/src/buntime/event_loop/DeferredTaskQueue.zig b/src/buntime/core/event_loop/DeferredTaskQueue.zig similarity index 100% rename from src/buntime/event_loop/DeferredTaskQueue.zig rename to src/buntime/core/event_loop/DeferredTaskQueue.zig diff --git a/src/buntime/event_loop/EventLoopHandle.zig b/src/buntime/core/event_loop/EventLoopHandle.zig similarity index 100% rename from src/buntime/event_loop/EventLoopHandle.zig rename to src/buntime/core/event_loop/EventLoopHandle.zig diff --git a/src/buntime/event_loop/GarbageCollectionController.zig b/src/buntime/core/event_loop/GarbageCollectionController.zig similarity index 100% rename from src/buntime/event_loop/GarbageCollectionController.zig rename to src/buntime/core/event_loop/GarbageCollectionController.zig diff --git a/src/buntime/event_loop/JSCScheduler.zig b/src/buntime/core/event_loop/JSCScheduler.zig similarity index 100% rename from src/buntime/event_loop/JSCScheduler.zig rename to src/buntime/core/event_loop/JSCScheduler.zig diff --git a/src/buntime/event_loop/ManagedTask.zig b/src/buntime/core/event_loop/ManagedTask.zig similarity index 100% rename from src/buntime/event_loop/ManagedTask.zig rename to src/buntime/core/event_loop/ManagedTask.zig diff --git a/src/buntime/event_loop/MiniEventLoop.zig b/src/buntime/core/event_loop/MiniEventLoop.zig similarity index 100% rename from src/buntime/event_loop/MiniEventLoop.zig rename to src/buntime/core/event_loop/MiniEventLoop.zig diff --git a/src/buntime/event_loop/PosixSignalHandle.zig b/src/buntime/core/event_loop/PosixSignalHandle.zig similarity index 100% rename from src/buntime/event_loop/PosixSignalHandle.zig rename to src/buntime/core/event_loop/PosixSignalHandle.zig diff --git a/src/buntime/event_loop/README.md b/src/buntime/core/event_loop/README.md similarity index 100% rename from src/buntime/event_loop/README.md rename to src/buntime/core/event_loop/README.md diff --git a/src/buntime/event_loop/SpawnSyncEventLoop.zig b/src/buntime/core/event_loop/SpawnSyncEventLoop.zig similarity index 100% rename from src/buntime/event_loop/SpawnSyncEventLoop.zig rename to src/buntime/core/event_loop/SpawnSyncEventLoop.zig diff --git a/src/buntime/event_loop/Task.zig b/src/buntime/core/event_loop/Task.zig similarity index 99% rename from src/buntime/event_loop/Task.zig rename to src/buntime/core/event_loop/Task.zig index 8571ff5e73..67695403c1 100644 --- a/src/buntime/event_loop/Task.zig +++ b/src/buntime/core/event_loop/Task.zig @@ -528,7 +528,7 @@ const ProcessWaiterThreadTask = if (Environment.isPosix) bun.spawn.process.Waite const log = bun.Output.scoped(.Task, .hidden); -const Fetch = @import("../web/fetch/fetch.zig"); +const Fetch = @import("../../web/fetch/fetch.zig"); const FetchTasklet = Fetch.FetchTasklet; const JSCScheduler = @import("./JSCScheduler.zig"); diff --git a/src/buntime/event_loop/WorkTask.zig b/src/buntime/core/event_loop/WorkTask.zig similarity index 100% rename from src/buntime/event_loop/WorkTask.zig rename to src/buntime/core/event_loop/WorkTask.zig diff --git a/src/buntime/jsc.zig b/src/buntime/jsc.zig index 0d9c3bf0f8..9a4e07323d 100644 --- a/src/buntime/jsc.zig +++ b/src/buntime/jsc.zig @@ -126,7 +126,7 @@ pub const js_property_iterator = @import("./bindings/JSPropertyIterator.zig"); pub const JSPropertyIterator = js_property_iterator.JSPropertyIterator; pub const JSPropertyIteratorOptions = js_property_iterator.JSPropertyIteratorOptions; -pub const EventLoop = @import("./event_loop.zig"); +pub const EventLoop = @import("./core/event_loop.zig"); pub const AbstractVM = EventLoop.AbstractVM; pub const AnyEventLoop = EventLoop.AnyEventLoop; pub const AnyTask = EventLoop.AnyTask; diff --git a/src/buntime/rare_data.zig b/src/buntime/rare_data.zig index 2f358c7222..dad56b956f 100644 --- a/src/buntime/rare_data.zig +++ b/src/buntime/rare_data.zig @@ -572,7 +572,7 @@ pub fn websocketDeflate(this: *RareData) *WebSocketDeflate.RareData { }; } -pub const SpawnSyncEventLoop = @import("./event_loop/SpawnSyncEventLoop.zig"); +pub const SpawnSyncEventLoop = @import("./core/event_loop/SpawnSyncEventLoop.zig"); pub fn spawnSyncEventLoop(this: *RareData, vm: *jsc.VirtualMachine) *SpawnSyncEventLoop { return this.#spawn_sync_event_loop.get() orelse brk: {