Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/std/c/freebsd.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,14 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;

pub const sf_hdtr = extern struct {
headers: [*]iovec_const,
hdr_cnt: c_int,
trailers: [*]iovec_const,
trl_cnt: c_int,
};
pub extern "c" fn sendfile(fd: c_int, s: c_int, offset: u64, nbytes: usize, sf_hdtr: ?*sf_hdtr, sbytes: ?*u64, flags: c_int) c_int;

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to double check that the offset parameters here should be u64 instead of off_t.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think zig should support 32-bit off_t, in which case they are the same, but yeah probably still use off_t even if it must be u64.


pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int;
pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;

Expand Down
115 changes: 115 additions & 0 deletions lib/std/os.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -3111,6 +3111,121 @@ pub fn send(
return sendto(sockfd, buf, flags, null, 0);
}

pub const SendFileError = error{
/// There was an unspecified error while reading from infd.
InputOutput,

/// There was insufficient resources for processing.
SystemResources,

/// The value provided for count overflows the maximum size of either
/// infd or outfd.
Overflow,

/// Offset was provided, but infd is not seekable.
Unseekable,

/// The outfd is marked nonblocking and the requested operation would block, and
/// there is no global event loop configured.
WouldBlock,
} || WriteError || UnexpectedError;

pub const sf_hdtr = struct {
headers: []iovec_const,
trailers: []iovec_const,
};

/// Transfer data between file descriptors.
///
/// The `sendfile` call copies `count` bytes from one file descriptor to another within the kernel. This can
/// be more performant than transferring data from the kernel to user space and back, such as with
/// `read` and `write` calls.
///
/// The `infd` should be a file descriptor opened for reading, and `outfd` should be a file descriptor
/// opened for writing. Copying will begin at `offset`, if not null, which will be updated to reflect
/// the number of bytes read. If `offset` is null, the copying will begin at the current seek position,
/// and the file position will be updated.
pub fn sendfile(infd: fd_t, outfd: fd_t, offset: u64, count: usize, optional_hdtr: ?*const sf_hdtr, flags: u32) SendFileError!usize {
// XXX: check if offset is > length of file, return 0 bytes written
// XXX: document systems where headers are sent atomically.
// XXX: compute new offset on EINTR/EAGAIN
var rc: usize = undefined;
var err: usize = undefined;
if (builtin.os == .linux) {
while (true) {
try lseek_SET(infd, offset);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.headers);
}

rc = system.sendfile(outfd, infd, null, count);
err = errno(rc);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.trailers);
}

switch (err) {
0 => return @intCast(usize, rc),
else => return unexpectedErrno(err),

EBADF => unreachable,
EINVAL => unreachable,
EFAULT => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EIO => return error.InputOutput,
ENOMEM => return error.SystemResources,
EOVERFLOW => return error.Overflow,
ESPIPE => return error.Unseekable,
}
}
} else if (builtin.os == .freebsd) {
while (true) {
var rcount: u64 = 0;
var hdtr: std.c.sf_hdtr = undefined;
if (optional_hdtr) |h| {
hdtr = std.c.sf_hdtr{
.headers = h.headers.ptr,
.hdr_cnt = @intCast(c_int, h.headers.len),
.trailers = h.trailers.ptr,
.trl_cnt = @intCast(c_int, h.trailers.len),
};
}
err = errno(system.sendfile(infd, outfd, offset, count, &hdtr, &rcount, @intCast(c_int, flags)));
switch (err) {
0 => return @intCast(usize, rcount),
else => return unexpectedErrno(err),

EBADF => unreachable,
EFAULT => unreachable,
EINVAL => unreachable,
ENOTCAPABLE => unreachable,
ENOTCONN => unreachable,
ENOTSOCK => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EBUSY => return error.DeviceBusy,
EINTR => continue,
EIO => return error.InputOutput,
ENOBUFS => return error.SystemResources,
EPIPE => return error.BrokenPipe,
}
}
} else {
@compileError("sendfile unimplemented for this target");
}
}

pub const PollError = error{
/// The kernel had no space to allocate file descriptor tables.
SystemResources,
Expand Down
8 changes: 8 additions & 0 deletions lib/std/os/linux.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -846,6 +846,14 @@ pub fn sendto(fd: i32, buf: [*]const u8, len: usize, flags: u32, addr: ?*const s
return syscall6(SYS_sendto, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen));
}

