From d00ccc0d3c379cbb62a6f99b8f249164688bf0da Mon Sep 17 00:00:00 2001 From: Marco Peereboom Date: Tue, 7 Jan 2014 15:30:25 -0600 Subject: [PATCH] Make limits into a pkg. This is so that we can use the in other utils. debated with davec --- btcd.go | 3 ++- limits_plan9.go => limits/limits_plan9.go | 4 ++-- limits_unix.go => limits/limits_unix.go | 4 ++-- limits_windows.go => limits/limits_windows.go | 4 ++-- util/addblock/addblock.go | 7 +++++++ 5 files changed, 15 insertions(+), 7 deletions(-) rename limits_plan9.go => limits/limits_plan9.go (84%) rename limits_unix.go => limits/limits_unix.go (95%) rename limits_windows.go => limits/limits_windows.go (80%) diff --git a/btcd.go b/btcd.go index 2987d1e73..32cceeacc 100644 --- a/btcd.go +++ b/btcd.go @@ -5,6 +5,7 @@ package main import ( + "github.com/conformal/btcd/limits" "fmt" "net" "net/http" @@ -128,7 +129,7 @@ func main() { runtime.GOMAXPROCS(runtime.NumCPU()) // Up some limits. - if err := setLimits(); err != nil { + if err := limits.SetLimits(); err != nil { os.Exit(1) } diff --git a/limits_plan9.go b/limits/limits_plan9.go similarity index 84% rename from limits_plan9.go rename to limits/limits_plan9.go index 4bf1c2d2d..67b3ab45e 100644 --- a/limits_plan9.go +++ b/limits/limits_plan9.go @@ -2,9 +2,9 @@ // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. -package main +package limits // Plan 9 has no process accounting. no-op here -func setLimits() error { +func SetLimits() error { return nil } diff --git a/limits_unix.go b/limits/limits_unix.go similarity index 95% rename from limits_unix.go rename to limits/limits_unix.go index 9f35252cb..ba747a862 100644 --- a/limits_unix.go +++ b/limits/limits_unix.go @@ -4,7 +4,7 @@ // +build !windows,!plan9 -package main +package limits import ( "fmt" @@ -16,7 +16,7 @@ const ( fileLimitMin = 1024 ) -func setLimits() error { +func SetLimits() error { var rLimit syscall.Rlimit err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit) diff --git a/limits_windows.go b/limits/limits_windows.go similarity index 80% rename from limits_windows.go rename to limits/limits_windows.go index f3d31f78e..b0086ee72 100644 --- a/limits_windows.go +++ b/limits/limits_windows.go @@ -2,8 +2,8 @@ // Use of this source code is governed by an ISC // license that can be found in the LICENSE file. -package main +package limits -func setLimits() error { +func SetLimits() error { return nil } diff --git a/util/addblock/addblock.go b/util/addblock/addblock.go index 780cd7558..fb276ce44 100644 --- a/util/addblock/addblock.go +++ b/util/addblock/addblock.go @@ -7,6 +7,7 @@ package main import ( "encoding/binary" "fmt" + "github.com/conformal/btcd/limits" "github.com/conformal/btcdb" _ "github.com/conformal/btcdb/ldb" "github.com/conformal/btclog" @@ -66,8 +67,14 @@ func main() { return } + // Use all processor cores. runtime.GOMAXPROCS(runtime.NumCPU()) + // Up some limits. + if err := limits.SetLimits(); err != nil { + os.Exit(1) + } + backendLogger := btclog.NewDefaultBackendLogger() defer backendLogger.Flush() log = btclog.NewSubsystemLogger(backendLogger, "")