summaryrefslogtreecommitdiffhomepage
path: root/rwcancel
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-05-14 03:55:46 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-05-14 04:02:59 +0200
commit5f5503afa8c8b9cf2bc2bbe5a3a588e68eae15ef (patch)
tree093840a4c6b733495e1562054c33df4971dc67f2 /rwcancel
parentf738c45a68a34721af4ca2738be1f8389b372bfe (diff)
Add rwcancelation to darwin
Diffstat (limited to 'rwcancel')
-rw-r--r--rwcancel/rwcancel_unix.go4
-rw-r--r--rwcancel/select_darwin.go12
-rw-r--r--rwcancel/select_linux.go13
3 files changed, 27 insertions, 2 deletions
diff --git a/rwcancel/rwcancel_unix.go b/rwcancel/rwcancel_unix.go
index cd3661f..7f2c9e0 100644
--- a/rwcancel/rwcancel_unix.go
+++ b/rwcancel/rwcancel_unix.go
@@ -77,7 +77,7 @@ func (rw *RWCancel) ReadyRead() bool {
fdset := fdSet{}
fdset.set(rw.fd)
fdset.set(closeFd)
- _, err := unix.Select(max(rw.fd, closeFd)+1, &fdset.fdset, nil, nil, nil)
+ err := unixSelect(max(rw.fd, closeFd)+1, &fdset.fdset, nil, nil, nil)
if err != nil {
return false
}
@@ -92,7 +92,7 @@ func (rw *RWCancel) ReadyWrite() bool {
fdset := fdSet{}
fdset.set(rw.fd)
fdset.set(closeFd)
- _, err := unix.Select(max(rw.fd, closeFd)+1, nil, &fdset.fdset, nil, nil)
+ err := unixSelect(max(rw.fd, closeFd)+1, nil, &fdset.fdset, nil, nil)
if err != nil {
return false
}
diff --git a/rwcancel/select_darwin.go b/rwcancel/select_darwin.go
new file mode 100644
index 0000000..d14edc8
--- /dev/null
+++ b/rwcancel/select_darwin.go
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2017-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
+
+package rwcancel
+
+import "golang.org/x/sys/unix"
+
+func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) error {
+ return unix.Select(nfd, r, w, e, timeout)
+}
diff --git a/rwcancel/select_linux.go b/rwcancel/select_linux.go
new file mode 100644
index 0000000..c3d4e27
--- /dev/null
+++ b/rwcancel/select_linux.go
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2017-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
+
+package rwcancel
+
+import "golang.org/x/sys/unix"
+
+func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) (err error) {
+ _, err = unix.Select(nfd, r, w, e, timeout)
+ return
+}