cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

chain events: Annotate types for readability

Browse Source
This commit is contained in:
Łukasz Magiera 2019-09-05 09:31:16 +02:00
parent afcb35e969
commit 519eed9290
2 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
chain/store/events.go
View File

@ -34,14 +34,14 @@ type Events struct {
tsc *tipSetCache tsc *tipSetCache
lk sync.Mutex lk sync.Mutex
ctr uint64 ctr triggerId
// ChainAt // ChainAt
heightTriggers map[uint64]*heightHandler heightTriggers map[triggerId]*heightHandler
htTriggerHeights map[uint64][]uint64 htTriggerHeights map[triggerH][]triggerId
htHeights map[uint64][]uint64 htHeights map[msgH][]triggerId
calledEvents calledEvents
} }
@ -65,11 +65,11 @@ func NewEvents(cs eventChainStore) *Events {
cs: cs, cs: cs,
tsc: tsc, tsc: tsc,
confQueue: map[uint64]map[uint64][]*queuedEvent{}, confQueue: map[triggerH]map[msgH][]*queuedEvent{},
revertQueue: map[uint64][]uint64{}, revertQueue: map[msgH][]triggerH{},
triggers: map[uint64]*callHandler{}, triggers: map[triggerId]*callHandler{},
callTuples: map[callTuple][]uint64{}, callTuples: map[callTuple][]triggerId{},
timeouts: map[uint64]map[uint64]int{}, timeouts: map[uint64]map[triggerId]int{},
}, },
} }

45
chain/store/events_called.go
View File

@ -9,9 +9,14 @@ import (
"github.com/filecoin-project/go-lotus/chain/types" "github.com/filecoin-project/go-lotus/chain/types"
) )
// continous type triggerId = uint64
// with reverts
// no timout // msgH is the block height at which a message was present / event has happened
type msgH = uint64
// triggerH is the block height at which the listener will be notified about the
// message (msgH+confidence)
type triggerH = uint64
// `ts` is the tipset, in which the `msg` is included. // `ts` is the tipset, in which the `msg` is included.
// `curH`-`ts.Height` = `confidence` // `curH`-`ts.Height` = `confidence`
@ -36,7 +41,7 @@ type callHandler struct {
} }
type queuedEvent struct { type queuedEvent struct {
trigger uint64 trigger triggerId
h uint64 h uint64
msg *types.Message msg *types.Message
@ -50,20 +55,20 @@ type calledEvents struct {
lk sync.Mutex lk sync.Mutex
ctr uint64 ctr triggerId
triggers map[uint64]*callHandler triggers map[triggerId]*callHandler
callTuples map[callTuple][]uint64 callTuples map[callTuple][]triggerId
// maps block heights to events // maps block heights to events
// [triggerH][msgH][event] // [triggerH][msgH][event]
confQueue map[uint64]map[uint64][]*queuedEvent confQueue map[triggerH]map[msgH][]*queuedEvent
// [msgH][triggerH] // [msgH][triggerH]
revertQueue map[uint64][]uint64 revertQueue map[msgH][]triggerH
// [timeoutH+confidence][triggerId]{calls} // [timeoutH+confidence][triggerId]{calls}
timeouts map[uint64]map[uint64]int timeouts map[uint64]map[triggerId]int
} }
type callTuple struct { type callTuple struct {
@ -72,6 +77,9 @@ type callTuple struct {
} }
func (e *calledEvents) headChangeCalled(rev, app []*types.TipSet) error { func (e *calledEvents) headChangeCalled(rev, app []*types.TipSet) error {
e.lk.Lock()
defer e.lk.Unlock()
for _, ts := range rev { for _, ts := range rev {
e.handleReverts(ts) e.handleReverts(ts)
} }
@ -290,20 +298,3 @@ func (e *calledEvents) Called(check CheckFunc, hnd CalledHandler, rev RevertHand
return nil return nil
} }
/*func (e *calledEvents) debugInfo() {
fmt.Println("vvv")
fmt.Println("@", e.tsc.best().Height())
for k, v := range e.revertQueue {
fmt.Println("revert (msgH->trigH)", k, v)
}
for triggerH, v := range e.confQueue {
for msgh, e := range v {
for _, evt := range e {
fmt.Printf("T@ %d, M@ %d, EH %d, T %d, called %t\n", triggerH, msgh, evt.h, evt.trigger, evt.called)
}
}
}
fmt.Println("^^^")
}*/