pub fn sendfile(outfd: i32, infd: i32, offset: ?*u64, count: usize) usize {
if (@hasDecl(@This(), "SYS_sendfile64")) {
return syscall4(SYS_sendfile64, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
} else {
return syscall4(SYS_sendfile, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
}
}

pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usize {
if (builtin.arch == .i386) {
return socketcall(SC_socketpair, &[4]usize{ @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]) });
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
std: implement sendfile on linux by terinjokes · Pull Request #4131 · ziglang/zig · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/std/c/freebsd.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,14 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;

pub const sf_hdtr = extern struct {
headers: [*]iovec_const,
hdr_cnt: c_int,
trailers: [*]iovec_const,
trl_cnt: c_int,
};
pub extern "c" fn sendfile(fd: c_int, s: c_int, offset: u64, nbytes: usize, sf_hdtr: ?*sf_hdtr, sbytes: ?*u64, flags: c_int) c_int;

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to double check that the offset parameters here should be u64 instead of off_t.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think zig should support 32-bit off_t, in which case they are the same, but yeah probably still use off_t even if it must be u64.


pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int;
pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;

Expand Down
115 changes: 115 additions & 0 deletions lib/std/os.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -3111,6 +3111,121 @@ pub fn send(
return sendto(sockfd, buf, flags, null, 0);
}

pub const SendFileError = error{
/// There was an unspecified error while reading from infd.
InputOutput,

/// There was insufficient resources for processing.
SystemResources,

/// The value provided for count overflows the maximum size of either
/// infd or outfd.
Overflow,

/// Offset was provided, but infd is not seekable.
Unseekable,

/// The outfd is marked nonblocking and the requested operation would block, and
/// there is no global event loop configured.
WouldBlock,
} || WriteError || UnexpectedError;

pub const sf_hdtr = struct {
headers: []iovec_const,
trailers: []iovec_const,
};

/// Transfer data between file descriptors.
///
/// The `sendfile` call copies `count` bytes from one file descriptor to another within the kernel. This can
/// be more performant than transferring data from the kernel to user space and back, such as with
/// `read` and `write` calls.
///
/// The `infd` should be a file descriptor opened for reading, and `outfd` should be a file descriptor
/// opened for writing. Copying will begin at `offset`, if not null, which will be updated to reflect
/// the number of bytes read. If `offset` is null, the copying will begin at the current seek position,
/// and the file position will be updated.
pub fn sendfile(infd: fd_t, outfd: fd_t, offset: u64, count: usize, optional_hdtr: ?*const sf_hdtr, flags: u32) SendFileError!usize {
// XXX: check if offset is > length of file, return 0 bytes written
// XXX: document systems where headers are sent atomically.
// XXX: compute new offset on EINTR/EAGAIN
var rc: usize = undefined;
var err: usize = undefined;
if (builtin.os == .linux) {
while (true) {
try lseek_SET(infd, offset);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.headers);
}

rc = system.sendfile(outfd, infd, null, count);
err = errno(rc);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.trailers);
}

switch (err) {
0 => return @intCast(usize, rc),
else => return unexpectedErrno(err),

EBADF => unreachable,
EINVAL => unreachable,
EFAULT => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EIO => return error.InputOutput,
ENOMEM => return error.SystemResources,
EOVERFLOW => return error.Overflow,
ESPIPE => return error.Unseekable,
}
}
} else if (builtin.os == .freebsd) {
while (true) {
var rcount: u64 = 0;
var hdtr: std.c.sf_hdtr = undefined;
if (optional_hdtr) |h| {
hdtr = std.c.sf_hdtr{
.headers = h.headers.ptr,
.hdr_cnt = @intCast(c_int, h.headers.len),
.trailers = h.trailers.ptr,
.trl_cnt = @intCast(c_int, h.trailers.len),
};
}
err = errno(system.sendfile(infd, outfd, offset, count, &hdtr, &rcount, @intCast(c_int, flags)));
switch (err) {
0 => return @intCast(usize, rcount),
else => return unexpectedErrno(err),

EBADF => unreachable,
EFAULT => unreachable,
EINVAL => unreachable,
ENOTCAPABLE => unreachable,
ENOTCONN => unreachable,
ENOTSOCK => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EBUSY => return error.DeviceBusy,
EINTR => continue,
EIO => return error.InputOutput,
ENOBUFS => return error.SystemResources,
EPIPE => return error.BrokenPipe,
}
}
} else {
@compileError("sendfile unimplemented for this target");
}
}

pub const PollError = error{
/// The kernel had no space to allocate file descriptor tables.
SystemResources,
Expand Down
8 changes: 8 additions & 0 deletions lib/std/os/linux.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -846,6 +846,14 @@ pub fn sendto(fd: i32, buf: [*]const u8, len: usize, flags: u32, addr: ?*const s
return syscall6(SYS_sendto, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen));
}

