From 73d015357032688a440c2302099d6300fe95839b Mon Sep 17 00:00:00 2001 From: Howard Yeh Date: Sat, 14 Sep 2019 13:14:45 +0800 Subject: [PATCH 1/4] go module --- go.mod | 5 +++++ go.sum | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 go.mod create mode 100644 go.sum diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..25564d4 --- /dev/null +++ b/go.mod @@ -0,0 +1,5 @@ +module github.com/mailru/easygo + +go 1.13 + +require golang.org/x/sys v0.0.0-20190913121621-c3b328c6e5a7 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..9bb0810 --- /dev/null +++ b/go.sum @@ -0,0 +1,2 @@ +golang.org/x/sys v0.0.0-20190913121621-c3b328c6e5a7 h1:wYqz/tQaWUgGKyx+B/rssSE6wkIKdY5Ee6ryOmzarIg= +golang.org/x/sys v0.0.0-20190913121621-c3b328c6e5a7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 9cefecf3201a9160326e9c6f635174c640c69070 Mon Sep 17 00:00:00 2001 From: Howard Yeh Date: Sat, 14 Sep 2019 13:15:06 +0800 Subject: [PATCH 2/4] kqueue support for 32-bit arch --- netpoll/kqueue.go | 12 ++---------- netpoll/kqueue_32.go | 14 ++++++++++++++ netpoll/kqueue_64.go | 14 ++++++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 netpoll/kqueue_32.go create mode 100644 netpoll/kqueue_64.go diff --git a/netpoll/kqueue.go b/netpoll/kqueue.go index 4b6e89b..71c44c5 100644 --- a/netpoll/kqueue.go +++ b/netpoll/kqueue.go @@ -191,7 +191,7 @@ type Kevent struct { Filter KeventFilter Flags KeventFlag Fflags uint32 - Data int64 + Data int } // Kevents is a fixed number of pairs of event filter and flags which can be @@ -378,7 +378,7 @@ func (k *Kqueue) wait(onError func(error)) { cb(Kevent{ Filter: KeventFilter(e.Filter), Flags: KeventFlag(e.Flags), - Data: e.Data, + Data: int(e.Data), Fflags: e.Fflags, }) cbs[i] = nil @@ -391,11 +391,3 @@ func (k *Kqueue) wait(onError func(error)) { } } } - -func evGet(fd int, filter KeventFilter, flags KeventFlag) unix.Kevent_t { - return unix.Kevent_t{ - Ident: uint64(fd), - Filter: int16(filter), - Flags: uint16(flags), - } -} diff --git a/netpoll/kqueue_32.go b/netpoll/kqueue_32.go new file mode 100644 index 0000000..34eaa83 --- /dev/null +++ b/netpoll/kqueue_32.go @@ -0,0 +1,14 @@ +// +build darwin dragonfly freebsd netbsd openbsd +// +build arm 386 + +package netpoll + +import "golang.org/x/sys/unix" + +func evGet(fd int, filter KeventFilter, flags KeventFlag) unix.Kevent_t { + return unix.Kevent_t{ + Ident: uint32(fd), + Filter: int16(filter), + Flags: uint16(flags), + } +} diff --git a/netpoll/kqueue_64.go b/netpoll/kqueue_64.go new file mode 100644 index 0000000..0341fa7 --- /dev/null +++ b/netpoll/kqueue_64.go @@ -0,0 +1,14 @@ +// +build darwin dragonfly freebsd netbsd openbsd +// +build arm64 amd64 + +package netpoll + +import "golang.org/x/sys/unix" + +func evGet(fd int, filter KeventFilter, flags KeventFlag) unix.Kevent_t { + return unix.Kevent_t{ + Ident: uint64(fd), + Filter: int16(filter), + Flags: uint16(flags), + } +} From af357d19464d7d365dab07072b520ac9864eb1c6 Mon Sep 17 00:00:00 2001 From: Howard Yeh Date: Sat, 14 Sep 2019 14:56:40 +0800 Subject: [PATCH 3/4] update travis --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c3b7c07..7e88837 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,4 @@ os: - osx go: - - 1.8 - -install: - - go get golang.org/x/sys/unix + - 1.13 From 7ac45a5385bf48c8b12e79c4e869b88e2f8c5b0d Mon Sep 17 00:00:00 2001 From: Howard Yeh Date: Sun, 15 Sep 2019 10:51:39 +0800 Subject: [PATCH 4/4] update travis to test go stable --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7e88837..c4b1ecd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,4 @@ os: - osx go: - - 1.13 + - stable