authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-02-17 17:53:07-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-02-17 17:53:07-05:00
logbde15cf0806f2b8d6fb0c90602b42a74863ec515
treed913e5aecd21c1f62c76dfb7b5b6d390e62d53f7
parent72ca2b214d4ffbaeed4840a806fb63740cf13c05

improve std lib linux epoll API

2 files changed, 16 insertions(+), 5 deletions(-)

std/os/linux/index.zig+15-4
...@@ -329,6 +329,8 @@ pub const TIOCGPKT = 0x80045438;...@@ -329,6 +329,8 @@ pub const TIOCGPKT = 0x80045438;
329pub const TIOCGPTLCK = 0x80045439;329pub const TIOCGPTLCK = 0x80045439;
330pub const TIOCGEXCL = 0x80045440;330pub const TIOCGEXCL = 0x80045440;
331331
332pub const EPOLL_CLOEXEC = O_CLOEXEC;
333
332pub const EPOLL_CTL_ADD = 1;334pub const EPOLL_CTL_ADD = 1;
333pub const EPOLL_CTL_DEL = 2;335pub const EPOLL_CTL_DEL = 2;
334pub const EPOLL_CTL_MOD = 3;336pub const EPOLL_CTL_MOD = 3;
...@@ -751,22 +753,31 @@ pub fn fstat(fd: i32, stat_buf: &Stat) usize {...@@ -751,22 +753,31 @@ pub fn fstat(fd: i32, stat_buf: &Stat) usize {
751 return arch.syscall2(arch.SYS_fstat, usize(fd), @ptrToInt(stat_buf));753 return arch.syscall2(arch.SYS_fstat, usize(fd), @ptrToInt(stat_buf));
752}754}
753755
754pub const epoll_data = u64;756pub const epoll_data = extern union {
757 ptr: usize,
758 fd: i32,
759 @"u32": u32,
760 @"u64": u64,
761};
755762
756pub const epoll_event = extern struct {763pub const epoll_event = extern struct {
757 events: u32,764 events: u32,
758 data: epoll_data765 data: epoll_data,
759};766};
760767
761pub fn epoll_create() usize {768pub fn epoll_create() usize {
762 return arch.syscall1(arch.SYS_epoll_create, usize(1));769 return epoll_create1(0);
770}
771
772pub fn epoll_create1(flags: usize) usize {
773 return arch.syscall1(arch.SYS_epoll_create1, flags);
763}774}
764775
765pub fn epoll_ctl(epoll_fd: i32, op: i32, fd: i32, ev: &epoll_event) usize {776pub fn epoll_ctl(epoll_fd: i32, op: i32, fd: i32, ev: &epoll_event) usize {
766 return arch.syscall4(arch.SYS_epoll_ctl, usize(epoll_fd), usize(op), usize(fd), @ptrToInt(ev));777 return arch.syscall4(arch.SYS_epoll_ctl, usize(epoll_fd), usize(op), usize(fd), @ptrToInt(ev));
767}778}
768779
769pub fn epoll_wait(epoll_fd: i32, events: &epoll_event, maxevents: i32, timeout: i32) usize {780pub fn epoll_wait(epoll_fd: i32, events: &epoll_event, maxevents: u32, timeout: i32) usize {
770 return arch.syscall4(arch.SYS_epoll_wait, usize(epoll_fd), @ptrToInt(events), usize(maxevents), usize(timeout));781 return arch.syscall4(arch.SYS_epoll_wait, usize(epoll_fd), @ptrToInt(events), usize(maxevents), usize(timeout));
771}782}
772783
std/os/linux/test.zig+1-1
...@@ -25,7 +25,7 @@ test "timer" {...@@ -25,7 +25,7 @@ test "timer" {
2525
26 var event = linux.epoll_event {26 var event = linux.epoll_event {
27 .events = linux.EPOLLIN | linux.EPOLLOUT | linux.EPOLLET,27 .events = linux.EPOLLIN | linux.EPOLLOUT | linux.EPOLLET,
28 .data = 028 .data = linux.epoll_data { .ptr = 0 },
29 };29 };
3030
31 err = linux.epoll_ctl(i32(epoll_fd), linux.EPOLL_CTL_ADD, i32(timer_fd), &event);31 err = linux.epoll_ctl(i32(epoll_fd), linux.EPOLL_CTL_ADD, i32(timer_fd), &event);