pub fn sendfile(outfd: i32, infd: i32, offset: ?*u64, count: usize) usize {
if (@hasDecl(@This(), "SYS_sendfile64")) {
return syscall4(SYS_sendfile64, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
} else {
return syscall4(SYS_sendfile, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
}
}

pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usize {
if (builtin.arch == .i386) {
return socketcall(SC_socketpair, &[4]usize{ @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]) });
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' std: implement sendfile on linux by terinjokes · Pull Request #4131 · ziglang/zig · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/std/c/freebsd.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,14 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;

pub const sf_hdtr = extern struct {
headers: [*]iovec_const,
hdr_cnt: c_int,
trailers: [*]iovec_const,
trl_cnt: c_int,
};
pub extern "c" fn sendfile(fd: c_int, s: c_int, offset: u64, nbytes: usize, sf_hdtr: ?*sf_hdtr, sbytes: ?*u64, flags: c_int) c_int;

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to double check that the offset parameters here should be u64 instead of off_t.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think zig should support 32-bit off_t, in which case they are the same, but yeah probably still use off_t even if it must be u64.


pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int;
pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;

Expand Down
115 changes: 115 additions & 0 deletions lib/std/os.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -3111,6 +3111,121 @@ pub fn send(
return sendto(sockfd, buf, flags, null, 0);
}

pub const SendFileError = error{
/// There was an unspecified error while reading from infd.
InputOutput,

/// There was insufficient resources for processing.
SystemResources,

/// The value provided for count overflows the maximum size of either
/// infd or outfd.
Overflow,

/// Offset was provided, but infd is not seekable.
Unseekable,

/// The outfd is marked nonblocking and the requested operation would block, and
/// there is no global event loop configured.
WouldBlock,
} || WriteError || UnexpectedError;

pub const sf_hdtr = struct {
headers: []iovec_const,
trailers: []iovec_const,
};

/// Transfer data between file descriptors.
///
/// The `sendfile` call copies `count` bytes from one file descriptor to another within the kernel. This can
/// be more performant than transferring data from the kernel to user space and back, such as with
/// `read` and `write` calls.
///
/// The `infd` should be a file descriptor opened for reading, and `outfd` should be a file descriptor
/// opened for writing. Copying will begin at `offset`, if not null, which will be updated to reflect
/// the number of bytes read. If `offset` is null, the copying will begin at the current seek position,
/// and the file position will be updated.
pub fn sendfile(infd: fd_t, outfd: fd_t, offset: u64, count: usize, optional_hdtr: ?*const sf_hdtr, flags: u32) SendFileError!usize {
// XXX: check if offset is > length of file, return 0 bytes written
// XXX: document systems where headers are sent atomically.
// XXX: compute new offset on EINTR/EAGAIN
var rc: usize = undefined;
var err: usize = undefined;
if (builtin.os == .linux) {
while (true) {
try lseek_SET(infd, offset);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.headers);
}

rc = system.sendfile(outfd, infd, null, count);
err = errno(rc);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.trailers);
}

switch (err) {
0 => return @intCast(usize, rc),
else => return unexpectedErrno(err),

EBADF => unreachable,
EINVAL => unreachable,
EFAULT => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EIO => return error.InputOutput,
ENOMEM => return error.SystemResources,
EOVERFLOW => return error.Overflow,
ESPIPE => return error.Unseekable,
}
}
} else if (builtin.os == .freebsd) {
while (true) {
var rcount: u64 = 0;
var hdtr: std.c.sf_hdtr = undefined;
if (optional_hdtr) |h| {
hdtr = std.c.sf_hdtr{
.headers = h.headers.ptr,
.hdr_cnt = @intCast(c_int, h.headers.len),
.trailers = h.trailers.ptr,
.trl_cnt = @intCast(c_int, h.trailers.len),
};
}
err = errno(system.sendfile(infd, outfd, offset, count, &hdtr, &rcount, @intCast(c_int, flags)));
switch (err) {
0 => return @intCast(usize, rcount),
else => return unexpectedErrno(err),

EBADF => unreachable,
EFAULT => unreachable,
EINVAL => unreachable,
ENOTCAPABLE => unreachable,
ENOTCONN => unreachable,
ENOTSOCK => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EBUSY => return error.DeviceBusy,
EINTR => continue,
EIO => return error.InputOutput,
ENOBUFS => return error.SystemResources,
EPIPE => return error.BrokenPipe,
}
}
} else {
@compileError("sendfile unimplemented for this target");
}
}

pub const PollError = error{
/// The kernel had no space to allocate file descriptor tables.
SystemResources,
Expand Down
8 changes: 8 additions & 0 deletions lib/std/os/linux.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -846,6 +846,14 @@ pub fn sendto(fd: i32, buf: [*]const u8, len: usize, flags: u32, addr: ?*const s
return syscall6(SYS_sendto, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen));
}

