zishuo/libp2p
1
0
Fork 0
mirror of https://github.com/libp2p/go-reuseport.git synced 2025-09-26 19:01:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix building on 32bit freebsd

Browse Source 
In general, dedup and cleanup kpoll support.
This commit is contained in:
Steven Allen
2018-03-22 19:15:20 -07:00
parent 99b8511da0
commit 15a77eb7c9
5 changed files with 12 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
poll/platform_uint32.go Normal file
View File

@@ -0,0 +1,5 @@
// +build amd64p32 386 arm
package poll
type uintp = uint32

5
poll/platform_uint64.go Normal file
View File

@@ -0,0 +1,5 @@
// +build amd64 arm64 ppc64 ppc64le
package poll
type uintp = uint64

4
poll/poll_bsd.go
View File

@@ -1,4 +1,4 @@
// +build darwin,amd64 darwin,arm64 freebsd dragonfly netbsd openbsd
// +build darwin freebsd dragonfly netbsd openbsd
package poll
@@ -22,7 +22,7 @@ func New(fd int) (p *Poller, err error) {
}
p.event = unix.Kevent_t{
Ident: uint64(fd),
Ident: uintp(fd),
Filter: unix.EVFILT_WRITE,
Flags: unix.EV_ADD | unix.EV_ENABLE | unix.EV_ONESHOT,
}

59
poll/poll_darwin_386.go
View File

@@ -1,59 +0,0 @@
package poll
import (
"context"
"golang.org/x/sys/unix"
"time"
)
type Poller struct {
kqfd int
event unix.Kevent_t
}
func New(fd int) (p *Poller, err error) {
p = &Poller{}
p.kqfd, err = unix.Kqueue()
if p.kqfd == -1 || err != nil {
return nil, err
}
p.event = unix.Kevent_t{
Ident: uint32(fd),
Filter: unix.EVFILT_WRITE,
Flags: unix.EV_ADD | unix.EV_ENABLE | unix.EV_ONESHOT,
Fflags: 0,
Data: 0,
Udata: nil,
}
return p, nil
}
func (p *Poller) Close() error {
return unix.Close(p.kqfd)
}
func (p *Poller) WaitWriteCtx(ctx context.Context) error {
deadline, _ := ctx.Deadline()
// setup timeout
var timeout *unix.Timespec
if !deadline.IsZero() {
d := deadline.Sub(time.Now())
t := unix.NsecToTimespec(d.Nanoseconds())
timeout = &t
}
// wait on kevent
events := make([]unix.Kevent_t, 1)
n, err := unix.Kevent(p.kqfd, []unix.Kevent_t{p.event}, events, timeout)
if err != nil {
return err
}
if n < 1 {
return errTimeout
}
return nil
}

61
poll/poll_darwin_arm.go
View File

@@ -1,61 +0,0 @@
// +build darwin,arm
package poll
import (
"context"
"golang.org/x/sys/unix"
"time"
)
type Poller struct {
kqfd int
event unix.Kevent_t
}
func New(fd int) (p *Poller, err error) {
p = &Poller{}
p.kqfd, err = unix.Kqueue()
if p.kqfd == -1 || err != nil {
return nil, err
}
p.event = unix.Kevent_t{
Ident: uint32(fd),
Filter: unix.EVFILT_WRITE,
Flags: unix.EV_ADD | unix.EV_ENABLE | unix.EV_ONESHOT,
Fflags: 0,
Data: 0,
Udata: nil,
}
return p, nil
}
func (p *Poller) Close() error {
return unix.Close(p.kqfd)
}
func (p *Poller) WaitWriteCtx(ctx context.Context) error {
deadline, _ := ctx.Deadline()
// setup timeout
var timeout *unix.Timespec
if !deadline.IsZero() {
d := deadline.Sub(time.Now())
t := unix.NsecToTimespec(d.Nanoseconds())
timeout = &t
}
// wait on kevent
events := make([]unix.Kevent_t, 1)
n, err := unix.Kevent(p.kqfd, []unix.Kevent_t{p.event}, events, timeout)
if err != nil {
return err
}
if n < 1 {
return errTimeout
}
return nil
}