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>

diff --git a/src/runtime/defs2_linux.go b/src/runtime/defs2_linux.go
index 5d6730a7ad7fd8cf981d294e7c84f4eab148d986..41ad73576f15af06b2ca6fed5f347459c0a4eaa0 100644 (file)
--- a/src/runtime/defs2_linux.go
+++ b/src/runtime/defs2_linux.go
@@ -121,6 +121,17 @@ const (
 
        O_RDONLY  = C.O_RDONLY
        O_CLOEXEC = C.O_CLOEXEC
+
+       EPOLLIN       = C.POLLIN
+       EPOLLOUT      = C.POLLOUT
+       EPOLLERR      = C.POLLERR
+       EPOLLHUP      = C.POLLHUP
+       EPOLLRDHUP    = C.POLLRDHUP
+       EPOLLET       = C.EPOLLET
+       EPOLL_CLOEXEC = C.EPOLL_CLOEXEC
+       EPOLL_CTL_ADD = C.EPOLL_CTL_ADD
+       EPOLL_CTL_DEL = C.EPOLL_CTL_DEL
+       EPOLL_CTL_MOD = C.EPOLL_CTL_MOD
 )
 
 type Fpreg C.struct__fpreg

diff --git a/src/runtime/defs_linux.go b/src/runtime/defs_linux.go
index 296fcb4bfd6a7ad656365388b78e7c1aa8b5fe20..e55bb6bbbcfe555f8c5dfcfa140e7de945b6292e 100644 (file)
--- a/src/runtime/defs_linux.go
+++ b/src/runtime/defs_linux.go
@@ -115,6 +115,17 @@ const (
        CLOCK_THREAD_CPUTIME_ID = C.CLOCK_THREAD_CPUTIME_ID
 
        SIGEV_THREAD_ID = C.SIGEV_THREAD_ID
+
+       EPOLLIN       = C.POLLIN
+       EPOLLOUT      = C.POLLOUT
+       EPOLLERR      = C.POLLERR
+       EPOLLHUP      = C.POLLHUP
+       EPOLLRDHUP    = C.POLLRDHUP
+       EPOLLET       = C.EPOLLET
+       EPOLL_CLOEXEC = C.EPOLL_CLOEXEC
+       EPOLL_CTL_ADD = C.EPOLL_CTL_ADD
+       EPOLL_CTL_DEL = C.EPOLL_CTL_DEL
+       EPOLL_CTL_MOD = C.EPOLL_CTL_MOD
 )
 
 type Sigset C.sigset_t
@@ -125,3 +136,4 @@ type Siginfo C.siginfo_t
 type Itimerspec C.struct_itimerspec
 type Itimerval C.struct_itimerval
 type Sigevent C.struct_sigevent
+type EpollEvent C.struct_epoll_event

diff --git a/src/runtime/defs_linux_386.go b/src/runtime/defs_linux_386.go
index 7027286f5c2ec0fb2eda6cb088c4c3c685fe8fe8..5376bded2b169707538c4a32bef30f4e4549f060 100644 (file)
--- a/src/runtime/defs_linux_386.go
+++ b/src/runtime/defs_linux_386.go
@@ -93,6 +93,17 @@ const (
        _O_NONBLOCK = 0x800
        _O_CLOEXEC  = 0x80000
 
+       _EPOLLIN       = 0x1
+       _EPOLLOUT      = 0x4
+       _EPOLLERR      = 0x8
+       _EPOLLHUP      = 0x10
+       _EPOLLRDHUP    = 0x2000
+       _EPOLLET       = 0x80000000
+       _EPOLL_CLOEXEC = 0x80000
+       _EPOLL_CTL_ADD = 0x1
+       _EPOLL_CTL_DEL = 0x2
+       _EPOLL_CTL_MOD = 0x3
+
        _AF_UNIX    = 0x1
        _SOCK_DGRAM = 0x2
 )
@@ -243,6 +254,11 @@ type sigevent struct {
        _ [_sigev_max_size - unsafe.Sizeof(sigeventFields{})]byte
 }
 
