modules/sync: rename SingleInstancePool to ExclusivePool
This commit is contained in:
parent
c0c1a4b01b
commit
43297148b2
3 changed files with 12 additions and 11 deletions
|
@ -40,7 +40,7 @@ const (
|
||||||
_TPL_UPDATE_HOOK = "#!/usr/bin/env %s\n%s update $1 $2 $3 --config='%s'\n"
|
_TPL_UPDATE_HOOK = "#!/usr/bin/env %s\n%s update $1 $2 $3 --config='%s'\n"
|
||||||
)
|
)
|
||||||
|
|
||||||
var repoWorkingPool = sync.NewSingleInstancePool()
|
var repoWorkingPool = sync.NewExclusivePool()
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrRepoFileNotExist = errors.New("Repository file does not exist")
|
ErrRepoFileNotExist = errors.New("Repository file does not exist")
|
||||||
|
|
|
@ -21,7 +21,7 @@ import (
|
||||||
"github.com/gogits/gogs/modules/sync"
|
"github.com/gogits/gogs/modules/sync"
|
||||||
)
|
)
|
||||||
|
|
||||||
var wikiWorkingPool = sync.NewSingleInstancePool()
|
var wikiWorkingPool = sync.NewExclusivePool()
|
||||||
|
|
||||||
// ToWikiPageURL formats a string to corresponding wiki URL name.
|
// ToWikiPageURL formats a string to corresponding wiki URL name.
|
||||||
func ToWikiPageURL(name string) string {
|
func ToWikiPageURL(name string) string {
|
||||||
|
|
|
@ -8,14 +8,15 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SingleInstancePool is a pool of non-identical instances
|
// ExclusivePool is a pool of non-identical instances
|
||||||
// that only one instance with same identity is in the pool at a time.
|
// that only one instance with same identity is in the pool at a time.
|
||||||
// In other words, only instances with different identities can exist
|
// In other words, only instances with different identities can be in
|
||||||
// at the same time.
|
// the pool the same time. If another instance with same identity tries
|
||||||
|
// to get into the pool, it hangs until previous instance left the pool.
|
||||||
//
|
//
|
||||||
// This pool is particularly useful for performing tasks on same resource
|
// This pool is particularly useful for performing tasks on same resource
|
||||||
// on the file system in different goroutines.
|
// on the file system in different goroutines.
|
||||||
type SingleInstancePool struct {
|
type ExclusivePool struct {
|
||||||
lock sync.Mutex
|
lock sync.Mutex
|
||||||
|
|
||||||
// pool maintains locks for each instance in the pool.
|
// pool maintains locks for each instance in the pool.
|
||||||
|
@ -29,9 +30,9 @@ type SingleInstancePool struct {
|
||||||
count map[string]int
|
count map[string]int
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewSingleInstancePool initializes and returns a new SingleInstancePool object.
|
// NewExclusivePool initializes and returns a new ExclusivePool object.
|
||||||
func NewSingleInstancePool() *SingleInstancePool {
|
func NewExclusivePool() *ExclusivePool {
|
||||||
return &SingleInstancePool{
|
return &ExclusivePool{
|
||||||
pool: make(map[string]*sync.Mutex),
|
pool: make(map[string]*sync.Mutex),
|
||||||
count: make(map[string]int),
|
count: make(map[string]int),
|
||||||
}
|
}
|
||||||
|
@ -39,7 +40,7 @@ func NewSingleInstancePool() *SingleInstancePool {
|
||||||
|
|
||||||
// CheckIn checks in an instance to the pool and hangs while instance
|
// CheckIn checks in an instance to the pool and hangs while instance
|
||||||
// with same indentity is using the lock.
|
// with same indentity is using the lock.
|
||||||
func (p *SingleInstancePool) CheckIn(identity string) {
|
func (p *ExclusivePool) CheckIn(identity string) {
|
||||||
p.lock.Lock()
|
p.lock.Lock()
|
||||||
|
|
||||||
lock, has := p.pool[identity]
|
lock, has := p.pool[identity]
|
||||||
|
@ -55,7 +56,7 @@ func (p *SingleInstancePool) CheckIn(identity string) {
|
||||||
|
|
||||||
// CheckOut checks out an instance from the pool and releases the lock
|
// CheckOut checks out an instance from the pool and releases the lock
|
||||||
// to let other instances with same identity to grab the lock.
|
// to let other instances with same identity to grab the lock.
|
||||||
func (p *SingleInstancePool) CheckOut(identity string) {
|
func (p *ExclusivePool) CheckOut(identity string) {
|
||||||
p.lock.Lock()
|
p.lock.Lock()
|
||||||
defer p.lock.Unlock()
|
defer p.lock.Unlock()
|
||||||
|
|
Loading…
Reference in a new issue