Merge release-20200127.0-86-g5ff7808 (automated)

2 files changed, 5 insertions, 72 deletions

diff --git a/pkg/p9/client.go b/pkg/p9/client.go
index 4045e41fa..a6f493b82 100644
--- a/pkg/p9/client.go
+++ b/pkg/p9/client.go
@@ -22,6 +22,7 @@ import (
 	"golang.org/x/sys/unix"
 	"gvisor.dev/gvisor/pkg/flipcall"
 	"gvisor.dev/gvisor/pkg/log"
+	"gvisor.dev/gvisor/pkg/pool"
 	"gvisor.dev/gvisor/pkg/sync"
 	"gvisor.dev/gvisor/pkg/unet"
 )
@@ -74,10 +75,10 @@ type Client struct {
 	socket *unet.Socket
 
 	// tagPool is the collection of available tags.
-	tagPool pool
+	tagPool pool.Pool
 
 	// fidPool is the collection of available fids.
-	fidPool pool
+	fidPool pool.Pool
 
 	// messageSize is the maximum total size of a message.
 	messageSize uint32
@@ -155,8 +156,8 @@ func NewClient(socket *unet.Socket, messageSize uint32, version string) (*Client
 	}
 	c := &Client{
 		socket:      socket,
-		tagPool:     pool{start: 1, limit: uint64(NoTag)},
-		fidPool:     pool{start: 1, limit: uint64(NoFID)},
+		tagPool:     pool.Pool{Start: 1, Limit: uint64(NoTag)},
+		fidPool:     pool.Pool{Start: 1, Limit: uint64(NoFID)},
 		pending:     make(map[Tag]*response),
 		recvr:       make(chan bool, 1),
 		messageSize: messageSize,
diff --git a/pkg/p9/pool.go b/pkg/p9/pool.go
deleted file mode 100644
index 2b14a5ce3..000000000
--- a/pkg/p9/pool.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2018 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package p9
-
-import (
-	"gvisor.dev/gvisor/pkg/sync"
-)
-
-// pool is a simple allocator.
-//
-// It is used for both tags and FIDs.
-type pool struct {
-	mu sync.Mutex
-
-	// cache is the set of returned values.
-	cache []uint64
-
-	// start is the starting value (if needed).
-	start uint64
-
-	// max is the current maximum issued.
-	max uint64
-
-	// limit is the upper limit.
-	limit uint64
-}
-
-// Get gets a value from the pool.
-func (p *pool) Get() (uint64, bool) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	// Anything cached?
-	if len(p.cache) > 0 {
-		v := p.cache[len(p.cache)-1]
-		p.cache = p.cache[:len(p.cache)-1]
-		return v, true
-	}
-
-	// Over the limit?
-	if p.start == p.limit {
-		return 0, false
-	}
-
-	// Generate a new value.
-	v := p.start
-	p.start++
-	return v, true
-}
-
-// Put returns a value to the pool.
-func (p *pool) Put(v uint64) {
-	p.mu.Lock()
-	p.cache = append(p.cache, v)
-	p.mu.Unlock()
-}