pub fn sendfile(outfd: i32, infd: i32, offset: ?*u64, count: usize) usize {
if (@hasDecl(@This(), "SYS_sendfile64")) {
return syscall4(SYS_sendfile64, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
} else {
return syscall4(SYS_sendfile, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
}
}

pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usize {
if (builtin.arch == .i386) {
return socketcall(SC_socketpair, &[4]usize{ @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]) });
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' std: implement sendfile on linux by terinjokes · Pull Request #4131 · ziglang/zig · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/std/c/freebsd.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,14 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;

pub const sf_hdtr = extern struct {
headers: [*]iovec_const,
hdr_cnt: c_int,
trailers: [*]iovec_const,
trl_cnt: c_int,
};
pub extern "c" fn sendfile(fd: c_int, s: c_int, offset: u64, nbytes: usize, sf_hdtr: ?*sf_hdtr, sbytes: ?*u64, flags: c_int) c_int;

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to double check that the offset parameters here should be u64 instead of off_t.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think zig should support 32-bit off_t, in which case they are the same, but yeah probably still use off_t even if it must be u64.


pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int;
pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;

Expand Down
115 changes: 115 additions & 0 deletions lib/std/os.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -3111,6 +3111,121 @@ pub fn send(
return sendto(sockfd, buf, flags, null, 0);
}

pub const SendFileError = error{
/// There was an unspecified error while reading from infd.
InputOutput,

/// There was insufficient resources for processing.
SystemResources,

/// The value provided for count overflows the maximum size of either
/// infd or outfd.
Overflow,

/// Offset was provided, but infd is not seekable.
Unseekable,

/// The outfd is marked nonblocking and the requested operation would block, and
/// there is no global event loop configured.
WouldBlock,
} || WriteError || UnexpectedError;

pub const sf_hdtr = struct {
headers: []iovec_const,
trailers: []iovec_const,
};

/// Transfer data between file descriptors.
///
/// The `sendfile` call copies `count` bytes from one file descriptor to another within the kernel. This can
/// be more performant than transferring data from the kernel to user space and back, such as with
/// `read` and `write` calls.
///
/// The `infd` should be a file descriptor opened for reading, and `outfd` should be a file descriptor
/// opened for writing. Copying will begin at `offset`, if not null, which will be updated to reflect
/// the number of bytes read. If `offset` is null, the copying will begin at the current seek position,
/// and the file position will be updated.
pub fn sendfile(infd: fd_t, outfd: fd_t, offset: u64, count: usize, optional_hdtr: ?*const sf_hdtr, flags: u32) SendFileError!usize {
// XXX: check if offset is > length of file, return 0 bytes written
// XXX: document systems where headers are sent atomically.
// XXX: compute new offset on EINTR/EAGAIN
var rc: usize = undefined;
var err: usize = undefined;
if (builtin.os == .linux) {
while (true) {
try lseek_SET(infd, offset);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.headers);
}

rc = system.sendfile(outfd, infd, null, count);
err = errno(rc);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.trailers);
}

switch (err) {
0 => return @intCast(usize, rc),
else => return unexpectedErrno(err),

EBADF => unreachable,
EINVAL => unreachable,
EFAULT => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EIO => return error.InputOutput,
ENOMEM => return error.SystemResources,
EOVERFLOW => return error.Overflow,
ESPIPE => return error.Unseekable,
}
}
} else if (builtin.os == .freebsd) {
while (true) {
var rcount: u64 = 0;
var hdtr: std.c.sf_hdtr = undefined;
if (optional_hdtr) |h| {
hdtr = std.c.sf_hdtr{
.headers = h.headers.ptr,
.hdr_cnt = @intCast(c_int, h.headers.len),
.trailers = h.trailers.ptr,
.trl_cnt = @intCast(c_int, h.trailers.len),
};
}
err = errno(system.sendfile(infd, outfd, offset, count, &hdtr, &rcount, @intCast(c_int, flags)));
switch (err) {
0 => return @intCast(usize, rcount),
else => return unexpectedErrno(err),

EBADF => unreachable,
EFAULT => unreachable,
EINVAL => unreachable,
ENOTCAPABLE => unreachable,
ENOTCONN => unreachable,
ENOTSOCK => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EBUSY => return error.DeviceBusy,
EINTR => continue,
EIO => return error.InputOutput,
ENOBUFS => return error.SystemResources,
EPIPE => return error.BrokenPipe,
}
}
} else {
@compileError("sendfile unimplemented for this target");
}
}

pub const PollError = error{
/// The kernel had no space to allocate file descriptor tables.
SystemResources,
Expand Down
8 changes: 8 additions & 0 deletions lib/std/os/linux.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -846,6 +846,14 @@ pub fn sendto(fd: i32, buf: [*]const u8, len: usize, flags: u32, addr: ?*const s
return syscall6(SYS_sendto, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen));
}

pub fn sendfile(outfd: i32, infd: i32, offset: ?*u64, count: usize) usize {
if (@hasDecl(@This(), "SYS_sendfile64")) {
return syscall4(SYS_sendfile64, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
} else {
return syscall4(SYS_sendfile, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
}
}

pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usize {
if (builtin.arch == .i386) {
return socketcall(SC_socketpair, &[4]usize{ @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]) });
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' std: implement sendfile on linux by terinjokes · Pull Request #4131 · ziglang/zig · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/std/c/freebsd.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,14 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;

pub const sf_hdtr = extern struct {
headers: [*]iovec_const,
hdr_cnt: c_int,
trailers: [*]iovec_const,
trl_cnt: c_int,
};
pub extern "c" fn sendfile(fd: c_int, s: c_int, offset: u64, nbytes: usize, sf_hdtr: ?*sf_hdtr, sbytes: ?*u64, flags: c_int) c_int;

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to double check that the offset parameters here should be u64 instead of off_t.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think zig should support 32-bit off_t, in which case they are the same, but yeah probably still use off_t even if it must be u64.


pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int;
pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;

Expand Down
115 changes: 115 additions & 0 deletions lib/std/os.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -3111,6 +3111,121 @@ pub fn send(
return sendto(sockfd, buf, flags, null, 0);
}

pub const SendFileError = error{
/// There was an unspecified error while reading from infd.
InputOutput,

/// There was insufficient resources for processing.
SystemResources,

/// The value provided for count overflows the maximum size of either
/// infd or outfd.
Overflow,

/// Offset was provided, but infd is not seekable.
Unseekable,

/// The outfd is marked nonblocking and the requested operation would block, and
/// there is no global event loop configured.
WouldBlock,
} || WriteError || UnexpectedError;

pub const sf_hdtr = struct {
headers: []iovec_const,
trailers: []iovec_const,
};

/// Transfer data between file descriptors.
///
/// The `sendfile` call copies `count` bytes from one file descriptor to another within the kernel. This can
/// be more performant than transferring data from the kernel to user space and back, such as with
/// `read` and `write` calls.
///
/// The `infd` should be a file descriptor opened for reading, and `outfd` should be a file descriptor
/// opened for writing. Copying will begin at `offset`, if not null, which will be updated to reflect
/// the number of bytes read. If `offset` is null, the copying will begin at the current seek position,
/// and the file position will be updated.
pub fn sendfile(infd: fd_t, outfd: fd_t, offset: u64, count: usize, optional_hdtr: ?*const sf_hdtr, flags: u32) SendFileError!usize {
// XXX: check if offset is > length of file, return 0 bytes written
// XXX: document systems where headers are sent atomically.
// XXX: compute new offset on EINTR/EAGAIN
var rc: usize = undefined;
var err: usize = undefined;
if (builtin.os == .linux) {
while (true) {
try lseek_SET(infd, offset);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.headers);
}

rc = system.sendfile(outfd, infd, null, count);
err = errno(rc);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.trailers);
}

switch (err) {
0 => return @intCast(usize, rc),
else => return unexpectedErrno(err),

EBADF => unreachable,
EINVAL => unreachable,
EFAULT => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EIO => return error.InputOutput,
ENOMEM => return error.SystemResources,
EOVERFLOW => return error.Overflow,
ESPIPE => return error.Unseekable,
}
}
} else if (builtin.os == .freebsd) {
while (true) {
var rcount: u64 = 0;
var hdtr: std.c.sf_hdtr = undefined;
if (optional_hdtr) |h| {
hdtr = std.c.sf_hdtr{
.headers = h.headers.ptr,
.hdr_cnt = @intCast(c_int, h.headers.len),
.trailers = h.trailers.ptr,
.trl_cnt = @intCast(c_int, h.trailers.len),
};
}
err = errno(system.sendfile(infd, outfd, offset, count, &hdtr, &rcount, @intCast(c_int, flags)));
switch (err) {
0 => return @intCast(usize, rcount),
else => return unexpectedErrno(err),

EBADF => unreachable,
EFAULT => unreachable,
EINVAL => unreachable,
ENOTCAPABLE => unreachable,
ENOTCONN => unreachable,
ENOTSOCK => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EBUSY => return error.DeviceBusy,
EINTR => continue,
EIO => return error.InputOutput,
ENOBUFS => return error.SystemResources,
EPIPE => return error.BrokenPipe,
}
}
} else {
@compileError("sendfile unimplemented for this target");
}
}

pub const PollError = error{
/// The kernel had no space to allocate file descriptor tables.
SystemResources,
Expand Down
8 changes: 8 additions & 0 deletions lib/std/os/linux.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -846,6 +846,14 @@ pub fn sendto(fd: i32, buf: [*]const u8, len: usize, flags: u32, addr: ?*const s
return syscall6(SYS_sendto, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen));
}

