diff options
author | 2022-01-25 20:04:24 -0800 | |
---|---|---|
committer | 2022-01-25 20:04:24 -0800 | |
commit | bfa2bc67365f7382f0946f1804677e97cb9f6975 (patch) | |
tree | 6ff1b685a90a6f5b9f31d6754a41bb74e11f82d9 /src | |
parent | 354ed2880cd3b54c6a56d040fe7a8032ebe3aeb1 (diff) | |
download | bun-bfa2bc67365f7382f0946f1804677e97cb9f6975.tar.gz bun-bfa2bc67365f7382f0946f1804677e97cb9f6975.tar.zst bun-bfa2bc67365f7382f0946f1804677e97cb9f6975.zip |
merge
Diffstat (limited to 'src')
-rw-r--r-- | src/io/io_linux.zig | 2 | ||||
-rw-r--r-- | src/network_thread.zig | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/io/io_linux.zig b/src/io/io_linux.zig index 8e0a64f7d..eeb2352f8 100644 --- a/src/io/io_linux.zig +++ b/src/io/io_linux.zig @@ -1565,7 +1565,7 @@ const Syscall = struct { }; pub fn openSocket(family: u32, sock_type: u32, protocol: u32) !os.socket_t { - return Syscall.socket(family, sock_type | os.O.NONBLOCK | os.O.CLOEXEC, protocol); + return Syscall.socket(family, sock_type | os.O.NONBLOCK | os.SOCK.CLOEXEC, protocol); } pub var global: IO = undefined; diff --git a/src/network_thread.zig b/src/network_thread.zig index be5b84acb..0a39f574a 100644 --- a/src/network_thread.zig +++ b/src/network_thread.zig @@ -66,6 +66,7 @@ pub fn getAddressList(allocator: std.mem.Allocator, name: []const u8, port: u16) pub fn init() !void { if ((global_loaded.swap(1, .Monotonic)) == 1) return; + AsyncIO.global_loaded = true; global = NetworkThread{ .pool = ThreadPool.init(.{ .max_threads = 1, .stack_size = 64 * 1024 * 1024 }), |