aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Dylan Conway <dylan.conway567@gmail.com> 2023-09-11 18:18:25 -0700
committerGravatar Dylan Conway <dylan.conway567@gmail.com> 2023-09-11 18:18:25 -0700
commit5884a5cec239fa118ca57ad1ef81f915bff32c15 (patch)
tree9fb4f89625b1882855c6e51b76c2f2d63662a486
parent00be978c3a6578085cb6c4aca4dd3a9ee30b85cb (diff)
downloadbun-5884a5cec239fa118ca57ad1ef81f915bff32c15.tar.gz
bun-5884a5cec239fa118ca57ad1ef81f915bff32c15.tar.zst
bun-5884a5cec239fa118ca57ad1ef81f915bff32c15.zip
make sure epoll is deleted
-rw-r--r--src/bun.js/base.zig2
-rw-r--r--src/bun.js/webcore/streams.zig7
2 files changed, 2 insertions, 7 deletions
diff --git a/src/bun.js/base.zig b/src/bun.js/base.zig
index e104d6e81..8f65cf42e 100644
--- a/src/bun.js/base.zig
+++ b/src/bun.js/base.zig
@@ -2310,7 +2310,7 @@ pub const FilePoll = struct {
return JSC.Maybe(void).success;
};
- if (comptime Environment.isMac) {
+ if (comptime !Environment.isLinux) {
if (this.flags.contains(.needs_rearm)) {
log("unregister: {s} ({d}) skipped due to needs_rearm", .{ @tagName(flag), fd });
this.flags.remove(.poll_process);
diff --git a/src/bun.js/webcore/streams.zig b/src/bun.js/webcore/streams.zig
index e3d0c6b8f..84ffccb45 100644
--- a/src/bun.js/webcore/streams.zig
+++ b/src/bun.js/webcore/streams.zig
@@ -3919,12 +3919,7 @@ pub const FIFO = struct {
}
}
- if (comptime Environment.isLinux) {
- if (available == 0) {
- std.debug.assert(this.poll_ref == null);
- return .pending;
- }
- } else if (available == std.math.maxInt(@TypeOf(available)) and this.poll_ref == null) {
+ if (available == std.math.maxInt(@TypeOf(available)) and this.poll_ref == null) {
// we don't know if it's readable or not
return switch (bun.isReadable(this.fd)) {
.hup => {