feat: implement enhanced garbage collection statistics logging

steamcache/gc.go

@@ -1,73 +1,42 @@
 package steamcache
 
 import (
-	"s1d3sw1ped/SteamCache2/steamcache/logger"
 	"s1d3sw1ped/SteamCache2/vfs"
 	"s1d3sw1ped/SteamCache2/vfs/cachestate"
 	"time"
 
-	"github.com/docker/go-units"
 	"golang.org/x/exp/rand"
 )
 
-func randomgc(vfss vfs.VFS, stats []*vfs.FileInfo) int64 {
-	// Pick a random file to delete
-	randfile := stats[rand.Intn(len(stats))]
-	sz := randfile.Size()
-	err := vfss.Delete(randfile.Name())
-	if err != nil {
-		// If we failed to delete the file, log it and return 0
-		// logger.Logger.Error().Err(err).Msgf("Failed to delete %s", randfile.Name())
-		return 0
+// RandomGC randomly deletes files until we've reclaimed enough space.
+func randomgc(vfss vfs.VFS, size uint) (uint, uint) {
+
+	// Randomly delete files until we've reclaimed enough space.
+	random := func(vfss vfs.VFS, stats []*vfs.FileInfo) int64 {
+		randfile := stats[rand.Intn(len(stats))]
+		sz := randfile.Size()
+		err := vfss.Delete(randfile.Name())
+		if err != nil {
+			return 0
+		}
+
+		return sz
 	}
 
-	return sz
-}
-
-func memorygc(vfss vfs.VFS, size int) {
-	tstart := time.Now()
 	deletions := 0
 	targetreclaim := int64(size)
 	var reclaimed int64
 
 	stats := vfss.StatAll()
 	for {
-		reclaimed += randomgc(vfss, stats)
+		reclaimed += random(vfss, stats)
 		deletions++
 		if reclaimed >= targetreclaim {
 			break
 		}
 	}
 
-	logger.Logger.Info().
-		Str("name", vfss.Name()).
-		Str("duration", time.Since(tstart).String()).
-		Str("reclaimed", units.HumanSize(float64(reclaimed))).
-		Int("deletions", deletions).
-		Msgf("GC")
-}
-
-func diskgc(vfss vfs.VFS, size int) {
-	tstart := time.Now()
-	deletions := 0
-	targetreclaim := int64(size)
-	var reclaimed int64
-
-	stats := vfss.StatAll()
-	for {
-		reclaimed += randomgc(vfss, stats)
-		deletions++
-		if reclaimed >= targetreclaim {
-			break
-		}
-	}
-
-	logger.Logger.Info().
-		Str("name", vfss.Name()).
-		Str("duration", time.Since(tstart).String()).
-		Str("reclaimed", units.HumanSize(float64(reclaimed))).
-		Int("deletions", deletions).
-		Msgf("GC")
+	return uint(reclaimed), uint(deletions)
 }
 
 func cachehandler(fi *vfs.FileInfo, cs cachestate.CacheState) bool {