+type epollevent struct {
+       events uint32
+       data   [8]byte // to match amd64
+}
+
 type sockaddr_un struct {
        family uint16
        path   [108]byte

diff --git a/src/runtime/defs_linux_amd64.go b/src/runtime/defs_linux_amd64.go
index 4ce6146177346bc51a942f4de3830e426741b8ef..da4d3575328184c847884cb7833aebb8ab9b5d2c 100644 (file)
--- a/src/runtime/defs_linux_amd64.go
+++ b/src/runtime/defs_linux_amd64.go
@@ -89,6 +89,17 @@ const (
 
        _SIGEV_THREAD_ID = 0x4
 
+       _EPOLLIN       = 0x1
+       _EPOLLOUT      = 0x4
+       _EPOLLERR      = 0x8
+       _EPOLLHUP      = 0x10
+       _EPOLLRDHUP    = 0x2000
+       _EPOLLET       = 0x80000000
+       _EPOLL_CLOEXEC = 0x80000
+       _EPOLL_CTL_ADD = 0x1
+       _EPOLL_CTL_DEL = 0x2
+       _EPOLL_CTL_MOD = 0x3
+
        _AF_UNIX    = 0x1
        _SOCK_DGRAM = 0x2
 )
@@ -160,6 +171,11 @@ type sigevent struct {
        _ [_sigev_max_size - unsafe.Sizeof(sigeventFields{})]byte
 }
 
+type epollevent struct {
+       events uint32
+       data   [8]byte // unaligned uintptr
+}
+
 // created by cgo -cdefs and then converted to Go
 // cgo -cdefs defs_linux.go defs1_linux.go
 

diff --git a/src/runtime/defs_linux_arm.go b/src/runtime/defs_linux_arm.go
index 999c11431b9fe49fcbd04e06f84e147dfa36a78f..18aa0931e52b280c6fe00ef24f03920d084a8f63 100644 (file)
--- a/src/runtime/defs_linux_arm.go
+++ b/src/runtime/defs_linux_arm.go
@@ -87,6 +87,17 @@ const (
 
        _SIGEV_THREAD_ID = 0x4
 
+       _EPOLLIN       = 0x1
+       _EPOLLOUT      = 0x4
+       _EPOLLERR      = 0x8
+       _EPOLLHUP      = 0x10
+       _EPOLLRDHUP    = 0x2000
+       _EPOLLET       = 0x80000000
+       _EPOLL_CLOEXEC = 0x80000
+       _EPOLL_CTL_ADD = 0x1
+       _EPOLL_CTL_DEL = 0x2
+       _EPOLL_CTL_MOD = 0x3
+
        _AF_UNIX    = 0x1
        _SOCK_DGRAM = 0x2
 )
@@ -197,6 +208,12 @@ type sigactiont struct {
        sa_mask     uint64
 }
 
+type epollevent struct {
+       events uint32
+       _pad   uint32
+       data   [8]byte // to match amd64
+}
+
 type sockaddr_un struct {
        family uint16
        path   [108]byte

diff --git a/src/runtime/defs_linux_arm64.go b/src/runtime/defs_linux_arm64.go
index 73f26a9b00b4ddb6c958387148b582ba1812cbfc..c5d7d7e3fd33524f9143b7d0b34bf1a2a17a8e48 100644 (file)
--- a/src/runtime/defs_linux_arm64.go
+++ b/src/runtime/defs_linux_arm64.go
@@ -89,6 +89,17 @@ const (
 
        _SIGEV_THREAD_ID = 0x4
 
+       _EPOLLIN       = 0x1
+       _EPOLLOUT      = 0x4
+       _EPOLLERR      = 0x8
+       _EPOLLHUP      = 0x10
+       _EPOLLRDHUP    = 0x2000
+       _EPOLLET       = 0x80000000
+       _EPOLL_CLOEXEC = 0x80000
+       _EPOLL_CTL_ADD = 0x1
+       _EPOLL_CTL_DEL = 0x2
+       _EPOLL_CTL_MOD = 0x3
+
        _AF_UNIX    = 0x1
        _SOCK_DGRAM = 0x2
 )
@@ -160,6 +171,12 @@ type sigevent struct {
        _ [_sigev_max_size - unsafe.Sizeof(sigeventFields{})]byte
 }
 
+type epollevent struct {
+       events uint32
+       _pad   uint32
+       data   [8]byte // to match amd64
+}
+
 // Created by cgo -cdefs and then converted to Go by hand
 // ../cmd/cgo/cgo -cdefs defs_linux.go defs1_linux.go defs2_linux.go
 

diff --git a/src/runtime/defs_linux_loong64.go b/src/runtime/defs_linux_loong64.go
index 956121d0fcc97489eedd306fa9393838d288554c..dda4009fb07b5d5e7ff71b49763bfac5cf7f25e1 100644 (file)
--- a/src/runtime/defs_linux_loong64.go
+++ b/src/runtime/defs_linux_loong64.go
@@ -89,6 +89,17 @@ const (
        _CLOCK_THREAD_CPUTIME_ID = 0x3
 
        _SIGEV_THREAD_ID = 0x4
+
+       _EPOLLIN       = 0x1
+       _EPOLLOUT      = 0x4
+       _EPOLLERR      = 0x8
+       _EPOLLHUP      = 0x10
+       _EPOLLRDHUP    = 0x2000
+       _EPOLLET       = 0x80000000
+       _EPOLL_CLOEXEC = 0x80000
+       _EPOLL_CTL_ADD = 0x1
+       _EPOLL_CTL_DEL = 0x2
+       _EPOLL_CTL_MOD = 0x3
 )
 
 type timespec struct {
@@ -135,6 +146,12 @@ type sigevent struct {
        _ [_sigev_max_size - unsafe.Sizeof(sigeventFields{})]byte
 }
 
+type epollevent struct {
+       events    uint32
+       pad_cgo_0 [4]byte
+       data      [8]byte // unaligned uintptr
+}
+
 const (
        _O_RDONLY   = 0x0
        _O_NONBLOCK = 0x800

diff --git a/src/runtime/defs_linux_mips64x.go b/src/runtime/defs_linux_mips64x.go
index 30157fa808cc88b166931a67b863b0b0b5e7ae82..e64524813180d9c211b186c840568b973c63d745 100644 (file)
--- a/src/runtime/defs_linux_mips64x.go
+++ b/src/runtime/defs_linux_mips64x.go
@@ -90,6 +90,17 @@ const (
        _CLOCK_THREAD_CPUTIME_ID = 0x3
 
        _SIGEV_THREAD_ID = 0x4
+
+       _EPOLLIN       = 0x1
+       _EPOLLOUT      = 0x4
+       _EPOLLERR      = 0x8
+       _EPOLLHUP      = 0x10
+       _EPOLLRDHUP    = 0x2000
+       _EPOLLET       = 0x80000000
+       _EPOLL_CLOEXEC = 0x80000
+       _EPOLL_CTL_ADD = 0x1
+       _EPOLL_CTL_DEL = 0x2
+       _EPOLL_CTL_MOD = 0x3
 )
 
 //struct Sigset {
@@ -167,6 +178,12 @@ type sigevent struct {
        _ [_sigev_max_size - unsafe.Sizeof(sigeventFields{})]byte
 }
 
+type epollevent struct {
+       events    uint32
+       pad_cgo_0 [4]byte
+       data      [8]byte // unaligned uintptr
+}
+
 const (
        _O_RDONLY    = 0x0
        _O_NONBLOCK  = 0x80

diff --git a/src/runtime/defs_linux_mipsx.go b/src/runtime/defs_linux_mipsx.go
index 5d779778c939dc9e3e546591cd123acd7acc8300..5afb6f423f94b1c602671a9aaa2db98c3c2e3135 100644 (file)
--- a/src/runtime/defs_linux_mipsx.go
+++ b/src/runtime/defs_linux_mipsx.go
@@ -90,6 +90,17 @@ const (
        _CLOCK_THREAD_CPUTIME_ID = 0x3
 
        _SIGEV_THREAD_ID = 0x4
+
+       _EPOLLIN       = 0x1
+       _EPOLLOUT      = 0x4
+       _EPOLLERR      = 0x8
+       _EPOLLHUP      = 0x10
+       _EPOLLRDHUP    = 0x2000
+       _EPOLLET       = 0x80000000
+       _EPOLL_CLOEXEC = 0x80000
+       _EPOLL_CTL_ADD = 0x1
+       _EPOLL_CTL_DEL = 0x2
+       _EPOLL_CTL_MOD = 0x3
 )
 
 type timespec struct {
@@ -161,6 +172,12 @@ type sigevent struct {
        _ [_sigev_max_size - unsafe.Sizeof(sigeventFields{})]byte
 }
 
+type epollevent struct {
+       events    uint32
+       pad_cgo_0 [4]byte
+       data      uint64
+}
+
 const (
        _O_RDONLY    = 0x0
        _O_NONBLOCK  = 0x80

diff --git a/src/runtime/defs_linux_ppc64.go b/src/runtime/defs_linux_ppc64.go
index 36d021a7274237c3c1bac6bf7127ccaec274b7bf..f3e305e34eab631ec666306d61936a1d3e03c504 100644 (file)
--- a/src/runtime/defs_linux_ppc64.go
+++ b/src/runtime/defs_linux_ppc64.go
@@ -87,6 +87,17 @@ const (
        _CLOCK_THREAD_CPUTIME_ID = 0x3
 
        _SIGEV_THREAD_ID = 0x4
+
+       _EPOLLIN       = 0x1
+       _EPOLLOUT      = 0x4
+       _EPOLLERR      = 0x8
+       _EPOLLHUP      = 0x10
+       _EPOLLRDHUP    = 0x2000
+       _EPOLLET       = 0x80000000
+       _EPOLL_CLOEXEC = 0x80000
+       _EPOLL_CTL_ADD = 0x1
+       _EPOLL_CTL_DEL = 0x2
+       _EPOLL_CTL_MOD = 0x3
 )
 
 //struct Sigset {
@@ -161,6 +172,12 @@ type sigevent struct {
        _ [_sigev_max_size - unsafe.Sizeof(sigeventFields{})]byte
 }
 
+type epollevent struct {
+       events    uint32
+       pad_cgo_0 [4]byte
+       data      [8]byte // unaligned uintptr
+}
+
 // created by cgo -cdefs and then converted to Go
 // cgo -cdefs defs_linux.go defs3_linux.go
 

diff --git a/src/runtime/defs_linux_ppc64le.go b/src/runtime/defs_linux_ppc64le.go
index 36d021a7274237c3c1bac6bf7127ccaec274b7bf..f3e305e34eab631ec666306d61936a1d3e03c504 100644 (file)
--- a/src/runtime/defs_linux_ppc64le.go
+++ b/src/runtime/defs_linux_ppc64le.go
@@ -87,6 +87,17 @@ const (
        _CLOCK_THREAD_CPUTIME_ID = 0x3
 
        _SIGEV_THREAD_ID = 0x4
+
+       _EPOLLIN       = 0x1
+       _EPOLLOUT      = 0x4
+       _EPOLLERR      = 0x8
+       _EPOLLHUP      = 0x10
+       _EPOLLRDHUP    = 0x2000
+       _EPOLLET       = 0x80000000
+       _EPOLL_CLOEXEC = 0x80000
+       _EPOLL_CTL_ADD = 0x1
+       _EPOLL_CTL_DEL = 0x2
+       _EPOLL_CTL_MOD = 0x3
 )
 
 //struct Sigset {
@@ -161,6 +172,12 @@ type sigevent struct {
        _ [_sigev_max_size - unsafe.Sizeof(sigeventFields{})]byte
 }
 
+type epollevent struct {
+       events    uint32
+       pad_cgo_0 [4]byte
+       data      [8]byte // unaligned uintptr
+}
+
 // created by cgo -cdefs and then converted to Go
 // cgo -cdefs defs_linux.go defs3_linux.go
 

diff --git a/src/runtime/defs_linux_riscv64.go b/src/runtime/defs_linux_riscv64.go
index 116a842e582b14c09875ce7f941471be20df0307..29496acdcb6992a87e1179194e365472a34635e4 100644 (file)
--- a/src/runtime/defs_linux_riscv64.go
+++ b/src/runtime/defs_linux_riscv64.go
@@ -89,6 +89,17 @@ const (
        _CLOCK_THREAD_CPUTIME_ID = 0x3
 
        _SIGEV_THREAD_ID = 0x4
+
+       _EPOLLIN       = 0x1
+       _EPOLLOUT      = 0x4
+       _EPOLLERR      = 0x8
+       _EPOLLHUP      = 0x10
+       _EPOLLRDHUP    = 0x2000
+       _EPOLLET       = 0x80000000
+       _EPOLL_CLOEXEC = 0x80000
+       _EPOLL_CTL_ADD = 0x1
+       _EPOLL_CTL_DEL = 0x2
+       _EPOLL_CTL_MOD = 0x3
 )
 
 type timespec struct {
@@ -160,6 +171,12 @@ type sigevent struct {
        _ [_sigev_max_size - unsafe.Sizeof(sigeventFields{})]byte
 }
 
+type epollevent struct {
+       events    uint32
+       pad_cgo_0 [4]byte
+       data      [8]byte // unaligned uintptr
+}
+
 const (
        _O_RDONLY   = 0x0
        _O_NONBLOCK = 0x800

diff --git a/src/runtime/defs_linux_s390x.go b/src/runtime/defs_linux_s390x.go
index 79a54fe7e748e6c7e6a1c09bd2184cb7b16c9212..817a29ed30cd3461cae7438aca358fb3f16541b4 100644 (file)
--- a/src/runtime/defs_linux_s390x.go
+++ b/src/runtime/defs_linux_s390x.go
@@ -88,6 +88,17 @@ const (
        _CLOCK_THREAD_CPUTIME_ID = 0x3
 
        _SIGEV_THREAD_ID = 0x4
+
+       _EPOLLIN       = 0x1
+       _EPOLLOUT      = 0x4
+       _EPOLLERR      = 0x8
+       _EPOLLHUP      = 0x10
+       _EPOLLRDHUP    = 0x2000
+       _EPOLLET       = 0x80000000
+       _EPOLL_CLOEXEC = 0x80000
+       _EPOLL_CTL_ADD = 0x1
+       _EPOLL_CTL_DEL = 0x2
+       _EPOLL_CTL_MOD = 0x3
 )
 
 type timespec struct {
@@ -157,6 +168,12 @@ type sigevent struct {
        _ [_sigev_max_size - unsafe.Sizeof(sigeventFields{})]byte
 }
 
+type epollevent struct {
+       events    uint32
+       pad_cgo_0 [4]byte
+       data      [8]byte // unaligned uintptr
+}
+
 const (
        _O_RDONLY    = 0x0
        _O_NONBLOCK  = 0x800

diff --git a/src/runtime/export_linux_test.go b/src/runtime/export_linux_test.go
index a441c0efa25a57287f51bcb0e0a1d669c12fbef7..dea94a934cef6665d72dff6cbfc1b02563f2874b 100644 (file)
--- a/src/runtime/export_linux_test.go
+++ b/src/runtime/export_linux_test.go
@@ -6,17 +6,19 @@
 
 package runtime
 
-import (
-       "runtime/internal/syscall"
-)
+import "unsafe"
 
 const SiginfoMaxSize = _si_max_size
 const SigeventMaxSize = _sigev_max_size
 
-var Closeonexec = syscall.CloseOnExec
 var NewOSProc0 = newosproc0
 var Mincore = mincore
 var Add = add
 
+type EpollEvent epollevent
 type Siginfo siginfo
 type Sigevent sigevent
+
+func Epollctl(epfd, op, fd int32, ev unsafe.Pointer) int32 {
+       return epollctl(epfd, op, fd, (*epollevent)(ev))
+}

diff --git a/src/runtime/export_unix2_test.go b/src/runtime/export_unix2_test.go
deleted file mode 100644 (file)
index 360565f..0000000
--- a/src/runtime/export_unix2_test.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build unix && !linux
-
-package runtime
-
-// for linux close-on-exec implemented in runtime/internal/syscall
-var Closeonexec = closeonexec

diff --git a/src/runtime/export_unix_test.go b/src/runtime/export_unix_test.go
index 01195387872619af73ecac113f33f1054d5dd97b..a548cf7b7a5ccefad2d9292c19d961bc0414ccac 100644 (file)
--- a/src/runtime/export_unix_test.go
+++ b/src/runtime/export_unix_test.go
@@ -9,6 +9,7 @@ package runtime
 import "unsafe"
 
 var NonblockingPipe = nonblockingPipe
+var Closeonexec = closeonexec
 
 func sigismember(mask *sigset, i int) bool {
        clear := *mask

diff --git a/src/runtime/internal/syscall/defs_linux.go b/src/runtime/internal/syscall/defs_linux.go
deleted file mode 100644 (file)
index 71f1fa1..0000000
--- a/src/runtime/internal/syscall/defs_linux.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syscall
-
-const (
-       F_SETFD    = 2
-       FD_CLOEXEC = 1
-)

diff --git a/src/runtime/internal/syscall/defs_linux_386.go b/src/runtime/internal/syscall/defs_linux_386.go
deleted file mode 100644 (file)
index dc723a6..0000000
--- a/src/runtime/internal/syscall/defs_linux_386.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syscall
-
-const (
-       SYS_FCNTL         = 55
-       SYS_EPOLL_CTL     = 255
-       SYS_EPOLL_PWAIT   = 319
-       SYS_EPOLL_CREATE1 = 329
-       SYS_EPOLL_PWAIT2  = 441
-
-       EPOLLIN       = 0x1
-       EPOLLOUT      = 0x4
-       EPOLLERR      = 0x8
-       EPOLLHUP      = 0x10
-       EPOLLRDHUP    = 0x2000
-       EPOLLET       = 0x80000000
-       EPOLL_CLOEXEC = 0x80000
-       EPOLL_CTL_ADD = 0x1
-       EPOLL_CTL_DEL = 0x2
-       EPOLL_CTL_MOD = 0x3
-)
-
-type EpollEvent struct {
-       Events uint32
-       Data   [8]byte // to match amd64
-}

diff --git a/src/runtime/internal/syscall/defs_linux_amd64.go b/src/runtime/internal/syscall/defs_linux_amd64.go
deleted file mode 100644 (file)
index 886eb5b..0000000
--- a/src/runtime/internal/syscall/defs_linux_amd64.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syscall
-
-const (
-       SYS_FCNTL         = 72
-       SYS_EPOLL_CTL     = 233
-       SYS_EPOLL_PWAIT   = 281
-       SYS_EPOLL_CREATE1 = 291
-       SYS_EPOLL_PWAIT2  = 441
-
-       EPOLLIN       = 0x1
-       EPOLLOUT      = 0x4
-       EPOLLERR      = 0x8
-       EPOLLHUP      = 0x10
-       EPOLLRDHUP    = 0x2000
-       EPOLLET       = 0x80000000
-       EPOLL_CLOEXEC = 0x80000
-       EPOLL_CTL_ADD = 0x1
-       EPOLL_CTL_DEL = 0x2
-       EPOLL_CTL_MOD = 0x3
-)
-
-type EpollEvent struct {
-       Events uint32
-       Data   [8]byte // unaligned uintptr
-}

diff --git a/src/runtime/internal/syscall/defs_linux_arm.go b/src/runtime/internal/syscall/defs_linux_arm.go
deleted file mode 100644 (file)
index 8f812a2..0000000
--- a/src/runtime/internal/syscall/defs_linux_arm.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syscall
-
-const (
-       SYS_FCNTL         = 55
-       SYS_EPOLL_CTL     = 251
-       SYS_EPOLL_PWAIT   = 346
-       SYS_EPOLL_CREATE1 = 357
-       SYS_EPOLL_PWAIT2  = 441
-
-       EPOLLIN       = 0x1
-       EPOLLOUT      = 0x4
-       EPOLLERR      = 0x8
-       EPOLLHUP      = 0x10
-       EPOLLRDHUP    = 0x2000
-       EPOLLET       = 0x80000000
-       EPOLL_CLOEXEC = 0x80000
-       EPOLL_CTL_ADD = 0x1
-       EPOLL_CTL_DEL = 0x2
-       EPOLL_CTL_MOD = 0x3
-)
-
-type EpollEvent struct {
-       Events uint32
-       _pad   uint32
-       Data   [8]byte // to match amd64
-}

diff --git a/src/runtime/internal/syscall/defs_linux_arm64.go b/src/runtime/internal/syscall/defs_linux_arm64.go
deleted file mode 100644 (file)
index 48e11b0..0000000
--- a/src/runtime/internal/syscall/defs_linux_arm64.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syscall
-
-const (
-       SYS_EPOLL_CREATE1 = 20
-       SYS_EPOLL_CTL     = 21
-       SYS_EPOLL_PWAIT   = 22
-       SYS_FCNTL         = 25
-       SYS_EPOLL_PWAIT2  = 441
-
-       EPOLLIN       = 0x1
-       EPOLLOUT      = 0x4
-       EPOLLERR      = 0x8
-       EPOLLHUP      = 0x10
-       EPOLLRDHUP    = 0x2000
-       EPOLLET       = 0x80000000
-       EPOLL_CLOEXEC = 0x80000
-       EPOLL_CTL_ADD = 0x1
-       EPOLL_CTL_DEL = 0x2
-       EPOLL_CTL_MOD = 0x3
-)
-
-type EpollEvent struct {
-       Events uint32
-       _pad   uint32
-       Data   [8]byte // to match amd64
-}

diff --git a/src/runtime/internal/syscall/defs_linux_loong64.go b/src/runtime/internal/syscall/defs_linux_loong64.go
deleted file mode 100644 (file)
index b78ef81..0000000
--- a/src/runtime/internal/syscall/defs_linux_loong64.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syscall
-
-const (
-       SYS_EPOLL_CREATE1 = 20
-       SYS_EPOLL_CTL     = 21
-       SYS_EPOLL_PWAIT   = 22
-       SYS_FCNTL         = 25
-       SYS_EPOLL_PWAIT2  = 441
-
-       EPOLLIN       = 0x1
-       EPOLLOUT      = 0x4
-       EPOLLERR      = 0x8
-       EPOLLHUP      = 0x10
-       EPOLLRDHUP    = 0x2000
-       EPOLLET       = 0x80000000
-       EPOLL_CLOEXEC = 0x80000
-       EPOLL_CTL_ADD = 0x1
-       EPOLL_CTL_DEL = 0x2
-       EPOLL_CTL_MOD = 0x3
-)
-
-type EpollEvent struct {
-       Events    uint32
-       pad_cgo_0 [4]byte
-       Data      [8]byte // unaligned uintptr
-}

diff --git a/src/runtime/internal/syscall/defs_linux_mips64x.go b/src/runtime/internal/syscall/defs_linux_mips64x.go
deleted file mode 100644 (file)
index 92b49ca..0000000
--- a/src/runtime/internal/syscall/defs_linux_mips64x.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux && (mips64 || mips64le)
-
-package syscall
-
-const (
-       SYS_FCNTL         = 5070
-       SYS_EPOLL_CTL     = 5208
-       SYS_EPOLL_PWAIT   = 5272
-       SYS_EPOLL_CREATE1 = 5285
-       SYS_EPOLL_PWAIT2  = 5441
-
-       EPOLLIN       = 0x1
-       EPOLLOUT      = 0x4
-       EPOLLERR      = 0x8
-       EPOLLHUP      = 0x10
-       EPOLLRDHUP    = 0x2000
-       EPOLLET       = 0x80000000
-       EPOLL_CLOEXEC = 0x80000
-       EPOLL_CTL_ADD = 0x1
-       EPOLL_CTL_DEL = 0x2
-       EPOLL_CTL_MOD = 0x3
-)
-
-type EpollEvent struct {
-       Events    uint32
-       pad_cgo_0 [4]byte
-       Data      [8]byte // unaligned uintptr
-}

diff --git a/src/runtime/internal/syscall/defs_linux_mipsx.go b/src/runtime/internal/syscall/defs_linux_mipsx.go
deleted file mode 100644 (file)
index e28d09c..0000000
--- a/src/runtime/internal/syscall/defs_linux_mipsx.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux && (mips || mipsle)
-
-package syscall
-
-const (
-       SYS_FCNTL         = 4055
-       SYS_EPOLL_CTL     = 4249
-       SYS_EPOLL_PWAIT   = 4313
-       SYS_EPOLL_CREATE1 = 4326
-       SYS_EPOLL_PWAIT2  = 4441
-
-       EPOLLIN       = 0x1
-       EPOLLOUT      = 0x4
-       EPOLLERR      = 0x8
-       EPOLLHUP      = 0x10
-       EPOLLRDHUP    = 0x2000
-       EPOLLET       = 0x80000000
-       EPOLL_CLOEXEC = 0x80000
-       EPOLL_CTL_ADD = 0x1
-       EPOLL_CTL_DEL = 0x2
-       EPOLL_CTL_MOD = 0x3
-)
-
-type EpollEvent struct {
-       Events    uint32
-       pad_cgo_0 [4]byte
-       Data      uint64
-}

diff --git a/src/runtime/internal/syscall/defs_linux_ppc64x.go b/src/runtime/internal/syscall/defs_linux_ppc64x.go
deleted file mode 100644 (file)
index a74483e..0000000
--- a/src/runtime/internal/syscall/defs_linux_ppc64x.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build linux && (ppc64 || ppc64le)
-
-package syscall
-
-const (
-       SYS_FCNTL         = 55
-       SYS_EPOLL_CTL     = 237
-       SYS_EPOLL_PWAIT   = 303
-       SYS_EPOLL_CREATE1 = 315
-       SYS_EPOLL_PWAIT2  = 441
-
-       EPOLLIN       = 0x1
-       EPOLLOUT      = 0x4
-       EPOLLERR      = 0x8
-       EPOLLHUP      = 0x10
-       EPOLLRDHUP    = 0x2000
-       EPOLLET       = 0x80000000
-       EPOLL_CLOEXEC = 0x80000
-       EPOLL_CTL_ADD = 0x1
-       EPOLL_CTL_DEL = 0x2
-       EPOLL_CTL_MOD = 0x3
-)
-
-type EpollEvent struct {
-       Events    uint32
-       pad_cgo_0 [4]byte
-       Data      [8]byte // unaligned uintptr
-}

diff --git a/src/runtime/internal/syscall/defs_linux_riscv64.go b/src/runtime/internal/syscall/defs_linux_riscv64.go
deleted file mode 100644 (file)
index b78ef81..0000000
--- a/src/runtime/internal/syscall/defs_linux_riscv64.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syscall
-
-const (
-       SYS_EPOLL_CREATE1 = 20
-       SYS_EPOLL_CTL     = 21
-       SYS_EPOLL_PWAIT   = 22
-       SYS_FCNTL         = 25
-       SYS_EPOLL_PWAIT2  = 441
-
-       EPOLLIN       = 0x1
-       EPOLLOUT      = 0x4
-       EPOLLERR      = 0x8
-       EPOLLHUP      = 0x10
-       EPOLLRDHUP    = 0x2000
-       EPOLLET       = 0x80000000
-       EPOLL_CLOEXEC = 0x80000
-       EPOLL_CTL_ADD = 0x1
-       EPOLL_CTL_DEL = 0x2
-       EPOLL_CTL_MOD = 0x3
-)
-
-type EpollEvent struct {
-       Events    uint32
-       pad_cgo_0 [4]byte
-       Data      [8]byte // unaligned uintptr
-}

diff --git a/src/runtime/internal/syscall/defs_linux_s390x.go b/src/runtime/internal/syscall/defs_linux_s390x.go
deleted file mode 100644 (file)
index a7bb1ba..0000000
--- a/src/runtime/internal/syscall/defs_linux_s390x.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syscall
-
-const (
-       SYS_FCNTL         = 55
-       SYS_EPOLL_CTL     = 250
-       SYS_EPOLL_PWAIT   = 312
-       SYS_EPOLL_CREATE1 = 327
-       SYS_EPOLL_PWAIT2  = 441
-
-       EPOLLIN       = 0x1
-       EPOLLOUT      = 0x4
-       EPOLLERR      = 0x8
-       EPOLLHUP      = 0x10
-       EPOLLRDHUP    = 0x2000
-       EPOLLET       = 0x80000000
-       EPOLL_CLOEXEC = 0x80000
-       EPOLL_CTL_ADD = 0x1
-       EPOLL_CTL_DEL = 0x2
-       EPOLL_CTL_MOD = 0x3
-)
-
-type EpollEvent struct {
-       Events    uint32
-       pad_cgo_0 [4]byte
-       Data      [8]byte // unaligned uintptr
-}

diff --git a/src/runtime/internal/syscall/syscall_linux.go b/src/runtime/internal/syscall/syscall_linux.go
index a103d318c4391499d2a3bd78b5404ca0d11e1be7..7f268e8fba108ab538f2ae67d14666e9fcf61cce 100644 (file)
--- 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)
-}

diff --git a/src/runtime/internal/syscall/syscall_linux_test.go b/src/runtime/internal/syscall/syscall_linux_test.go
deleted file mode 100644 (file)
index 1976da5..0000000
--- a/src/runtime/internal/syscall/syscall_linux_test.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2022 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syscall_test
-
-import (
-       "runtime/internal/syscall"
-       "testing"
-)
-
-func TestEpollctlErrorSign(t *testing.T) {
-       v := syscall.EpollCtl(-1, 1, -1, &syscall.EpollEvent{})
-
-       const EBADF = 0x09
-       if v != EBADF {
-               t.Errorf("epollctl = %v, want %v", v, EBADF)
-       }
-}

diff --git a/src/runtime/netpoll_epoll.go b/src/runtime/netpoll_epoll.go
index 7164a5955157179db1f2fd20a0bdafc2ca8f6ac7..09da662c92da3731f74eddbc269d9d50eb0190e0 100644 (file)
--- a/src/runtime/netpoll_epoll.go
+++ b/src/runtime/netpoll_epoll.go
@@ -8,10 +8,19 @@ package runtime
 
 import (
        "runtime/internal/atomic"
-       "runtime/internal/syscall"
        "unsafe"
 )
 
+func epollcreate(size int32) int32
+func epollcreate1(flags int32) int32
+
+//go:noescape
+func epollctl(epfd, op, fd int32, ev *epollevent) int32
+
+//go:noescape
+func epollwait(epfd int32, ev *epollevent, nev, timeout int32) int32
+func closeonexec(fd int32)
+
 var (
        epfd int32 = -1 // epoll descriptor
 
@@ -21,24 +30,27 @@ var (
 )
 
 func netpollinit() {
-       var errno uintptr
-       epfd, errno = syscall.EpollCreate1(syscall.EPOLL_CLOEXEC)
-       if errno != 0 {
-               println("runtime: epollcreate failed with", errno)
-               throw("runtime: netpollinit failed")
+       epfd = epollcreate1(_EPOLL_CLOEXEC)
+       if epfd < 0 {
+               epfd = epollcreate(1024)
+               if epfd < 0 {
+                       println("runtime: epollcreate failed with", -epfd)
+                       throw("runtime: netpollinit failed")
+               }
+               closeonexec(epfd)
        }
-       r, w, errpipe := nonblockingPipe()
-       if errpipe != 0 {
-               println("runtime: pipe failed with", -errpipe)
+       r, w, errno := nonblockingPipe()
+       if errno != 0 {
+               println("runtime: pipe failed with", -errno)
                throw("runtime: pipe failed")
        }
-       ev := syscall.EpollEvent{
-               Events: syscall.EPOLLIN,
+       ev := epollevent{
+               events: _EPOLLIN,
        }
-       *(**uintptr)(unsafe.Pointer(&ev.Data)) = &netpollBreakRd
-       errno = syscall.EpollCtl(epfd, syscall.EPOLL_CTL_ADD, r, &ev)
+       *(**uintptr)(unsafe.Pointer(&ev.data)) = &netpollBreakRd
+       errno = epollctl(epfd, _EPOLL_CTL_ADD, r, &ev)
        if errno != 0 {
-               println("runtime: epollctl failed with", errno)
+               println("runtime: epollctl failed with", -errno)
                throw("runtime: epollctl failed")
        }
        netpollBreakRd = uintptr(r)
@@ -49,16 +61,16 @@ func netpollIsPollDescriptor(fd uintptr) bool {
        return fd == uintptr(epfd) || fd == netpollBreakRd || fd == netpollBreakWr
 }
 
-func netpollopen(fd uintptr, pd *pollDesc) uintptr {
-       var ev syscall.EpollEvent
-       ev.Events = syscall.EPOLLIN | syscall.EPOLLOUT | syscall.EPOLLRDHUP | syscall.EPOLLET
-       *(**pollDesc)(unsafe.Pointer(&ev.Data)) = pd
-       return syscall.EpollCtl(epfd, syscall.EPOLL_CTL_ADD, int32(fd), &ev)
+func netpollopen(fd uintptr, pd *pollDesc) int32 {
+       var ev epollevent
+       ev.events = _EPOLLIN | _EPOLLOUT | _EPOLLRDHUP | _EPOLLET
+       *(**pollDesc)(unsafe.Pointer(&ev.data)) = pd
+       return -epollctl(epfd, _EPOLL_CTL_ADD, int32(fd), &ev)
 }
 
-func netpollclose(fd uintptr) uintptr {
-       var ev syscall.EpollEvent
-       return syscall.EpollCtl(epfd, syscall.EPOLL_CTL_DEL, int32(fd), &ev)
+func netpollclose(fd uintptr) int32 {
+       var ev epollevent
+       return -epollctl(epfd, _EPOLL_CTL_DEL, int32(fd), &ev)
 }
 
 func netpollarm(pd *pollDesc, mode int) {
@@ -112,12 +124,12 @@ func netpoll(delay int64) gList {
                // 1e9 ms == ~11.5 days.
                waitms = 1e9
        }
-       var events [128]syscall.EpollEvent
+       var events [128]epollevent
 retry:
-       n, errno := syscall.EpollWait(epfd, events[:], int32(len(events)), waitms)
-       if errno != 0 {
-               if errno != _EINTR {
-                       println("runtime: epollwait on fd", epfd, "failed with", errno)
+       n := epollwait(epfd, &events[0], int32(len(events)), waitms)
+       if n < 0 {
+               if n != -_EINTR {
+                       println("runtime: epollwait on fd", epfd, "failed with", -n)
                        throw("runtime: netpoll failed")
                }
                // If a timed sleep was interrupted, just return to
@@ -129,14 +141,14 @@ retry:
        }
        var toRun gList
        for i := int32(0); i < n; i++ {
-               ev := events[i]
-               if ev.Events == 0 {
+               ev := &events[i]
+               if ev.events == 0 {
                        continue
                }
 
-               if *(**uintptr)(unsafe.Pointer(&ev.Data)) == &netpollBreakRd {
-                       if ev.Events != syscall.EPOLLIN {
-                               println("runtime: netpoll: break fd ready for", ev.Events)
+               if *(**uintptr)(unsafe.Pointer(&ev.data)) == &netpollBreakRd {
+                       if ev.events != _EPOLLIN {
+                               println("runtime: netpoll: break fd ready for", ev.events)
                                throw("runtime: netpoll: break fd ready for something unexpected")
                        }
                        if delay != 0 {
@@ -151,15 +163,15 @@ retry:
                }
 
                var mode int32
-               if ev.Events&(syscall.EPOLLIN|syscall.EPOLLRDHUP|syscall.EPOLLHUP|syscall.EPOLLERR) != 0 {
+               if ev.events&(_EPOLLIN|_EPOLLRDHUP|_EPOLLHUP|_EPOLLERR) != 0 {
                        mode += 'r'
                }
-               if ev.Events&(syscall.EPOLLOUT|syscall.EPOLLHUP|syscall.EPOLLERR) != 0 {
+               if ev.events&(_EPOLLOUT|_EPOLLHUP|_EPOLLERR) != 0 {
                        mode += 'w'
                }
                if mode != 0 {
-                       pd := *(**pollDesc)(unsafe.Pointer(&ev.Data))
-                       pd.setEventErr(ev.Events == syscall.EPOLLERR)
+                       pd := *(**pollDesc)(unsafe.Pointer(&ev.data))
+                       pd.setEventErr(ev.events == _EPOLLERR)
                        netpollready(&toRun, pd, mode)
                }
        }

diff --git a/src/runtime/runtime_linux_test.go b/src/runtime/runtime_linux_test.go
index 6af5561e910d520492829413197f95a7d7063d9a..a753aeea583d66e549faa192421f9134d5febc20 100644 (file)
--- a/src/runtime/runtime_linux_test.go
+++ b/src/runtime/runtime_linux_test.go
@@ -53,6 +53,15 @@ func TestMincoreErrorSign(t *testing.T) {
        }
 }
 
+func TestEpollctlErrorSign(t *testing.T) {
+       v := Epollctl(-1, 1, -1, unsafe.Pointer(&EpollEvent{}))
+
+       const EBADF = 0x09
+       if v != -EBADF {
+               t.Errorf("epollctl = %v, want %v", v, -EBADF)
+       }
+}
+
 func TestKernelStructSize(t *testing.T) {
        // Check that the Go definitions of structures exchanged with the kernel are
        // the same size as what the kernel defines.

diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
index 4f5b34b99631f2eba85b835df8200d92c7610ba6..4942f21e4f430c93a9c1e5c6ad9f20a6087487bf 100644 (file)
--- a/src/runtime/sys_linux_386.s
+++ b/src/runtime/sys_linux_386.s
@@ -33,6 +33,7 @@
 #define SYS_access             33
 #define SYS_kill               37
 #define SYS_brk                45
+#define SYS_fcntl              55
 #define SYS_munmap             91
 #define SYS_socketcall         102
 #define SYS_setittimer         104
@@ -51,11 +52,15 @@
 #define SYS_sched_getaffinity  242
 #define SYS_set_thread_area    243
 #define SYS_exit_group         252
+#define SYS_epoll_create       254
+#define SYS_epoll_ctl          255
+#define SYS_epoll_wait         256
 #define SYS_timer_create       259
 #define SYS_timer_settime      260
 #define SYS_timer_delete       263
 #define SYS_clock_gettime      265
 #define SYS_tgkill             270
+#define SYS_epoll_create1      329
 #define SYS_pipe2              331
 
 TEXT runtime·exit(SB),NOSPLIT,$0
@@ -721,6 +726,53 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT,$0
        MOVL    AX, ret+12(FP)
        RET
 
+// int32 runtime·epollcreate(int32 size);
+TEXT runtime·epollcreate(SB),NOSPLIT,$0
+       MOVL    $SYS_epoll_create, AX
+       MOVL    size+0(FP), BX
+       INVOKE_SYSCALL
+       MOVL    AX, ret+4(FP)
+       RET
+
+// int32 runtime·epollcreate1(int32 flags);
+TEXT runtime·epollcreate1(SB),NOSPLIT,$0
+       MOVL    $SYS_epoll_create1, AX
+       MOVL    flags+0(FP), BX
+       INVOKE_SYSCALL
+       MOVL    AX, ret+4(FP)
+       RET
+
+// func epollctl(epfd, op, fd int32, ev *epollEvent) int
+TEXT runtime·epollctl(SB),NOSPLIT,$0
+       MOVL    $SYS_epoll_ctl, AX
+       MOVL    epfd+0(FP), BX
+       MOVL    op+4(FP), CX
+       MOVL    fd+8(FP), DX
+       MOVL    ev+12(FP), SI
+       INVOKE_SYSCALL
+       MOVL    AX, ret+16(FP)
+       RET
+
+// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout);
+TEXT runtime·epollwait(SB),NOSPLIT,$0
+       MOVL    $SYS_epoll_wait, AX
+       MOVL    epfd+0(FP), BX
+       MOVL    ev+4(FP), CX
+       MOVL    nev+8(FP), DX
+       MOVL    timeout+12(FP), SI
+       INVOKE_SYSCALL
+       MOVL    AX, ret+16(FP)
+       RET
+
+// void runtime·closeonexec(int32 fd);
+TEXT runtime·closeonexec(SB),NOSPLIT,$0
+       MOVL    $SYS_fcntl, AX
+       MOVL    fd+0(FP), BX  // fd
+       MOVL    $2, CX  // F_SETFD
+       MOVL    $1, DX  // FD_CLOEXEC
+       INVOKE_SYSCALL
+       RET
+
 // int access(const char *name, int mode)
 TEXT runtime·access(SB),NOSPLIT,$0
        MOVL    $SYS_access, AX

diff --git a/src/runtime/sys_linux_amd64.s b/src/runtime/sys_linux_amd64.s
index d91f9bd31f13640b044ab15ea16a1bdba45afc73..ca6ecb13eb7e06d98316e2c715445b46ce655ef0 100644 (file)
--- a/src/runtime/sys_linux_amd64.s
+++ b/src/runtime/sys_linux_amd64.s
@@ -33,19 +33,24 @@
 #define SYS_clone              56
 #define SYS_exit               60
 #define SYS_kill               62
+#define SYS_fcntl              72
 #define SYS_sigaltstack        131
 #define SYS_arch_prctl         158
 #define SYS_gettid             186
 #define SYS_futex              202
 #define SYS_sched_getaffinity  204
+#define SYS_epoll_create       213
 #define SYS_timer_create       222
 #define SYS_timer_settime      223
 #define SYS_timer_delete       226
 #define SYS_clock_gettime      228
 #define SYS_exit_group         231
+#define SYS_epoll_ctl          233
 #define SYS_tgkill             234
 #define SYS_openat             257
 #define SYS_faccessat          269
+#define SYS_epoll_pwait                281
+#define SYS_epoll_create1      291
 #define SYS_pipe2              293
 
 TEXT runtime·exit(SB),NOSPLIT,$0-4
@@ -661,6 +666,55 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT,$0
        MOVL    AX, ret+24(FP)
        RET
 
+// int32 runtime·epollcreate(int32 size);
+TEXT runtime·epollcreate(SB),NOSPLIT,$0
+       MOVL    size+0(FP), DI
+       MOVL    $SYS_epoll_create, AX
+       SYSCALL
+       MOVL    AX, ret+8(FP)
+       RET
+
+// int32 runtime·epollcreate1(int32 flags);
+TEXT runtime·epollcreate1(SB),NOSPLIT,$0
+       MOVL    flags+0(FP), DI
+       MOVL    $SYS_epoll_create1, AX
+       SYSCALL
+       MOVL    AX, ret+8(FP)
+       RET
+
+// func epollctl(epfd, op, fd int32, ev *epollEvent) int
+TEXT runtime·epollctl(SB),NOSPLIT,$0
+       MOVL    epfd+0(FP), DI
+       MOVL    op+4(FP), SI
+       MOVL    fd+8(FP), DX
+       MOVQ    ev+16(FP), R10
+       MOVL    $SYS_epoll_ctl, AX
+       SYSCALL
+       MOVL    AX, ret+24(FP)
+       RET
+
+// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout);
+TEXT runtime·epollwait(SB),NOSPLIT,$0
+       // This uses pwait instead of wait, because Android O blocks wait.
+       MOVL    epfd+0(FP), DI
+       MOVQ    ev+8(FP), SI
+       MOVL    nev+16(FP), DX
+       MOVL    timeout+20(FP), R10
+       MOVQ    $0, R8
+       MOVL    $SYS_epoll_pwait, AX
+       SYSCALL
+       MOVL    AX, ret+24(FP)
+       RET
+
+// void runtime·closeonexec(int32 fd);
+TEXT runtime·closeonexec(SB),NOSPLIT,$0
+       MOVL    fd+0(FP), DI  // fd
+       MOVQ    $2, SI  // F_SETFD
+       MOVQ    $1, DX  // FD_CLOEXEC
+       MOVL    $SYS_fcntl, AX
+       SYSCALL
+       RET
+
 // int access(const char *name, int mode)
 TEXT runtime·access(SB),NOSPLIT,$0
        // This uses faccessat instead of access, because Android O blocks access.

diff --git a/src/runtime/sys_linux_arm.s b/src/runtime/sys_linux_arm.s
index 1bc9e86d6d37df05f30dec0874b410413efcdad1..9ac64328c19523a534d271483259c05bae99b44d 100644 (file)
--- a/src/runtime/sys_linux_arm.s
+++ b/src/runtime/sys_linux_arm.s
@@ -41,10 +41,15 @@
 #define SYS_nanosleep (SYS_BASE + 162)
 #define SYS_sched_getaffinity (SYS_BASE + 242)
 #define SYS_clock_gettime (SYS_BASE + 263)
+#define SYS_epoll_create (SYS_BASE + 250)
+#define SYS_epoll_ctl (SYS_BASE + 251)
+#define SYS_epoll_wait (SYS_BASE + 252)
 #define SYS_timer_create (SYS_BASE + 257)
 #define SYS_timer_settime (SYS_BASE + 258)
 #define SYS_timer_delete (SYS_BASE + 261)
+#define SYS_epoll_create1 (SYS_BASE + 357)
 #define SYS_pipe2 (SYS_BASE + 359)
+#define SYS_fcntl (SYS_BASE + 55)
 #define SYS_access (SYS_BASE + 33)
 #define SYS_connect (SYS_BASE + 283)
 #define SYS_socket (SYS_BASE + 281)
@@ -611,6 +616,53 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT,$0
        MOVW    R0, ret+12(FP)
        RET
 
+// int32 runtime·epollcreate(int32 size)
+TEXT runtime·epollcreate(SB),NOSPLIT,$0
+       MOVW    size+0(FP), R0
+       MOVW    $SYS_epoll_create, R7
+       SWI     $0
+       MOVW    R0, ret+4(FP)
+       RET
+
+// int32 runtime·epollcreate1(int32 flags)
+TEXT runtime·epollcreate1(SB),NOSPLIT,$0
+       MOVW    flags+0(FP), R0
+       MOVW    $SYS_epoll_create1, R7
+       SWI     $0
+       MOVW    R0, ret+4(FP)
+       RET
+
+// func epollctl(epfd, op, fd int32, ev *epollEvent) int
+TEXT runtime·epollctl(SB),NOSPLIT,$0
+       MOVW    epfd+0(FP), R0
+       MOVW    op+4(FP), R1
+       MOVW    fd+8(FP), R2
+       MOVW    ev+12(FP), R3
+       MOVW    $SYS_epoll_ctl, R7
+       SWI     $0
+       MOVW    R0, ret+16(FP)
+       RET
+
+// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout)
+TEXT runtime·epollwait(SB),NOSPLIT,$0
+       MOVW    epfd+0(FP), R0
+       MOVW    ev+4(FP), R1
+       MOVW    nev+8(FP), R2
+       MOVW    timeout+12(FP), R3
+       MOVW    $SYS_epoll_wait, R7
+       SWI     $0
+       MOVW    R0, ret+16(FP)
+       RET
+
+// void runtime·closeonexec(int32 fd)
+TEXT runtime·closeonexec(SB),NOSPLIT,$0
+       MOVW    fd+0(FP), R0    // fd
+       MOVW    $2, R1  // F_SETFD
+       MOVW    $1, R2  // FD_CLOEXEC
+       MOVW    $SYS_fcntl, R7
+       SWI     $0
+       RET
+
 // b __kuser_get_tls @ 0xffff0fe0
 TEXT runtime·read_tls_fallback(SB),NOSPLIT|NOFRAME,$0
        MOVW    $0xffff0fe0, R0

diff --git a/src/runtime/sys_linux_arm64.s b/src/runtime/sys_linux_arm64.s
index 04a2cd2da1fcec36d5148e0e3ff64ba5a988196b..b47b6fd0a05f6d857deb78e38a4a97facd28010e 100644 (file)
--- a/src/runtime/sys_linux_arm64.s
+++ b/src/runtime/sys_linux_arm64.s
@@ -22,6 +22,7 @@
 #define SYS_openat             56
 #define SYS_close              57
 #define SYS_pipe2              59
+#define SYS_fcntl              25
 #define SYS_nanosleep          101
 #define SYS_mmap               222
 #define SYS_munmap             215
@@ -41,6 +42,9 @@
 #define SYS_futex              98
 #define SYS_sched_getaffinity  123
 #define SYS_exit_group         94
+#define SYS_epoll_create1      20
+#define SYS_epoll_ctl          21
+#define SYS_epoll_pwait                22
 #define SYS_clock_gettime      113
 #define SYS_faccessat          48
 #define SYS_socket             198
@@ -758,6 +762,54 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT|NOFRAME,$0
        MOVW    R0, ret+24(FP)
        RET
 
+// int32 runtime·epollcreate(int32 size);
+TEXT runtime·epollcreate(SB),NOSPLIT|NOFRAME,$0
+       MOVW    $0, R0
+       MOVD    $SYS_epoll_create1, R8
+       SVC
+       MOVW    R0, ret+8(FP)
+       RET
+
+// int32 runtime·epollcreate1(int32 flags);
+TEXT runtime·epollcreate1(SB),NOSPLIT|NOFRAME,$0
+       MOVW    flags+0(FP), R0
+       MOVD    $SYS_epoll_create1, R8
+       SVC
+       MOVW    R0, ret+8(FP)
+       RET
+
+// func epollctl(epfd, op, fd int32, ev *epollEvent) int
+TEXT runtime·epollctl(SB),NOSPLIT|NOFRAME,$0
+       MOVW    epfd+0(FP), R0
+       MOVW    op+4(FP), R1
+       MOVW    fd+8(FP), R2
+       MOVD    ev+16(FP), R3
+       MOVD    $SYS_epoll_ctl, R8
+       SVC
+       MOVW    R0, ret+24(FP)
+       RET
+
+// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout);
+TEXT runtime·epollwait(SB),NOSPLIT|NOFRAME,$0
+       MOVW    epfd+0(FP), R0
+       MOVD    ev+8(FP), R1
+       MOVW    nev+16(FP), R2
+       MOVW    timeout+20(FP), R3
+       MOVD    $0, R4
+       MOVD    $SYS_epoll_pwait, R8
+       SVC
+       MOVW    R0, ret+24(FP)
+       RET
+
+// void runtime·closeonexec(int32 fd);
+TEXT runtime·closeonexec(SB),NOSPLIT|NOFRAME,$0
+       MOVW    fd+0(FP), R0  // fd
+       MOVD    $2, R1  // F_SETFD
+       MOVD    $1, R2  // FD_CLOEXEC
+       MOVD    $SYS_fcntl, R8
+       SVC
+       RET
+
 // int access(const char *name, int mode)
 TEXT runtime·access(SB),NOSPLIT,$0-20
        MOVD    $AT_FDCWD, R0

diff --git a/src/runtime/sys_linux_loong64.s b/src/runtime/sys_linux_loong64.s
index 5705c37496598663961e947806e485301119f194..36a92df87cf6a55a8c483cde9b5038fa23109910 100644 (file)
--- a/src/runtime/sys_linux_loong64.s
+++ b/src/runtime/sys_linux_loong64.s
@@ -18,6 +18,7 @@
 #define SYS_close              57
 #define SYS_getpid             172
 #define SYS_kill               129
+#define SYS_fcntl              25
 #define SYS_mmap               222
 #define SYS_munmap             215
 #define SYS_setitimer          103
@@ -34,9 +35,12 @@
 #define SYS_futex              98
 #define SYS_sched_getaffinity  123
 #define SYS_exit_group         94
+#define SYS_epoll_ctl          21
 #define SYS_tgkill             131
 #define SYS_openat             56
+#define SYS_epoll_pwait                22
 #define SYS_clock_gettime      113
+#define SYS_epoll_create1      20
 #define SYS_brk                        214
 #define SYS_pipe2              59
 #define SYS_timer_create       107
@@ -530,6 +534,54 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT|NOFRAME,$0
        MOVW    R4, ret+24(FP)
        RET
 
+// int32 runtime·epollcreate(int32 size);
+TEXT runtime·epollcreate(SB),NOSPLIT|NOFRAME,$0
+       MOVW    size+0(FP), R4
+       MOVV    $SYS_epoll_create1, R11
+       SYSCALL
+       MOVW    R4, ret+8(FP)
+       RET
+
+// int32 runtime·epollcreate1(int32 flags);
+TEXT runtime·epollcreate1(SB),NOSPLIT|NOFRAME,$0
+       MOVW    flags+0(FP), R4
+       MOVV    $SYS_epoll_create1, R11
+       SYSCALL
+       MOVW    R4, ret+8(FP)
+       RET
+
+// func epollctl(epfd, op, fd int32, ev *epollEvent) int
+TEXT runtime·epollctl(SB),NOSPLIT|NOFRAME,$0
+       MOVW    epfd+0(FP), R4
+       MOVW    op+4(FP), R5
+       MOVW    fd+8(FP), R6
+       MOVV    ev+16(FP), R7
+       MOVV    $SYS_epoll_ctl, R11
+       SYSCALL
+       MOVW    R4, ret+24(FP)
+       RET
+
+// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout);
+TEXT runtime·epollwait(SB),NOSPLIT|NOFRAME,$0
+       MOVW    epfd+0(FP), R4
+       MOVV    ev+8(FP), R5
+       MOVW    nev+16(FP), R6
+       MOVW    timeout+20(FP), R7
+       MOVV    $0, R8
+       MOVV    $SYS_epoll_pwait, R11
+       SYSCALL
+       MOVW    R4, ret+24(FP)
+       RET
+
+// void runtime·closeonexec(int32 fd);
+TEXT runtime·closeonexec(SB),NOSPLIT|NOFRAME,$0
+       MOVW    fd+0(FP), R4  // fd
+       MOVV    $2, R5  // F_SETFD
+       MOVV    $1, R6  // FD_CLOEXEC
+       MOVV    $SYS_fcntl, R11
+       SYSCALL
+       RET
+
 // func sbrk0() uintptr
 TEXT runtime·sbrk0(SB),NOSPLIT|NOFRAME,$0-8
        // Implemented as brk(NULL).

diff --git a/src/runtime/sys_linux_mips64x.s b/src/runtime/sys_linux_mips64x.s
index 5d113395849b62a3639edeb0ad84c99534b64d1f..06d54dff78f0c60df0fb9c8bbd382f70e725b1ee 100644 (file)
--- a/src/runtime/sys_linux_mips64x.s
+++ b/src/runtime/sys_linux_mips64x.s
@@ -20,6 +20,7 @@
 #define SYS_close              5003
 #define SYS_getpid             5038
 #define SYS_kill               5060
+#define SYS_fcntl              5070
 #define SYS_mmap               5009
 #define SYS_munmap             5011
 #define SYS_setitimer          5036
@@ -36,12 +37,16 @@
 #define SYS_futex              5194
 #define SYS_sched_getaffinity  5196
 #define SYS_exit_group         5205
+#define SYS_epoll_create       5207
+#define SYS_epoll_ctl          5208
 #define SYS_timer_create       5216
 #define SYS_timer_settime      5217
 #define SYS_timer_delete       5220
 #define SYS_tgkill             5225
 #define SYS_openat             5247
+#define SYS_epoll_pwait                5272
 #define SYS_clock_gettime      5222
+#define SYS_epoll_create1      5285
 #define SYS_brk                        5012
 #define SYS_pipe2              5287
 
@@ -563,6 +568,62 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT|NOFRAME,$0
        MOVW    R2, ret+24(FP)
        RET
 
+// int32 runtime·epollcreate(int32 size);
+TEXT runtime·epollcreate(SB),NOSPLIT|NOFRAME,$0
+       MOVW    size+0(FP), R4
+       MOVV    $SYS_epoll_create, R2
+       SYSCALL
+       BEQ     R7, 2(PC)
+       SUBVU   R2, R0, R2      // caller expects negative errno
+       MOVW    R2, ret+8(FP)
+       RET
+
+// int32 runtime·epollcreate1(int32 flags);
+TEXT runtime·epollcreate1(SB),NOSPLIT|NOFRAME,$0
+       MOVW    flags+0(FP), R4
+       MOVV    $SYS_epoll_create1, R2
+       SYSCALL
+       BEQ     R7, 2(PC)
+       SUBVU   R2, R0, R2      // caller expects negative errno
+       MOVW    R2, ret+8(FP)
+       RET
+
+// func epollctl(epfd, op, fd int32, ev *epollEvent) int
+TEXT runtime·epollctl(SB),NOSPLIT|NOFRAME,$0
+       MOVW    epfd+0(FP), R4
+       MOVW    op+4(FP), R5
+       MOVW    fd+8(FP), R6
+       MOVV    ev+16(FP), R7
+       MOVV    $SYS_epoll_ctl, R2
+       SYSCALL
+       SUBVU   R2, R0, R2      // caller expects negative errno
+       MOVW    R2, ret+24(FP)
+       RET
+
+// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout);
+TEXT runtime·epollwait(SB),NOSPLIT|NOFRAME,$0
+       // This uses pwait instead of wait, because Android O blocks wait.
+       MOVW    epfd+0(FP), R4
+       MOVV    ev+8(FP), R5
+       MOVW    nev+16(FP), R6
+       MOVW    timeout+20(FP), R7
+       MOVV    $0, R8
+       MOVV    $SYS_epoll_pwait, R2
+       SYSCALL
+       BEQ     R7, 2(PC)
+       SUBVU   R2, R0, R2      // caller expects negative errno
+       MOVW    R2, ret+24(FP)
+       RET
+
+// void runtime·closeonexec(int32 fd);
+TEXT runtime·closeonexec(SB),NOSPLIT|NOFRAME,$0
+       MOVW    fd+0(FP), R4  // fd
+       MOVV    $2, R5  // F_SETFD
+       MOVV    $1, R6  // FD_CLOEXEC
+       MOVV    $SYS_fcntl, R2
+       SYSCALL
+       RET
+
 // func sbrk0() uintptr
 TEXT runtime·sbrk0(SB),NOSPLIT|NOFRAME,$0-8
        // Implemented as brk(NULL).

diff --git a/src/runtime/sys_linux_mipsx.s b/src/runtime/sys_linux_mipsx.s
index c4507c609885818104b698cb1b65c31efed3290e..e70edcc0e22fdc017b2c6e770dcb026f78f4a7f8 100644 (file)
--- a/src/runtime/sys_linux_mipsx.s
+++ b/src/runtime/sys_linux_mipsx.s
@@ -20,6 +20,7 @@
 #define SYS_getpid             4020
 #define SYS_kill               4037
 #define SYS_brk                        4045
+#define SYS_fcntl              4055
 #define SYS_mmap               4090
 #define SYS_munmap             4091
 #define SYS_setitimer          4104
@@ -36,11 +37,15 @@
 #define SYS_futex              4238
 #define SYS_sched_getaffinity  4240
 #define SYS_exit_group         4246
+#define SYS_epoll_create       4248
+#define SYS_epoll_ctl          4249
+#define SYS_epoll_wait         4250
 #define SYS_timer_create       4257
 #define SYS_timer_settime      4258
 #define SYS_timer_delete       4261
 #define SYS_clock_gettime      4263
 #define SYS_tgkill             4266
+#define SYS_epoll_create1      4326
 #define SYS_pipe2              4328
 
 TEXT runtime·exit(SB),NOSPLIT,$0-4
@@ -482,6 +487,60 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT,$0-16
        MOVW    R2, ret+12(FP)
        RET
 
+// int32 runtime·epollcreate(int32 size);
+TEXT runtime·epollcreate(SB),NOSPLIT,$0-8
+       MOVW    size+0(FP), R4
+       MOVW    $SYS_epoll_create, R2
+       SYSCALL
+       BEQ     R7, 2(PC)
+       SUBU    R2, R0, R2      // caller expects negative errno
+       MOVW    R2, ret+4(FP)
+       RET
+
+// int32 runtime·epollcreate1(int32 flags);
+TEXT runtime·epollcreate1(SB),NOSPLIT,$0-8
+       MOVW    flags+0(FP), R4
+       MOVW    $SYS_epoll_create1, R2
+       SYSCALL
+       BEQ     R7, 2(PC)
+       SUBU    R2, R0, R2      // caller expects negative errno
+       MOVW    R2, ret+4(FP)
+       RET
+
+// func epollctl(epfd, op, fd int32, ev *epollEvent) int
+TEXT runtime·epollctl(SB),NOSPLIT,$0-20
+       MOVW    epfd+0(FP), R4
+       MOVW    op+4(FP), R5
+       MOVW    fd+8(FP), R6
+       MOVW    ev+12(FP), R7
+       MOVW    $SYS_epoll_ctl, R2
+       SYSCALL
+       SUBU    R2, R0, R2      // caller expects negative errno
+       MOVW    R2, ret+16(FP)
+       RET
+
+// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout);
+TEXT runtime·epollwait(SB),NOSPLIT,$0-20
+       MOVW    epfd+0(FP), R4
+       MOVW    ev+4(FP), R5
+       MOVW    nev+8(FP), R6
+       MOVW    timeout+12(FP), R7
+       MOVW    $SYS_epoll_wait, R2
+       SYSCALL
+       BEQ     R7, 2(PC)
+       SUBU    R2, R0, R2      // caller expects negative errno
+       MOVW    R2, ret+16(FP)
+       RET
+
+// void runtime·closeonexec(int32 fd);
+TEXT runtime·closeonexec(SB),NOSPLIT,$0-4
+       MOVW    fd+0(FP), R4    // fd
+       MOVW    $2, R5  // F_SETFD
+       MOVW    $1, R6  // FD_CLOEXEC
+       MOVW    $SYS_fcntl, R2
+       SYSCALL
+       RET
+
 // func sbrk0() uintptr
 TEXT runtime·sbrk0(SB),NOSPLIT,$0-4
        // Implemented as brk(NULL).

diff --git a/src/runtime/sys_linux_ppc64x.s b/src/runtime/sys_linux_ppc64x.s
index 853008d5fe937cfcf75bfb73deab4f2a3586967e..2913a05f56f86e9f2670a07a7a841cbe48f49125 100644 (file)
--- a/src/runtime/sys_linux_ppc64x.s
+++ b/src/runtime/sys_linux_ppc64x.s
@@ -21,6 +21,7 @@
 #define SYS_getpid              20
 #define SYS_kill                37
 #define SYS_brk                         45
+#define SYS_fcntl               55
 #define SYS_mmap                90
 #define SYS_munmap              91
 #define SYS_setitimer          104
@@ -37,11 +38,15 @@
 #define SYS_futex              221
 #define SYS_sched_getaffinity  223
 #define SYS_exit_group         234
+#define SYS_epoll_create       236
+#define SYS_epoll_ctl          237
+#define SYS_epoll_wait         238
 #define SYS_timer_create       240
 #define SYS_timer_settime      241
 #define SYS_timer_delete       244
 #define SYS_clock_gettime      246
 #define SYS_tgkill             250
+#define SYS_epoll_create1      315
 #define SYS_pipe2              317
 
 TEXT runtime·exit(SB),NOSPLIT|NOFRAME,$0-4
@@ -871,6 +876,55 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT|NOFRAME,$0
        MOVW    R3, ret+24(FP)
        RET
 
+// int32 runtime·epollcreate(int32 size);
+TEXT runtime·epollcreate(SB),NOSPLIT|NOFRAME,$0
+       MOVW    size+0(FP), R3
+       SYSCALL $SYS_epoll_create
+       BVC     2(PC)
+       NEG     R3      // caller expects negative errno
+       MOVW    R3, ret+8(FP)
+       RET
+
+// int32 runtime·epollcreate1(int32 flags);
+TEXT runtime·epollcreate1(SB),NOSPLIT|NOFRAME,$0
+       MOVW    flags+0(FP), R3
+       SYSCALL $SYS_epoll_create1
+       BVC     2(PC)
+       NEG     R3      // caller expects negative errno
+       MOVW    R3, ret+8(FP)
+       RET
+
+// func epollctl(epfd, op, fd int32, ev *epollEvent) int
+TEXT runtime·epollctl(SB),NOSPLIT|NOFRAME,$0
+       MOVW    epfd+0(FP), R3
+       MOVW    op+4(FP), R4
+       MOVW    fd+8(FP), R5
+       MOVD    ev+16(FP), R6
+       SYSCALL $SYS_epoll_ctl
+       NEG     R3      // caller expects negative errno
+       MOVW    R3, ret+24(FP)
+       RET
+
+// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout);
+TEXT runtime·epollwait(SB),NOSPLIT|NOFRAME,$0
+       MOVW    epfd+0(FP), R3
+       MOVD    ev+8(FP), R4
+       MOVW    nev+16(FP), R5
+       MOVW    timeout+20(FP), R6
+       SYSCALL $SYS_epoll_wait
+       BVC     2(PC)
+       NEG     R3      // caller expects negative errno
+       MOVW    R3, ret+24(FP)
+       RET
+
+// void runtime·closeonexec(int32 fd);
+TEXT runtime·closeonexec(SB),NOSPLIT|NOFRAME,$0
+       MOVW    fd+0(FP), R3  // fd
+       MOVD    $2, R4  // F_SETFD
+       MOVD    $1, R5  // FD_CLOEXEC
+       SYSCALL $SYS_fcntl
+       RET
+
 // func sbrk0() uintptr
 TEXT runtime·sbrk0(SB),NOSPLIT|NOFRAME,$0
        // Implemented as brk(NULL).

diff --git a/src/runtime/sys_linux_riscv64.s b/src/runtime/sys_linux_riscv64.s
index f4fb1c124b2bdeaf9944113372d2c77ee7ab47c9..afb2d11da98fdc6af4abdac1e0f3a4b228fd502f 100644 (file)
--- a/src/runtime/sys_linux_riscv64.s
+++ b/src/runtime/sys_linux_riscv64.s
@@ -18,9 +18,13 @@
 #define SYS_clone              220
 #define SYS_close              57
 #define SYS_connect            203
+#define SYS_epoll_create1      20
+#define SYS_epoll_ctl          21
+#define SYS_epoll_pwait                22
 #define SYS_exit               93
 #define SYS_exit_group         94
 #define SYS_faccessat          48
+#define SYS_fcntl              25
 #define SYS_futex              98
 #define SYS_getpid             172
 #define SYS_gettid             178
@@ -574,6 +578,54 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT|NOFRAME,$0
        MOV     A0, ret+24(FP)
        RET
 
+// func epollcreate(size int32) int32
+TEXT runtime·epollcreate(SB),NOSPLIT|NOFRAME,$0
+       MOV     $0, A0
+       MOV     $SYS_epoll_create1, A7
+       ECALL
+       MOVW    A0, ret+8(FP)
+       RET
+
+// func epollcreate1(flags int32) int32
+TEXT runtime·epollcreate1(SB),NOSPLIT|NOFRAME,$0
+       MOVW    flags+0(FP), A0
+       MOV     $SYS_epoll_create1, A7
+       ECALL
+       MOVW    A0, ret+8(FP)
+       RET
+
+// func epollctl(epfd, op, fd int32, ev *epollevent) int32
+TEXT runtime·epollctl(SB),NOSPLIT|NOFRAME,$0
+       MOVW    epfd+0(FP), A0
+       MOVW    op+4(FP), A1
+       MOVW    fd+8(FP), A2
+       MOV     ev+16(FP), A3
+       MOV     $SYS_epoll_ctl, A7
+       ECALL
+       MOVW    A0, ret+24(FP)
+       RET
+
+// func epollwait(epfd int32, ev *epollevent, nev, timeout int32) int32
+TEXT runtime·epollwait(SB),NOSPLIT|NOFRAME,$0
+       MOVW    epfd+0(FP), A0
+       MOV     ev+8(FP), A1
+       MOVW    nev+16(FP), A2
+       MOVW    timeout+20(FP), A3
+       MOV     $0, A4
+       MOV     $SYS_epoll_pwait, A7
+       ECALL
+       MOVW    A0, ret+24(FP)
+       RET
+
+// func closeonexec(int32)
+TEXT runtime·closeonexec(SB),NOSPLIT|NOFRAME,$0
+       MOVW    fd+0(FP), A0  // fd
+       MOV     $2, A1  // F_SETFD
+       MOV     $1, A2  // FD_CLOEXEC
+       MOV     $SYS_fcntl, A7
+       ECALL
+       RET
+
 // func sbrk0() uintptr
 TEXT runtime·sbrk0(SB),NOSPLIT,$0-8
        // Implemented as brk(NULL).

diff --git a/src/runtime/sys_linux_s390x.s b/src/runtime/sys_linux_s390x.s
index 777a4747d489d6f913da79bcc62c3dd59518acae..c82cb9b4aab12634de4e39d607b4a66f5bd35c5d 100644 (file)
--- a/src/runtime/sys_linux_s390x.s
+++ b/src/runtime/sys_linux_s390x.s
@@ -17,6 +17,7 @@
 #define SYS_getpid               20
 #define SYS_kill                 37
 #define SYS_brk                         45
+#define SYS_fcntl                55
 #define SYS_mmap                 90
 #define SYS_munmap               91
 #define SYS_setitimer           104
@@ -34,11 +35,15 @@
 #define SYS_sched_getaffinity   240
 #define SYS_tgkill              241
 #define SYS_exit_group          248
+#define SYS_epoll_create        249
+#define SYS_epoll_ctl           250
+#define SYS_epoll_wait          251
 #define SYS_timer_create        254
 #define SYS_timer_settime       255
 #define SYS_timer_delete        258
 #define SYS_clock_gettime       260
 #define SYS_pipe2              325
+#define SYS_epoll_create1       327
 
 TEXT runtime·exit(SB),NOSPLIT|NOFRAME,$0-4
        MOVW    code+0(FP), R2
@@ -584,6 +589,53 @@ TEXT runtime·sched_getaffinity(SB),NOSPLIT|NOFRAME,$0
        MOVW    R2, ret+24(FP)
        RET
 
+// int32 runtime·epollcreate(int32 size);
+TEXT runtime·epollcreate(SB),NOSPLIT|NOFRAME,$0
+       MOVW    size+0(FP), R2
+       MOVW    $SYS_epoll_create, R1
+       SYSCALL
+       MOVW    R2, ret+8(FP)
+       RET
+
+// int32 runtime·epollcreate1(int32 flags);
+TEXT runtime·epollcreate1(SB),NOSPLIT|NOFRAME,$0
+       MOVW    flags+0(FP), R2
+       MOVW    $SYS_epoll_create1, R1
+       SYSCALL
+       MOVW    R2, ret+8(FP)
+       RET
+
+// func epollctl(epfd, op, fd int32, ev *epollEvent) int
+TEXT runtime·epollctl(SB),NOSPLIT|NOFRAME,$0
+       MOVW    epfd+0(FP), R2
+       MOVW    op+4(FP), R3
+       MOVW    fd+8(FP), R4
+       MOVD    ev+16(FP), R5
+       MOVW    $SYS_epoll_ctl, R1
+       SYSCALL
+       MOVW    R2, ret+24(FP)
+       RET
+
+// int32 runtime·epollwait(int32 epfd, EpollEvent *ev, int32 nev, int32 timeout);
+TEXT runtime·epollwait(SB),NOSPLIT|NOFRAME,$0
+       MOVW    epfd+0(FP), R2
+       MOVD    ev+8(FP), R3
+       MOVW    nev+16(FP), R4
+       MOVW    timeout+20(FP), R5
+       MOVW    $SYS_epoll_wait, R1
+       SYSCALL
+       MOVW    R2, ret+24(FP)
+       RET
+
+// void runtime·closeonexec(int32 fd);
+TEXT runtime·closeonexec(SB),NOSPLIT|NOFRAME,$0
+       MOVW    fd+0(FP), R2  // fd
+       MOVD    $2, R3  // F_SETFD
+       MOVD    $1, R4  // FD_CLOEXEC
+       MOVW    $SYS_fcntl, R1
+       SYSCALL
+       RET
+
 // func sbrk0() uintptr
 TEXT runtime·sbrk0(SB),NOSPLIT|NOFRAME,$0-8
        // Implemented as brk(NULL).