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

Dont do locking using defer

Browse Source
This commit is contained in:
Fridrik Asmundsson 2023-03-25 12:07:37 +00:00
parent f84f8a831a
commit 2e45f6f778
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
chain/stmgr/execute.go
View File

@ -130,15 +130,16 @@ func (sm *StateManager) ExecutionTraceWithMonitor(ctx context.Context, ts *types
func (sm *StateManager) ExecutionTrace(ctx context.Context, ts *types.TipSet) (cid.Cid, []*api.InvocResult, error) { func (sm *StateManager) ExecutionTrace(ctx context.Context, ts *types.TipSet) (cid.Cid, []*api.InvocResult, error) {
tsKey := ts.Key() tsKey := ts.Key()
{ // check if we have the trace for this tipset in the cache
// check if we have the trace for this tipset in the cache sm.execTraceCacheLock.Lock()
sm.execTraceCacheLock.Lock() if entry, ok := sm.execTraceCache.Get(tsKey); ok {
defer sm.execTraceCacheLock.Unlock() // we have to make a deep copy since caller can modify the invocTrace
if entry, ok := sm.execTraceCache.Get(tsKey); ok { // and we don't want that to change what we store in cache
// we have to make a deep copy since caller can modify the invocTrace invocTraceCopy := makeDeepCopy(entry.invocTrace)
return entry.postStateRoot, makeDeepCopy(entry.invocTrace), nil sm.execTraceCacheLock.Unlock()
} return entry.postStateRoot, invocTraceCopy, nil
} }
sm.execTraceCacheLock.Unlock()
var invocTrace []*api.InvocResult var invocTrace []*api.InvocResult
st, err := sm.ExecutionTraceWithMonitor(ctx, ts, &InvocationTracer{trace: &invocTrace}) st, err := sm.ExecutionTraceWithMonitor(ctx, ts, &InvocationTracer{trace: &invocTrace})
@ -146,7 +147,11 @@ func (sm *StateManager) ExecutionTrace(ctx context.Context, ts *types.TipSet) (c
return cid.Undef, nil, err return cid.Undef, nil, err
} }
sm.execTraceCache.Add(tsKey, tipSetCacheEntry{st, makeDeepCopy(invocTrace)}) invocTraceCopy := makeDeepCopy(invocTrace)
sm.execTraceCacheLock.Lock()
sm.execTraceCache.Add(tsKey, tipSetCacheEntry{st, invocTraceCopy})
sm.execTraceCacheLock.Unlock()
return st, invocTrace, nil return st, invocTrace, nil
} }

4
chain/stmgr/stmgr.go
View File

@ -144,7 +144,9 @@ type StateManager struct {
// We keep a small cache for calls to ExecutionTrace which helps improve // We keep a small cache for calls to ExecutionTrace which helps improve
// performance for node operators like exchanges and block explorers // performance for node operators like exchanges and block explorers
execTraceCache *lru.ARCCache[types.TipSetKey, tipSetCacheEntry] execTraceCache *lru.ARCCache[types.TipSetKey, tipSetCacheEntry]
// We need a lock while making the copy as to prevent other callers
// overwrite the cache while making the copy
execTraceCacheLock sync.Mutex execTraceCacheLock sync.Mutex
} }