Merge pull request #70 from CodFrm/main

refactor cache
projectdiscovery · Feb 7, 2023 · 3a79675 · 3a79675
2 parents 5c19d18 + 44a7b56
commit 3a79675
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/store/cache/cache.go b/store/cache/cache.go
@@ -24,20 +24,24 @@ type Cache interface {
 }
 
 type CacheMemory struct {
+	*cacheMemory
+}
+
+type cacheMemory struct {
 	DefaultExpiration time.Duration
 	Items             map[string]Item
 	mu                sync.RWMutex
 	onEvicted         func(string, interface{})
 	janitor           *janitor
 }
 
-func (c *CacheMemory) SetWithExpiration(k string, x interface{}, d time.Duration) {
+func (c *cacheMemory) SetWithExpiration(k string, x interface{}, d time.Duration) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	c.set(k, x, d)
 }
 
-func (c *CacheMemory) set(k string, x interface{}, d time.Duration) {
+func (c *cacheMemory) set(k string, x interface{}, d time.Duration) {
 	var e int64
 	if d == DefaultExpiration {
 		d = c.DefaultExpiration
@@ -51,11 +55,11 @@ func (c *CacheMemory) set(k string, x interface{}, d time.Duration) {
 	}
 }
 
-func (c *CacheMemory) Set(k string, x interface{}) {
+func (c *cacheMemory) Set(k string, x interface{}) {
 	c.SetWithExpiration(k, x, c.DefaultExpiration)
 }
 
-func (c *CacheMemory) Get(k string) (interface{}, bool) {
+func (c *cacheMemory) Get(k string) (interface{}, bool) {
 	c.mu.RLock()
 	item, found := c.Items[k]
 	if !found {
@@ -73,7 +77,7 @@ func (c *CacheMemory) Get(k string) (interface{}, bool) {
 	return item.Object, true
 }
 
-func (c *CacheMemory) refresh(k string) bool {
+func (c *cacheMemory) refresh(k string) bool {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
@@ -85,7 +89,7 @@ func (c *CacheMemory) refresh(k string) bool {
 	return true
 }
 
-func (c *CacheMemory) Delete(k string) {
+func (c *cacheMemory) Delete(k string) {
 	c.mu.Lock()
 	v, evicted := c.delete(k)
 	c.mu.Unlock()
@@ -94,7 +98,7 @@ func (c *CacheMemory) Delete(k string) {
 	}
 }
 
-func (c *CacheMemory) delete(k string) (interface{}, bool) {
+func (c *cacheMemory) delete(k string) (interface{}, bool) {
 	if c.onEvicted != nil {
 		if v, found := c.Items[k]; found {
 			delete(c.Items, k)
@@ -106,7 +110,7 @@ func (c *CacheMemory) delete(k string) (interface{}, bool) {
 }
 
 // Delete all expired items from the cache.
-func (c *CacheMemory) DeleteExpired() {
+func (c *cacheMemory) DeleteExpired() {
 	var evictedItems []keyAndValue
 	now := time.Now().UnixNano()
 	c.mu.Lock()
@@ -125,13 +129,13 @@ func (c *CacheMemory) DeleteExpired() {
 	}
 }
 
-func (c *CacheMemory) OnEvicted(f func(string, interface{})) {
+func (c *cacheMemory) OnEvicted(f func(string, interface{})) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	c.onEvicted = f
 }
 
-func (c *CacheMemory) Scan(f func([]byte, []byte) error) {
+func (c *cacheMemory) Scan(f func([]byte, []byte) error) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
@@ -142,7 +146,7 @@ func (c *CacheMemory) Scan(f func([]byte, []byte) error) {
 	}
 }
 
-func (c *CacheMemory) CloneItems() map[string]Item {
+func (c *cacheMemory) CloneItems() map[string]Item {
 	c.mu.RLock()
 	defer c.mu.RUnlock()
 	m := make(map[string]Item, len(c.Items))
@@ -159,46 +163,44 @@ func (c *CacheMemory) CloneItems() map[string]Item {
 	return m
 }
 
-func (c *CacheMemory) ItemCount() int {
+func (c *cacheMemory) ItemCount() int {
 	c.mu.RLock()
 	defer c.mu.RUnlock()
 	n := len(c.Items)
 
 	return n
 }
 
-func (c *CacheMemory) Empty() {
+func (c *cacheMemory) Empty() {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
 	c.Items = map[string]Item{}
 }
 
-func newCache(de time.Duration, m map[string]Item) *CacheMemory {
+func newCache(de time.Duration, m map[string]Item) *cacheMemory {
 	if de == 0 {
 		de = -1
 	}
-	c := &CacheMemory{
+	c := &cacheMemory{
 		DefaultExpiration: de,
 		Items:             m,
 	}
 	return c
 }
 
-type finalizerWrapper struct {
-	*CacheMemory
-}
-
 func newCacheWithJanitor(de time.Duration, ci time.Duration, m map[string]Item) *CacheMemory {
 	c := newCache(de, m)
+	w := &CacheMemory{
+		cacheMemory: c,
+	}
 	if ci > 0 {
 		runJanitor(c, ci)
-		wrapper := &finalizerWrapper{CacheMemory: c}
-		runtime.SetFinalizer(wrapper, func(w *finalizerWrapper) {
-			stopJanitor(w.CacheMemory)
+		runtime.SetFinalizer(w, func(c *CacheMemory) {
+			stopJanitor(c.cacheMemory)
 		})
 	}
-	return c
+	return w
 }
 
 func New(defaultExpiration, cleanupInterval time.Duration) *CacheMemory {

diff --git a/store/cache/janitor.go b/store/cache/janitor.go
@@ -9,7 +9,7 @@ type janitor struct {
 	stop     chan struct{}
 }
 
-func (j *janitor) Run(c *CacheMemory) {
+func (j *janitor) Run(c *cacheMemory) {
 	ticker := time.NewTicker(j.Interval)
 	for {
 		select {
@@ -22,11 +22,11 @@ func (j *janitor) Run(c *CacheMemory) {
 	}
 }
 
-func stopJanitor(c *CacheMemory) {
+func stopJanitor(c *cacheMemory) {
 	c.janitor.stop <- struct{}{}
 }
 
-func runJanitor(c *CacheMemory, ci time.Duration) {
+func runJanitor(c *cacheMemory, ci time.Duration) {
 	j := &janitor{
 		Interval: ci,
 		stop:     make(chan struct{}),