diff options
| author | Michael Pratt <mpratt@google.com> | 2022-09-30 18:43:25 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-09-30 19:07:13 +0000 |
| commit | 4a49af5755564b5412acea2cfc3ac8556a7af453 (patch) | |
| tree | 077534fca793c024d854b3bee936c9d332da92cd /src/runtime/internal/syscall/syscall_linux.go | |
| parent | 4e6f963469d8f489586b2bf277af30e0fbfa1679 (diff) | |
| download | go-4a49af5755564b5412acea2cfc3ac8556a7af453.tar.xz | |
Revert "runtime: move epoll syscalls to runtime/internal/syscall"
This reverts CL 421994.
Reason for revert: breaks runtime.TestCheckPtr2
For #53824
For #51087
Change-Id: I044ea4d6efdffe0a4b7fb0d2bb3717d9f391fc59
Reviewed-on: https://go-review.googlesource.com/c/go/+/437295
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Michael Pratt <mpratt@google.com>
Auto-Submit: Michael Pratt <mpratt@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
Diffstat (limited to 'src/runtime/internal/syscall/syscall_linux.go')
| -rw-r--r-- | src/runtime/internal/syscall/syscall_linux.go | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/runtime/internal/syscall/syscall_linux.go b/src/runtime/internal/syscall/syscall_linux.go index a103d318c4..7f268e8fba 100644 --- a/src/runtime/internal/syscall/syscall_linux.go +++ b/src/runtime/internal/syscall/syscall_linux.go @@ -6,7 +6,7 @@ package syscall import ( - "unsafe" + _ "unsafe" // for go:linkname ) // TODO(https://go.dev/issue/51087): This package is incomplete and currently @@ -37,30 +37,3 @@ func Syscall6(num, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, errno uintptr) func syscall_RawSyscall6(num, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, errno uintptr) { return Syscall6(num, a1, a2, a3, a4, a5, a6) } - -func EpollCreate1(flags int32) (fd int32, errno uintptr) { - r1, _, e := Syscall6(SYS_EPOLL_CREATE1, uintptr(flags), 0, 0, 0, 0, 0) - return int32(r1), e -} - -var _zero uintptr - -func EpollWait(epfd int32, events []EpollEvent, maxev, waitms int32) (n int32, errno uintptr) { - var ev unsafe.Pointer - if len(events) > 0 { - ev = unsafe.Pointer(&events[0]) - } else { - ev = unsafe.Pointer(&_zero) - } - r1, _, e := Syscall6(SYS_EPOLL_PWAIT, uintptr(epfd), uintptr(ev), uintptr(maxev), uintptr(waitms), 0, 0) - return int32(r1), e -} - -func EpollCtl(epfd, op, fd int32, event *EpollEvent) (errno uintptr) { - _, _, e := Syscall6(SYS_EPOLL_CTL, uintptr(epfd), uintptr(op), uintptr(fd), uintptr(unsafe.Pointer(event)), 0, 0) - return e -} - -func CloseOnExec(fd int32) { - Syscall6(SYS_FCNTL, uintptr(fd), F_SETFD, FD_CLOEXEC, 0, 0, 0) -} |
