gopkg/puddle
2
0
Fork 0
Code Activity

Consistently use term acquired instead of borrowed

Browse Source
This commit is contained in:
Jack Christensen
2018-12-26 13:20:14 -06:00
parent 47190588bc
commit ebf42e3ab9
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pool.go
+13 -13
View File
@@ -9,7 +9,7 @@ import (
const ( const (
resourceStatusCreating = 0 resourceStatusCreating = 0
resourceStatusAvailable = iota resourceStatusAvailable = iota
resourceStatusBorrowed = iota resourceStatusAcquired = iota
resourceStatusHijacked = iota resourceStatusHijacked = iota
) )
@@ -30,26 +30,26 @@ func (res *Resource) Value() interface{} {
} }
func (res *Resource) Release() { func (res *Resource) Release() {
if res.status != resourceStatusBorrowed { if res.status != resourceStatusAcquired {
panic("tried to release resource that is not acquired") panic("tried to release resource that is not acquired")
} }
res.pool.releaseBorrowedResource(res) res.pool.releaseAcquiredResource(res)
} }
func (res *Resource) Destroy() { func (res *Resource) Destroy() {
if res.status != resourceStatusBorrowed { if res.status != resourceStatusAcquired {
panic("tried to destroy resource that is not acquired") panic("tried to destroy resource that is not acquired")
} }
res.pool.destroyBorrowedResource(res) res.pool.destroyAcquiredResource(res)
} }
// Hijack removes the resource from the pool without destroying it. Caller is // Hijack removes the resource from the pool without destroying it. Caller is
// responsible for cleanup of resource value. // responsible for cleanup of resource value.
func (res *Resource) Hijack() { func (res *Resource) Hijack() {
if res.status != resourceStatusBorrowed { if res.status != resourceStatusAcquired {
panic("tried to hijack resource that is not acquired") panic("tried to hijack resource that is not acquired")
} }
res.pool.hijackBorrowedResource(res) res.pool.hijackAcquiredResource(res)
} }
// Pool is a thread-safe resource pool. // Pool is a thread-safe resource pool.
@@ -155,7 +155,7 @@ func (p *Pool) Acquire(ctx context.Context) (*Resource, error) {
} }
res.value = value res.value = value
res.status = resourceStatusBorrowed res.status = resourceStatusAcquired
p.cond.L.Unlock() p.cond.L.Unlock()
return res, nil return res, nil
} }
@@ -195,12 +195,12 @@ func (p *Pool) lockedAvailableAcquire() *Resource {
if rw.status != resourceStatusAvailable { if rw.status != resourceStatusAvailable {
panic("BUG: unavailable resource gotten from availableResources") panic("BUG: unavailable resource gotten from availableResources")
} }
rw.status = resourceStatusBorrowed rw.status = resourceStatusAcquired
return rw return rw
} }
// releaseBorrowedResource returns res to the the pool. // releaseAcquiredResource returns res to the the pool.
func (p *Pool) releaseBorrowedResource(res *Resource) { func (p *Pool) releaseAcquiredResource(res *Resource) {
p.cond.L.Lock() p.cond.L.Lock()
if !p.closed { if !p.closed {
@@ -217,7 +217,7 @@ func (p *Pool) releaseBorrowedResource(res *Resource) {
// Remove removes res from the pool and closes it. If res is not part of the // Remove removes res from the pool and closes it. If res is not part of the
// pool Remove will panic. // pool Remove will panic.
func (p *Pool) destroyBorrowedResource(res *Resource) { func (p *Pool) destroyAcquiredResource(res *Resource) {
p.cond.L.Lock() p.cond.L.Lock()
p.allResources = removeResource(p.allResources, res) p.allResources = removeResource(p.allResources, res)
@@ -227,7 +227,7 @@ func (p *Pool) destroyBorrowedResource(res *Resource) {
p.cond.Signal() p.cond.Signal()
} }
func (p *Pool) hijackBorrowedResource(res *Resource) { func (p *Pool) hijackAcquiredResource(res *Resource) {
p.cond.L.Lock() p.cond.L.Lock()
p.allResources = removeResource(p.allResources, res) p.allResources = removeResource(p.allResources, res)