diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-01 06:01:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-01 06:01:41 +0800 |
| commit | fdf939a6f9b5360d76415c7118969d92af2774f9 (patch) | |
| tree | 4ab13f3d946f857340590500ebd44ec8c1d439e3 /cmd | |
| parent | cdb77f0ecd239fe7a5494891c6a42645904a432b (diff) | |
| download | dexon-fdf939a6f9b5360d76415c7118969d92af2774f9.tar.gz dexon-fdf939a6f9b5360d76415c7118969d92af2774f9.tar.zst dexon-fdf939a6f9b5360d76415c7118969d92af2774f9.zip | |
Fixed miner threads for ethereum CLI
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ethereum/flags.go | 3 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 37 |
2 files changed, 22 insertions, 18 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index 1a0c13c82..356571a23 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -27,6 +27,7 @@ import ( "log" "os" "path" + "runtime" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" @@ -71,6 +72,7 @@ var ( SHH bool Dial bool PrintVersion bool + MinerThreads int ) // flags specific to cli client @@ -121,6 +123,7 @@ func Init() { flag.BoolVar(&StartMining, "mine", false, "start dagger mining") flag.BoolVar(&StartJsConsole, "js", false, "launches javascript console") flag.BoolVar(&PrintVersion, "version", false, "prints version number") + flag.IntVar(&MinerThreads, "minerthreads", runtime.NumCPU(), "number of miner threads") // Network stuff var ( diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 07ef0d5dd..f79f948d1 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -62,20 +62,21 @@ func main() { utils.InitConfig(VmType, ConfigFile, Datadir, "ETH") ethereum, err := eth.New(ð.Config{ - Name: p2p.MakeName(ClientIdentifier, Version), - KeyStore: KeyStore, - DataDir: Datadir, - LogFile: LogFile, - LogLevel: LogLevel, - LogFormat: LogFormat, - MaxPeers: MaxPeer, - Port: OutboundPort, - NAT: NAT, - KeyRing: KeyRing, - Shh: true, - Dial: Dial, - BootNodes: BootNodes, - NodeKey: NodeKey, + Name: p2p.MakeName(ClientIdentifier, Version), + KeyStore: KeyStore, + DataDir: Datadir, + LogFile: LogFile, + LogLevel: LogLevel, + LogFormat: LogFormat, + MaxPeers: MaxPeer, + Port: OutboundPort, + NAT: NAT, + KeyRing: KeyRing, + Shh: true, + Dial: Dial, + BootNodes: BootNodes, + NodeKey: NodeKey, + MinerThreads: MinerThreads, }) if err != nil { @@ -113,10 +114,6 @@ func main() { return } - if StartMining { - utils.StartMining(ethereum) - } - if len(ImportChain) > 0 { start := time.Now() err := utils.ImportChain(ethereum, ImportChain) @@ -139,6 +136,10 @@ func main() { fmt.Printf("Welcome to the FRONTIER\n") + if StartMining { + ethereum.Miner().Start() + } + if StartJsConsole { InitJsConsole(ethereum) } else if len(InputFile) > 0 { |