Restores memory footage report (#1194)

* restore memory footage report * Fix aida-sdb extension order
Fantom-foundation · Oct 17, 2024 · c4f770a · c4f770a
1 parent 9a4ee70
commit c4f770a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/cmd/aida-sdb/trace/replay.go b/cmd/aida-sdb/trace/replay.go
@@ -88,9 +88,9 @@ func (p operationProcessor) runTransaction(block uint64, operations []operation.
 func replay(cfg *utils.Config, provider executor.Provider[[]operation.Operation], processor executor.Processor[[]operation.Operation], extra []executor.Extension[[]operation.Operation], aidaDb db.BaseDB) error {
 	var extensionList = []executor.Extension[[]operation.Operation]{
 		profiler.MakeCpuProfiler[[]operation.Operation](cfg),
+		statedb.MakeStateDbManager[[]operation.Operation](cfg, ""),
 		profiler.MakeMemoryUsagePrinter[[]operation.Operation](cfg),
 		profiler.MakeMemoryProfiler[[]operation.Operation](cfg),
-		statedb.MakeStateDbManager[[]operation.Operation](cfg, ""),
 		logger.MakeProgressLogger[[]operation.Operation](cfg, 0),
 		primer.MakeStateDbPrimer[[]operation.Operation](cfg),
 	}

diff --git a/state/carmen.go b/state/carmen.go
@@ -438,12 +438,14 @@ func (s *carmenHeadState) GetArchiveBlockHeight() (uint64, bool, error) {
 }
 
 func (s *carmenStateDB) GetMemoryUsage() *MemoryUsage {
-	// todo waiting for implementation from carmen side
-	//usage := s.db.GetMemoryFootprint()
-	//if usage == nil {
-	//	return &MemoryUsage{uint64(0), nil}
-	//}
-	return &MemoryUsage{uint64(0), nil}
+	if s.db == nil {
+		return &MemoryUsage{uint64(0), nil}
+	}
+	usage := s.db.GetMemoryFootprint()
+	if usage == nil {
+		return &MemoryUsage{uint64(0), nil}
+	}
+	return &MemoryUsage{uint64(usage.Total()), usage}
 }
 
 func (s *carmenStateDB) GetShadowDB() StateDB {