Upgrade go-syncmap

Signed-off-by: Vladimir Popov <[email protected]>
networkservicemesh · Nov 2, 2020 · 6bd25ab · 6bd25ab
1 parent f9fae5a
commit 6bd25ab
Show file tree

Hide file tree

Showing 20 changed files with 673 additions and 160 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -94,7 +94,7 @@ jobs:
           go-version: 1.13
       - name: Install proto-gen-go
         run: go get -u github.com/golang/protobuf/[email protected]
-      - name: Install proto-gen-go
+      - name: Install go-syncmap
         run: go get github.com/searKing/golang/tools/cmd/go-syncmap
       - name: Generate files
         run: go generate ./...

diff --git a/pkg/networkservice/common/externalips/string_map.gen.go b/pkg/networkservice/common/externalips/string_map.gen.go
diff --git a/pkg/networkservice/common/interpose/connection_info_map.gen.go b/pkg/networkservice/common/interpose/connection_info_map.gen.go
diff --git a/pkg/networkservice/common/mechanisms/recvfd/per_connection_file_map.gen.go b/pkg/networkservice/common/mechanisms/recvfd/per_connection_file_map.gen.go
diff --git a/pkg/networkservice/common/timeout/README.md b/pkg/networkservice/common/timeout/README.md
@@ -7,10 +7,10 @@ previous NSM-based application. For such case connection should be closed.
 
 ## timeoutServer
 
-timeoutServer keeps timers [timeout.timerMap](https://github.com/networkservicemesh/sdk/blob/master/pkg/networkservice/common/timeout/gen.go#L27)
+timeoutServer keeps timers [timeout.timerMap](https://github.com/networkservicemesh/sdk/blob/master/pkg/networkservice/common/timeout/gen.go#L26)
 mapping incoming request Connection.ID to a timeout timer firing Close on the subsequent chain after the connection previous
 path element expires. To prevent simultaneous execution of multiple Request, Close event for the same Connection.ID in parallel
-it also keeps executors [timeout.executorMap](https://github.com/networkservicemesh/sdk/blob/master/pkg/networkservice/common/timeout/gen.go#L37)
+it also keeps executors [timeout.executorMap](https://github.com/networkservicemesh/sdk/blob/master/pkg/networkservice/common/timeout/gen.go#L27)
 mapping request Connection.ID to an executor for serializing all Request, Close event for the mapped Connection.ID.
 
 timeoutServer closes only subsequent chain elements and uses base context for the Close. So all the chain elements in

diff --git a/pkg/networkservice/common/timeout/executor_map.gen.go b/pkg/networkservice/common/timeout/executor_map.gen.go
diff --git a/pkg/networkservice/common/timeout/gen.go b/pkg/networkservice/common/timeout/gen.go
@@ -18,20 +18,10 @@ package timeout
 
 import (
 	"sync"
-	"time"
 )
 
 //go:generate go-syncmap -output timer_map.gen.go -type timerMap<string,*time.Timer>
 //go:generate go-syncmap -output executor_map.gen.go -type executorMap<string,*github.com/edwarnicke/serialize.Executor>
 
 type timerMap sync.Map
-
-func (m *timerMap) LoadAndDelete(key string) (*time.Timer, bool) {
-	value, loaded := (*sync.Map)(m).LoadAndDelete(key)
-	if value == nil {
-		return nil, loaded
-	}
-	return value.(*time.Timer), loaded
-}
-
 type executorMap sync.Map