forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

node waits to his turn until there is a new block comes in

Browse source
This commit is contained in:
Tuna 2018-07-19 17:15:21 +07:00
parent 5a771ed6f0
commit f65014512d
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/blockchain.go
View file

@ -49,7 +49,6 @@ var (
blockInsertTimer = metrics.NewRegisteredTimer("chain/inserts", nil) blockInsertTimer = metrics.NewRegisteredTimer("chain/inserts", nil)
CheckpointCh = make(chan int) CheckpointCh = make(chan int)
M1Ch = make(chan int) M1Ch = make(chan int)
NewBlockCh = make(chan int)
ErrNoGenesis = errors.New("Genesis not found in chain") ErrNoGenesis = errors.New("Genesis not found in chain")
) )
@ -1244,7 +1243,6 @@ func (st *insertStats) report(chain []*types.Block, index int, cache common.Stor
context = append(context, []interface{}{"ignored", st.ignored}...) context = append(context, []interface{}{"ignored", st.ignored}...)
} }
log.Info("Imported new chain segment", context...) log.Info("Imported new chain segment", context...)
NewBlockCh <- 1
*st = insertStats{startTime: now, lastIndex: index + 1} *st = insertStats{startTime: now, lastIndex: index + 1}
} }
} }

4
eth/backend.go
View file

@ -471,8 +471,8 @@ func (s *Ethereum) StartStaking(local bool) error {
return nil return nil
} }
func (s *Ethereum) StopStaking() { s.miner.Stop() } func (s *Ethereum) StopStaking() { s.miner.Stop() }
func (s *Ethereum) IsStaking() bool { return s.miner.Mining() } func (s *Ethereum) IsStaking() 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) AccountManager() *accounts.Manager { return s.accountManager } func (s *Ethereum) AccountManager() *accounts.Manager { return s.accountManager }

19
miner/worker.go
View file

@ -52,7 +52,7 @@ const (
// chainSideChanSize is the size of channel listening to ChainSideEvent. // chainSideChanSize is the size of channel listening to ChainSideEvent.
chainSideChanSize = 10 chainSideChanSize = 10
// Timeout waiting for M1 // Timeout waiting for M1
m1Timeout = 1000 m1Timeout = 1
) )
// Agent can register themself with the worker // Agent can register themself with the worker
@ -475,16 +475,17 @@ func (self *worker) commitNewWork() {
gap := int64(c.GetPeriod()) * int64(h) gap := int64(c.GetPeriod()) * int64(h)
log.Info("Distance from the parent block", "seconds", gap, "hops", h) log.Info("Distance from the parent block", "seconds", gap, "hops", h)
L: L:
for { select {
select { case newBlock := <-self.chainHeadCh:
case <-core.NewBlockCh: if newBlock.Block.NumberU64() > parent.NumberU64() {
log.Info("New block has came already. Skip this turn") log.Info("New block has came already. Skip this turn", "new block", newBlock.Block.NumberU64(), "current block", parent.NumberU64())
self.chainHeadCh <- newBlock
return return
case <-time.After(time.Duration(gap+m1Timeout) * time.Second):
// wait enough. It's my turn
log.Info("Wait enough. It's my turn", "waited seconds", gap+m1Timeout)
break L
} }
case <-time.After(time.Duration(gap+m1Timeout) * time.Second):
// wait enough. It's my turn
log.Info("Wait enough. It's my turn", "waited seconds", gap+m1Timeout)
break L
} }
} }
} }