pub fn sendfile(outfd: i32, infd: i32, offset: ?*u64, count: usize) usize {
if (@hasDecl(@This(), "SYS_sendfile64")) {
return syscall4(SYS_sendfile64, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
} else {
return syscall4(SYS_sendfile, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
}
}

pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usize {
if (builtin.arch == .i386) {
return socketcall(SC_socketpair, &[4]usize{ @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]) });
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' std: implement sendfile on linux by terinjokes · Pull Request #4131 · ziglang/zig · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/std/c/freebsd.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,14 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;

pub const sf_hdtr = extern struct {
headers: [*]iovec_const,
hdr_cnt: c_int,
trailers: [*]iovec_const,
trl_cnt: c_int,
};
pub extern "c" fn sendfile(fd: c_int, s: c_int, offset: u64, nbytes: usize, sf_hdtr: ?*sf_hdtr, sbytes: ?*u64, flags: c_int) c_int;

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to double check that the offset parameters here should be u64 instead of off_t.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think zig should support 32-bit off_t, in which case they are the same, but yeah probably still use off_t even if it must be u64.


pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int;
pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;

Expand Down
115 changes: 115 additions & 0 deletions lib/std/os.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -3111,6 +3111,121 @@ pub fn send(
return sendto(sockfd, buf, flags, null, 0);
}

pub const SendFileError = error{
/// There was an unspecified error while reading from infd.
InputOutput,

/// There was insufficient resources for processing.
SystemResources,

/// The value provided for count overflows the maximum size of either
/// infd or outfd.
Overflow,

/// Offset was provided, but infd is not seekable.
Unseekable,

/// The outfd is marked nonblocking and the requested operation would block, and
/// there is no global event loop configured.
WouldBlock,
} || WriteError || UnexpectedError;

pub const sf_hdtr = struct {
headers: []iovec_const,
trailers: []iovec_const,
};

/// Transfer data between file descriptors.
///
/// The `sendfile` call copies `count` bytes from one file descriptor to another within the kernel. This can
/// be more performant than transferring data from the kernel to user space and back, such as with
/// `read` and `write` calls.
///
/// The `infd` should be a file descriptor opened for reading, and `outfd` should be a file descriptor
/// opened for writing. Copying will begin at `offset`, if not null, which will be updated to reflect
/// the number of bytes read. If `offset` is null, the copying will begin at the current seek position,
/// and the file position will be updated.
pub fn sendfile(infd: fd_t, outfd: fd_t, offset: u64, count: usize, optional_hdtr: ?*const sf_hdtr, flags: u32) SendFileError!usize {
// XXX: check if offset is > length of file, return 0 bytes written
// XXX: document systems where headers are sent atomically.
// XXX: compute new offset on EINTR/EAGAIN
var rc: usize = undefined;
var err: usize = undefined;
if (builtin.os == .linux) {
while (true) {
try lseek_SET(infd, offset);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.headers);
}

rc = system.sendfile(outfd, infd, null, count);
err = errno(rc);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.trailers);
}

switch (err) {
0 => return @intCast(usize, rc),
else => return unexpectedErrno(err),

EBADF => unreachable,
EINVAL => unreachable,
EFAULT => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EIO => return error.InputOutput,
ENOMEM => return error.SystemResources,
EOVERFLOW => return error.Overflow,
ESPIPE => return error.Unseekable,
}
}
} else if (builtin.os == .freebsd) {
while (true) {
var rcount: u64 = 0;
var hdtr: std.c.sf_hdtr = undefined;
if (optional_hdtr) |h| {
hdtr = std.c.sf_hdtr{
.headers = h.headers.ptr,
.hdr_cnt = @intCast(c_int, h.headers.len),
.trailers = h.trailers.ptr,
.trl_cnt = @intCast(c_int, h.trailers.len),
};
}
err = errno(system.sendfile(infd, outfd, offset, count, &hdtr, &rcount, @intCast(c_int, flags)));
switch (err) {
0 => return @intCast(usize, rcount),
else => return unexpectedErrno(err),

EBADF => unreachable,
EFAULT => unreachable,
EINVAL => unreachable,
ENOTCAPABLE => unreachable,
ENOTCONN => unreachable,
ENOTSOCK => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EBUSY => return error.DeviceBusy,
EINTR => continue,
EIO => return error.InputOutput,
ENOBUFS => return error.SystemResources,
EPIPE => return error.BrokenPipe,
}
}
} else {
@compileError("sendfile unimplemented for this target");
}
}

pub const PollError = error{
/// The kernel had no space to allocate file descriptor tables.
SystemResources,
Expand Down
8 changes: 8 additions & 0 deletions lib/std/os/linux.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -846,6 +846,14 @@ pub fn sendto(fd: i32, buf: [*]const u8, len: usize, flags: u32, addr: ?*const s
return syscall6(SYS_sendto, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen));
}

pub fn sendfile(outfd: i32, infd: i32, offset: ?*u64, count: usize) usize {
if (@hasDecl(@This(), "SYS_sendfile64")) {
return syscall4(SYS_sendfile64, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
} else {
return syscall4(SYS_sendfile, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
}
}

pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usize {
if (builtin.arch == .i386) {
return socketcall(SC_socketpair, &[4]usize{ @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]) });
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' std: implement sendfile on linux by terinjokes · Pull Request #4131 · ziglang/zig · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/std/c/freebsd.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,14 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;

pub const sf_hdtr = extern struct {
headers: [*]iovec_const,
hdr_cnt: c_int,
trailers: [*]iovec_const,
trl_cnt: c_int,
};
pub extern "c" fn sendfile(fd: c_int, s: c_int, offset: u64, nbytes: usize, sf_hdtr: ?*sf_hdtr, sbytes: ?*u64, flags: c_int) c_int;

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to double check that the offset parameters here should be u64 instead of off_t.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think zig should support 32-bit off_t, in which case they are the same, but yeah probably still use off_t even if it must be u64.


pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int;
pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;

Expand Down
115 changes: 115 additions & 0 deletions lib/std/os.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -3111,6 +3111,121 @@ pub fn send(
return sendto(sockfd, buf, flags, null, 0);
}

pub const SendFileError = error{
/// There was an unspecified error while reading from infd.
InputOutput,

/// There was insufficient resources for processing.
SystemResources,

/// The value provided for count overflows the maximum size of either
/// infd or outfd.
Overflow,

/// Offset was provided, but infd is not seekable.
Unseekable,

/// The outfd is marked nonblocking and the requested operation would block, and
/// there is no global event loop configured.
WouldBlock,
} || WriteError || UnexpectedError;

pub const sf_hdtr = struct {
headers: []iovec_const,
trailers: []iovec_const,
};

/// Transfer data between file descriptors.
///
/// The `sendfile` call copies `count` bytes from one file descriptor to another within the kernel. This can
/// be more performant than transferring data from the kernel to user space and back, such as with
/// `read` and `write` calls.
///
/// The `infd` should be a file descriptor opened for reading, and `outfd` should be a file descriptor
/// opened for writing. Copying will begin at `offset`, if not null, which will be updated to reflect
/// the number of bytes read. If `offset` is null, the copying will begin at the current seek position,
/// and the file position will be updated.
pub fn sendfile(infd: fd_t, outfd: fd_t, offset: u64, count: usize, optional_hdtr: ?*const sf_hdtr, flags: u32) SendFileError!usize {
// XXX: check if offset is > length of file, return 0 bytes written
// XXX: document systems where headers are sent atomically.
// XXX: compute new offset on EINTR/EAGAIN
var rc: usize = undefined;
var err: usize = undefined;
if (builtin.os == .linux) {
while (true) {
try lseek_SET(infd, offset);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.headers);
}

rc = system.sendfile(outfd, infd, null, count);
err = errno(rc);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.trailers);
}

switch (err) {
0 => return @intCast(usize, rc),
else => return unexpectedErrno(err),

EBADF => unreachable,
EINVAL => unreachable,
EFAULT => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EIO => return error.InputOutput,
ENOMEM => return error.SystemResources,
EOVERFLOW => return error.Overflow,
ESPIPE => return error.Unseekable,
}
}
} else if (builtin.os == .freebsd) {
while (true) {
var rcount: u64 = 0;
var hdtr: std.c.sf_hdtr = undefined;
if (optional_hdtr) |h| {
hdtr = std.c.sf_hdtr{
.headers = h.headers.ptr,
.hdr_cnt = @intCast(c_int, h.headers.len),
.trailers = h.trailers.ptr,
.trl_cnt = @intCast(c_int, h.trailers.len),
};
}
err = errno(system.sendfile(infd, outfd, offset, count, &hdtr, &rcount, @intCast(c_int, flags)));
switch (err) {
0 => return @intCast(usize, rcount),
else => return unexpectedErrno(err),

EBADF => unreachable,
EFAULT => unreachable,
EINVAL => unreachable,
ENOTCAPABLE => unreachable,
ENOTCONN => unreachable,
ENOTSOCK => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EBUSY => return error.DeviceBusy,
EINTR => continue,
EIO => return error.InputOutput,
ENOBUFS => return error.SystemResources,
EPIPE => return error.BrokenPipe,
}
}
} else {
@compileError("sendfile unimplemented for this target");
}
}

pub const PollError = error{
/// The kernel had no space to allocate file descriptor tables.
SystemResources,
Expand Down
8 changes: 8 additions & 0 deletions lib/std/os/linux.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -846,6 +846,14 @@ pub fn sendto(fd: i32, buf: [*]const u8, len: usize, flags: u32, addr: ?*const s
return syscall6(SYS_sendto, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen));
}

pub fn sendfile(outfd: i32, infd: i32, offset: ?*u64, count: usize) usize {
if (@hasDecl(@This(), "SYS_sendfile64")) {
return syscall4(SYS_sendfile64, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
} else {
return syscall4(SYS_sendfile, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
}
}

pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usize {
if (builtin.arch == .i386) {
return socketcall(SC_socketpair, &[4]usize{ @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]) });
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); std: implement sendfile on linux by terinjokes · Pull Request #4131 · ziglang/zig · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/std/c/freebsd.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,14 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize;
pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int;
pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize;

pub const sf_hdtr = extern struct {
headers: [*]iovec_const,
hdr_cnt: c_int,
trailers: [*]iovec_const,
trl_cnt: c_int,
};
pub extern "c" fn sendfile(fd: c_int, s: c_int, offset: u64, nbytes: usize, sf_hdtr: ?*sf_hdtr, sbytes: ?*u64, flags: c_int) c_int;

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to double check that the offset parameters here should be u64 instead of off_t.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think zig should support 32-bit off_t, in which case they are the same, but yeah probably still use off_t even if it must be u64.


pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize, data: ?*c_void) c_int;
pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;

