Commit 6d3a78b8dd5071dee68b6b6c10f79b7b2f34d5e9 | zig

author	Andrew Kelley <andrew@ziglang.org> 2024-06-20 20:57:46-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-06-30 13:54:02-07:00
log	6d3a78b8dd5071dee68b6b6c10f79b7b2f34d5e9
tree	157dd1e199e92082437f424606d92c986b8ce83a
parent	e51fd6728fcc4dd93e3bd1ddb2e4ca96a8082b12

std.Thread.Pool: fix connection

TCP cannot be used with UNIX domain sockets

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

lib
- std
  - Thread
    Pool.zig

lib/std/Thread/Pool.zig+24-9

 @@ -312,8 +312,8 @@ pub fn spawn(pool: *Pool, comptime func: anytype, args: anytype) void {
 fn worker(pool: *Pool) void {
     var trash_buf: [1]u8 = undefined;
-    var connection: ?std.net.Stream = null;
+    var connection: ?std.posix.fd_t = null;
-    defer if (connection) |stream| stream.close();
+    defer if (connection) |fd| std.posix.close(fd);
     pool.mutex.lock();
     defer pool.mutex.unlock();
 @@ -326,11 +326,26 @@ fn worker(pool: *Pool) void {
             if (connection == null) switch (pool.job_server_options) {
                 .abstain => {},
-                .connect, .host => |addr| {
+                .connect, .host => |addr| lock: {
-                    if (std.net.tcpConnectToAddress(addr)) |stream| {
+                    const sockfd = std.posix.socket(
-                        connection = stream;
+                        std.posix.AF.UNIX,
-                        _ = stream.readAll(&trash_buf) catch 1;
+                        std.posix.SOCK.STREAM | std.posix.SOCK.CLOEXEC,
-                    } else |_| {}
+                        0,
+                    ) catch |err| {
+                        std.log.debug("failed to make socket: {s}", .{@errorName(err)});
+                        break :lock;
+                    };
+                    connection = sockfd;
+                    std.posix.connect(sockfd, &addr.any, addr.getOsSockLen()) catch |err| {
+                        std.log.debug("failed to connect: {s}", .{@errorName(err)});
+                        break :lock;
+                    };
+                    _ = std.posix.read(sockfd, &trash_buf) catch |err| {
+                        std.log.debug("failed to read: {s}", .{@errorName(err)});
+                        break :lock;
+                    };
                 },
             };
 @@ -342,8 +357,8 @@ fn worker(pool: *Pool) void {
         if (pool.end_flag)
             break;
-        if (connection) |stream| {
+        if (connection) |fd| {
-            stream.close();
+            std.posix.close(fd);
             connection = null;
         }