coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-03-11 19:27:51 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #4372 from ipfs/feat/use-sys

Browse Source 
switch from syscall to golang.org/x/sys
This commit is contained in:
Whyrusleeping 2017-11-18 15:39:53 -08:00 committed by GitHub
commit 225159bcd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/ipfs/ulimit_freebsd.go
View File

@ -4,7 +4,8 @@ package main
import (
"fmt"
"syscall"
unix "gx/ipfs/QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT/sys/unix"
)
func init() {
@ -12,8 +13,8 @@ func init() {
}
func checkAndSetUlimit() error {
var rLimit syscall.Rlimit
err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
var rLimit unix.Rlimit
err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rLimit)
if err != nil {
return fmt.Errorf("error getting rlimit: %s", err)
}
@ -31,7 +32,7 @@ func checkAndSetUlimit() error {
setting = true
}
err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
err = unix.Setrlimit(unix.RLIMIT_NOFILE, &rLimit)
if err != nil {
return fmt.Errorf("error setting ulimit: %s", err)
}

9
cmd/ipfs/ulimit_unix.go
View File

@ -4,7 +4,8 @@ package main
import (
"fmt"
"syscall"
unix "gx/ipfs/QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT/sys/unix"
)
func init() {
@ -12,8 +13,8 @@ func init() {
}
func checkAndSetUlimit() error {
var rLimit syscall.Rlimit
err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
var rLimit unix.Rlimit
err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rLimit)
if err != nil {
return fmt.Errorf("error getting rlimit: %s", err)
}
@ -29,7 +30,7 @@ func checkAndSetUlimit() error {
setting = true
}
err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
err = unix.Setrlimit(unix.RLIMIT_NOFILE, &rLimit)
if err != nil {
return fmt.Errorf("error setting ulimit: %s", err)
}

4
fuse/node/mount_darwin.go
View File

@ -8,10 +8,10 @@ import (
"os/exec"
"runtime"
"strings"
"syscall"
core "github.com/ipfs/go-ipfs/core"
unix "gx/ipfs/QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT/sys/unix"
"gx/ipfs/QmYRGECuvQnRX73fcvPnGbYijBcGN2HbKZQ7jh26qmLiHG/semver"
)
@ -165,7 +165,7 @@ func tryGFV() (string, error) {
}
func trySysctl() (string, error) {
v, err := syscall.Sysctl("osxfuse.version.number")
v, err := unix.Sysctl("osxfuse.version.number")
if err != nil {
log.Debug("mount: sysctl osxfuse.version.number:", "failed")
return "", err

6
package.json
View File

@ -497,6 +497,12 @@
"hash": "QmeS8cCKawUwejVrsBtmC1toTXmwVWZGiRJqzgTURVWeF9",
"name": "go-ipfs-addr",
"version": "0.1.1"
},
{
"author": "The Go Authors",
"hash": "QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT",
"name": "sys",
"version": "0.1.0"
}
],
"gxVersion": "0.10.0",