TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-12 05:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/flowtrack,wgengine/filter: refactor Cache to use generics

Browse Source 
Signed-off-by: Tom DNetto <tom@tailscale.com>
This commit is contained in:
Tom DNetto
2023-01-11 13:45:34 -08:00
committed by Tom
parent 3becf82dd3
commit 2ac5474be1
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
net/flowtrack/flowtrack.go
View File

@@ -34,7 +34,7 @@ func (t Tuple) String() string {
// The zero value is valid to use.
//
// It is not safe for concurrent access.
type Cache struct {
type Cache[Value any] struct {
// MaxEntries is the maximum number of cache entries before
// an item is evicted. Zero means no limit.
MaxEntries int
@@ -44,9 +44,9 @@ type Cache struct {
}
// entry is the container/list element type.
type entry struct {
type entry[Value any] struct {
key Tuple
value any
value Value
}
// Add adds a value to the cache, set or updating its associated
@@ -54,17 +54,17 @@ type entry struct {
//
// If MaxEntries is non-zero and the length of the cache is greater
// after any addition, the least recently used value is evicted.
func (c *Cache) Add(key Tuple, value any) {
func (c *Cache[Value]) Add(key Tuple, value Value) {
if c.m == nil {
c.m = make(map[Tuple]*list.Element)
c.ll = list.New()
}
if ee, ok := c.m[key]; ok {
c.ll.MoveToFront(ee)
ee.Value.(*entry).value = value
ee.Value.(*entry[Value]).value = value
return
}
ele := c.ll.PushFront(&entry{key, value})
ele := c.ll.PushFront(&entry[Value]{key, value})
c.m[key] = ele
if c.MaxEntries != 0 && c.Len() > c.MaxEntries {
c.RemoveOldest()
@@ -73,23 +73,23 @@ func (c *Cache) Add(key Tuple, value any) {
// Get looks up a key's value from the cache, also reporting
// whether it was present.
func (c *Cache) Get(key Tuple) (value any, ok bool) {
func (c *Cache[Value]) Get(key Tuple) (value *Value, ok bool) {
if ele, hit := c.m[key]; hit {
c.ll.MoveToFront(ele)
return ele.Value.(*entry).value, true
return &ele.Value.(*entry[Value]).value, true
}
return nil, false
}
// Remove removes the provided key from the cache if it was present.
func (c *Cache) Remove(key Tuple) {
func (c *Cache[Value]) Remove(key Tuple) {
if ele, hit := c.m[key]; hit {
c.removeElement(ele)
}
}
// RemoveOldest removes the oldest item from the cache, if any.
func (c *Cache) RemoveOldest() {
func (c *Cache[Value]) RemoveOldest() {
if c.ll != nil {
if ele := c.ll.Back(); ele != nil {
c.removeElement(ele)
@@ -97,10 +97,10 @@ func (c *Cache) RemoveOldest() {
}
}
func (c *Cache) removeElement(e *list.Element) {
func (c *Cache[Value]) removeElement(e *list.Element) {
c.ll.Remove(e)
delete(c.m, e.Value.(*entry).key)
delete(c.m, e.Value.(*entry[Value]).key)
}
// Len returns the number of items in the cache.
func (c *Cache) Len() int { return len(c.m) }
func (c *Cache[Value]) Len() int { return len(c.m) }

8
net/flowtrack/flowtrack_test.go
View File

@@ -12,7 +12,7 @@ import (
)
func TestCache(t *testing.T) {
c := &Cache{MaxEntries: 2}
c := &Cache[int]{MaxEntries: 2}
k1 := Tuple{Src: netip.MustParseAddrPort("1.1.1.1:1"), Dst: netip.MustParseAddrPort("1.1.1.1:1")}
k2 := Tuple{Src: netip.MustParseAddrPort("1.1.1.1:1"), Dst: netip.MustParseAddrPort("2.2.2.2:2")}
@@ -25,13 +25,13 @@ func TestCache(t *testing.T) {
t.Fatalf("Len = %d; want %d", got, want)
}
}
wantVal := func(key Tuple, want any) {
wantVal := func(key Tuple, want int) {
t.Helper()
got, ok := c.Get(key)
if !ok {
t.Fatalf("Get(%q) failed; want value %v", key, want)
}
if got != want {
if *got != want {
t.Fatalf("Get(%q) = %v; want %v", key, got, want)
}
}
@@ -73,7 +73,7 @@ func TestCache(t *testing.T) {
if !ok {
t.Fatal("missing k3")
}
if got != 30 {
if *got != 30 {
t.Fatalf("got = %d; want 30", got)
}
})