Skip to content

Commit

Permalink
common/fdlimit: fix windows build (ethereum#19068)
Browse files Browse the repository at this point in the history
  • Loading branch information
fjl authored and karalabe committed Feb 14, 2019
1 parent 325334f commit ba90a4a
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions common/fdlimit/fdlimit_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

package fdlimit

import "errors"
import "fmt"

const hardlimit = 16384

// Raise tries to maximize the file descriptor allowance of this process
// to the maximum hard-limit allowed by the OS.
Expand All @@ -27,8 +29,8 @@ func Raise(max uint64) (uint64, error) {
// changeable from within a running process
// This way we can always "request" raising the limits, which will either have
// or not have effect based on the platform we're running on.
if max > 16384 {
return errors.New("file descriptor limit (16384) reached")
if max > hardlimit {
return hardlimit, fmt.Errorf("file descriptor limit (%d) reached", hardlimit)
}
return max, nil
}
Expand All @@ -37,7 +39,7 @@ func Raise(max uint64) (uint64, error) {
// process.
func Current() (int, error) {
// Please see Raise for the reason why we use hard coded 16K as the limit
return 16384, nil
return hardlimit, nil
}

// Maximum retrieves the maximum number of file descriptors this process is
Expand Down

0 comments on commit ba90a4a

Please sign in to comment.