Skip to content

Commit 87d1a9c

Browse files
committed
no need chan if init done
Signed-off-by: jsvisa <[email protected]>
1 parent 72b50b0 commit 87d1a9c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

core/state/statesize.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,15 @@ func (g *StateSizeGenerator) generate() {
141141

142142
// initialize starts the initialization process if not already initialized
143143
func (g *StateSizeGenerator) initialize() chan struct{} {
144-
initDone := make(chan struct{})
145-
146144
// Check if we already have existing metrics
147145
if g.hasExistingMetrics() {
148146
log.Info("State size metrics already initialized")
149147
g.initialized.Store(true)
150-
close(initDone)
151-
return initDone
148+
return nil
152149
}
153150

151+
initDone := make(chan struct{})
152+
154153
// Wait for snapshot completion and then initialize
155154
go func() {
156155
defer close(initDone)
@@ -166,6 +165,7 @@ func (g *StateSizeGenerator) initialize() chan struct{} {
166165
root, done := g.triedb.SnapshotCompleted()
167166
if done {
168167
g.metrics.Root = root
168+
g.buffered.Root = root
169169
break LOOP
170170
}
171171
time.Sleep(10 * time.Second)
@@ -190,8 +190,9 @@ func (g *StateSizeGenerator) initialize() chan struct{} {
190190

191191
// mergeBufferedMetrics merges buffered metrics into main metrics
192192
func (g *StateSizeGenerator) mergeBufferedMetrics() {
193-
if g.buffered != nil && g.buffered.Root != (common.Hash{}) {
193+
if g.buffered != nil {
194194
log.Info("Merging buffered metrics into main metrics")
195+
g.metrics.Root = g.buffered.Root
195196
g.metrics.AccountCount += g.buffered.AccountCount
196197
g.metrics.AccountBytes += g.buffered.AccountBytes
197198
g.metrics.StorageCount += g.buffered.StorageCount
@@ -201,8 +202,7 @@ func (g *StateSizeGenerator) mergeBufferedMetrics() {
201202
g.metrics.ContractCount += g.buffered.ContractCount
202203
g.metrics.ContractBytes += g.buffered.ContractBytes
203204

204-
// Reset buffered metrics
205-
g.buffered = &StateSizeMetrics{Root: g.metrics.Root}
205+
g.buffered = nil
206206
}
207207
}
208208

0 commit comments

Comments
 (0)