mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 14:16:44 +00:00
Add poll interval flag
This commit is contained in:
parent
c6782a4284
commit
919fd902c5
4 changed files with 15 additions and 1 deletions
|
|
@ -234,6 +234,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
|
||||||
utils.GpobaseCorrectionFactorFlag,
|
utils.GpobaseCorrectionFactorFlag,
|
||||||
utils.ExtraDataFlag,
|
utils.ExtraDataFlag,
|
||||||
utils.FixedDifficultyFlag,
|
utils.FixedDifficultyFlag,
|
||||||
|
utils.PollIntervalFlag,
|
||||||
utils.MinerPassphraseFlag,
|
utils.MinerPassphraseFlag,
|
||||||
}
|
}
|
||||||
app.Flags = append(app.Flags, debug.Flags...)
|
app.Flags = append(app.Flags, debug.Flags...)
|
||||||
|
|
|
||||||
|
|
@ -397,6 +397,11 @@ var (
|
||||||
Usage: "Specify a fixed difficulty.",
|
Usage: "Specify a fixed difficulty.",
|
||||||
Value: -1,
|
Value: -1,
|
||||||
}
|
}
|
||||||
|
PollIntervalFlag = cli.IntFlag{
|
||||||
|
Name: "interval",
|
||||||
|
Usage: "Miner polling interval in milliseconds.",
|
||||||
|
Value: 200,
|
||||||
|
}
|
||||||
MinerPassphraseFlag = cli.StringFlag{
|
MinerPassphraseFlag = cli.StringFlag{
|
||||||
Name: "minerpass",
|
Name: "minerpass",
|
||||||
Usage: "Passphrase used to unlock key for signing blocks.",
|
Usage: "Passphrase used to unlock key for signing blocks.",
|
||||||
|
|
@ -723,6 +728,8 @@ func MakeSystemNode(name, version string, relconf release.Config, extra []byte,
|
||||||
SolcPath: ctx.GlobalString(SolcPathFlag.Name),
|
SolcPath: ctx.GlobalString(SolcPathFlag.Name),
|
||||||
AutoDAG: ctx.GlobalBool(AutoDAGFlag.Name) || ctx.GlobalBool(MiningEnabledFlag.Name),
|
AutoDAG: ctx.GlobalBool(AutoDAGFlag.Name) || ctx.GlobalBool(MiningEnabledFlag.Name),
|
||||||
MinerPassphrase: ctx.GlobalString(MinerPassphraseFlag.Name),
|
MinerPassphrase: ctx.GlobalString(MinerPassphraseFlag.Name),
|
||||||
|
FixedDifficulty: ctx.GlobalInt(FixedDifficultyFlag.Name),
|
||||||
|
PollInterval: ctx.GlobalInt(PollIntervalFlag.Name),
|
||||||
}
|
}
|
||||||
// Configure the Whisper service
|
// Configure the Whisper service
|
||||||
shhEnable := ctx.GlobalBool(WhisperEnabledFlag.Name)
|
shhEnable := ctx.GlobalBool(WhisperEnabledFlag.Name)
|
||||||
|
|
|
||||||
|
|
@ -102,6 +102,7 @@ type Config struct {
|
||||||
TestGenesisState ethdb.Database // Genesis state to seed the database with (testing only!)
|
TestGenesisState ethdb.Database // Genesis state to seed the database with (testing only!)
|
||||||
|
|
||||||
FixedDifficulty int
|
FixedDifficulty int
|
||||||
|
PollInterval int
|
||||||
MinerPassphrase string
|
MinerPassphrase string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -147,6 +148,7 @@ type Ethereum struct {
|
||||||
netRPCService *PublicNetAPI
|
netRPCService *PublicNetAPI
|
||||||
|
|
||||||
fixedDifficulty int
|
fixedDifficulty int
|
||||||
|
pollInterval int
|
||||||
minerPassphrase string
|
minerPassphrase string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -224,6 +226,8 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
|
||||||
GpobaseStepUp: config.GpobaseStepUp,
|
GpobaseStepUp: config.GpobaseStepUp,
|
||||||
GpobaseCorrectionFactor: config.GpobaseCorrectionFactor,
|
GpobaseCorrectionFactor: config.GpobaseCorrectionFactor,
|
||||||
httpclient: httpclient.New(config.DocRoot),
|
httpclient: httpclient.New(config.DocRoot),
|
||||||
|
fixedDifficulty: config.FixedDifficulty,
|
||||||
|
pollInterval: config.PollInterval,
|
||||||
minerPassphrase: config.MinerPassphrase,
|
minerPassphrase: config.MinerPassphrase,
|
||||||
}
|
}
|
||||||
switch {
|
switch {
|
||||||
|
|
@ -389,6 +393,8 @@ func (s *Ethereum) StopMining() { s.miner.Stop() }
|
||||||
func (s *Ethereum) IsMining() bool { return s.miner.Mining() }
|
func (s *Ethereum) IsMining() bool { return s.miner.Mining() }
|
||||||
func (s *Ethereum) Miner() *miner.Miner { return s.miner }
|
func (s *Ethereum) Miner() *miner.Miner { return s.miner }
|
||||||
func (s *Ethereum) MinerPassphrase() string { return s.minerPassphrase }
|
func (s *Ethereum) MinerPassphrase() string { return s.minerPassphrase }
|
||||||
|
func (s *Ethereum) FixedDifficulty() int { return s.fixedDifficulty }
|
||||||
|
func (s *Ethereum) PollInterval() int { return s.pollInterval }
|
||||||
|
|
||||||
func (s *Ethereum) AccountManager() *accounts.Manager { return s.accountManager }
|
func (s *Ethereum) AccountManager() *accounts.Manager { return s.accountManager }
|
||||||
func (s *Ethereum) BlockChain() *core.BlockChain { return s.blockchain }
|
func (s *Ethereum) BlockChain() *core.BlockChain { return s.blockchain }
|
||||||
|
|
|
||||||
|
|
@ -140,7 +140,7 @@ func (self *Miner) runLoop() {
|
||||||
self.Start(self.coinbase, self.threads)
|
self.Start(self.coinbase, self.threads)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
time.Sleep(3000 * time.Millisecond)
|
time.Sleep(self.eth.PollInterval() * time.Millisecond)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue