bug fixes

This commit is contained in:
Kyle Isom 2022-02-24 21:50:54 -08:00
parent 6fbdece4be
commit c200f51afd
2 changed files with 12 additions and 10 deletions

2
go.mod
View File

@ -1,3 +1,5 @@
module git.wntrmute.dev/kyle/go-mru module git.wntrmute.dev/kyle/go-mru
go 1.17 go 1.17
require github.com/benbjohnson/clock v1.3.0

20
mru.go
View File

@ -30,7 +30,7 @@ type Cache struct {
// New must be used to create a new Cache. // New must be used to create a new Cache.
func New(cap int) *Cache { func New(cap int) *Cache {
return &Cache{ return &Cache{
store: map[string]*Item{}, store: map[string]*item{},
access: newTimestamps(cap), access: newTimestamps(cap),
cap: cap, cap: cap,
clock: clock.New(), clock: clock.New(),
@ -39,11 +39,11 @@ func New(cap int) *Cache {
} }
func (c *Cache) lock() { func (c *Cache) lock() {
m.mtx.lock() c.mtx.Lock()
} }
func (c *Cache) unlock() { func (c *Cache) unlock() {
m.mtx.unlock() c.mtx.Unlock()
} }
// Len returns the number of items currently in the cache. // Len returns the number of items currently in the cache.
@ -79,8 +79,8 @@ func (c *Cache) sanityCheck() {
// data structures are consistent. It is not normally required, and it // data structures are consistent. It is not normally required, and it
// is primarily used in testing. // is primarily used in testing.
func (c *Cache) ConsistencyCheck() error { func (c *Cache) ConsistencyCheck() error {
m.lock() c.lock()
defer m.unlock() defer c.unlock()
if err := c.access.ConsistencyCheck(); err != nil { if err := c.access.ConsistencyCheck(); err != nil {
return err return err
} }
@ -111,8 +111,8 @@ func (c *Cache) ConsistencyCheck() error {
// Store adds the value v to the cache under the k. // Store adds the value v to the cache under the k.
func (c *Cache) Store(k string, v interface{}) { func (c *Cache) Store(k string, v interface{}) {
m.lock() c.lock()
defer m.unlock() defer c.unlock()
c.sanityCheck() c.sanityCheck()
@ -124,7 +124,7 @@ func (c *Cache) Store(k string, v interface{}) {
c.evictKey(k) c.evictKey(k)
} }
itm := &Item{ itm := &item{
V: v, V: v,
access: c.clock.Now().UnixNano(), access: c.clock.Now().UnixNano(),
} }
@ -136,8 +136,8 @@ func (c *Cache) Store(k string, v interface{}) {
// Get returns the value stored in the cache. If the item isn't present, // Get returns the value stored in the cache. If the item isn't present,
// it will return false. // it will return false.
func (c *Cache) Get(k string) (interface{}, bool) { func (c *Cache) Get(k string) (interface{}, bool) {
m.lock() c.lock()
defer m.unlock() defer c.unlock()
c.sanityCheck() c.sanityCheck()