Expand Down
115 changes: 115 additions & 0 deletions lib/std/os.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -3111,6 +3111,121 @@ pub fn send(
return sendto(sockfd, buf, flags, null, 0);
}

pub const SendFileError = error{
/// There was an unspecified error while reading from infd.
InputOutput,

/// There was insufficient resources for processing.
SystemResources,

/// The value provided for count overflows the maximum size of either
/// infd or outfd.
Overflow,

/// Offset was provided, but infd is not seekable.
Unseekable,

/// The outfd is marked nonblocking and the requested operation would block, and
/// there is no global event loop configured.
WouldBlock,
} || WriteError || UnexpectedError;

pub const sf_hdtr = struct {
headers: []iovec_const,
trailers: []iovec_const,
};

/// Transfer data between file descriptors.
///
/// The `sendfile` call copies `count` bytes from one file descriptor to another within the kernel. This can
/// be more performant than transferring data from the kernel to user space and back, such as with
/// `read` and `write` calls.
///
/// The `infd` should be a file descriptor opened for reading, and `outfd` should be a file descriptor
/// opened for writing. Copying will begin at `offset`, if not null, which will be updated to reflect
/// the number of bytes read. If `offset` is null, the copying will begin at the current seek position,
/// and the file position will be updated.
pub fn sendfile(infd: fd_t, outfd: fd_t, offset: u64, count: usize, optional_hdtr: ?*const sf_hdtr, flags: u32) SendFileError!usize {
// XXX: check if offset is > length of file, return 0 bytes written
// XXX: document systems where headers are sent atomically.
// XXX: compute new offset on EINTR/EAGAIN
var rc: usize = undefined;
var err: usize = undefined;
if (builtin.os == .linux) {
while (true) {
try lseek_SET(infd, offset);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.headers);
}

rc = system.sendfile(outfd, infd, null, count);
err = errno(rc);

if (optional_hdtr) |hdtr| {
try writev(outfd, hdtr.trailers);
}

switch (err) {
0 => return @intCast(usize, rc),
else => return unexpectedErrno(err),

EBADF => unreachable,
EINVAL => unreachable,
EFAULT => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EIO => return error.InputOutput,
ENOMEM => return error.SystemResources,
EOVERFLOW => return error.Overflow,
ESPIPE => return error.Unseekable,
}
}
} else if (builtin.os == .freebsd) {
while (true) {
var rcount: u64 = 0;
var hdtr: std.c.sf_hdtr = undefined;
if (optional_hdtr) |h| {
hdtr = std.c.sf_hdtr{
.headers = h.headers.ptr,
.hdr_cnt = @intCast(c_int, h.headers.len),
.trailers = h.trailers.ptr,
.trl_cnt = @intCast(c_int, h.trailers.len),
};
}
err = errno(system.sendfile(infd, outfd, offset, count, &hdtr, &rcount, @intCast(c_int, flags)));
switch (err) {
0 => return @intCast(usize, rcount),
else => return unexpectedErrno(err),

EBADF => unreachable,
EFAULT => unreachable,
EINVAL => unreachable,
ENOTCAPABLE => unreachable,
ENOTCONN => unreachable,
ENOTSOCK => unreachable,
EAGAIN => if (std.event.Loop.instance) |loop| {
loop.waitUntilFdWritable(outfd);
continue;
} else {
return error.WouldBlock;
},
EBUSY => return error.DeviceBusy,
EINTR => continue,
EIO => return error.InputOutput,
ENOBUFS => return error.SystemResources,
EPIPE => return error.BrokenPipe,
}
}
} else {
@compileError("sendfile unimplemented for this target");
}
}

pub const PollError = error{
/// The kernel had no space to allocate file descriptor tables.
SystemResources,
Expand Down
8 changes: 8 additions & 0 deletions lib/std/os/linux.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -846,6 +846,14 @@ pub fn sendto(fd: i32, buf: [*]const u8, len: usize, flags: u32, addr: ?*const s
return syscall6(SYS_sendto, @bitCast(usize, @as(isize, fd)), @ptrToInt(buf), len, flags, @ptrToInt(addr), @intCast(usize, alen));
}

pub fn sendfile(outfd: i32, infd: i32, offset: ?*u64, count: usize) usize {
if (@hasDecl(@This(), "SYS_sendfile64")) {
return syscall4(SYS_sendfile64, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
} else {
return syscall4(SYS_sendfile, @bitCast(usize, @as(isize, outfd)), @bitCast(usize, @as(isize, infd)), @ptrToInt(offset), count);
}
}

pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usize {
if (builtin.arch == .i386) {
return socketcall(SC_socketpair, &[4]usize{ @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]) });
Expand Down