opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-09-09 23:42:20 +08:00
Code Issues Projects Releases Wiki Activity

Allow for gc during adds

Browse Source 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
This commit is contained in:
Jeromy
2015-12-05 20:31:25 -08:00
parent be09205310
commit c49dcffce2
4 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
blocks/blockstore/blockstore.go
View File

@ -5,6 +5,7 @@ package blockstore
import (
"errors"
"sync"
"sync/atomic"
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
dsns "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/namespace"
@ -49,6 +50,10 @@ type GCBlockstore interface {
// at the same time, but no GC should not happen simulatenously.
// Reading during Pinning is safe, and requires no lock.
PinLock() func()
// GcRequested returns true if GCLock has been called and is waiting to
// take the lock
GCRequested() bool
}
func NewBlockstore(d ds.Batching) *blockstore {
@ -63,7 +68,9 @@ func NewBlockstore(d ds.Batching) *blockstore {
type blockstore struct {
datastore ds.Batching
lk sync.RWMutex
lk sync.RWMutex
gcreq int32
gcreqlk sync.Mutex
}
func (bs *blockstore) Get(k key.Key) (*blocks.Block, error) {
@ -192,7 +199,9 @@ func (bs *blockstore) AllKeysChan(ctx context.Context) (<-chan key.Key, error) {
}
func (bs *blockstore) GCLock() func() {
atomic.AddInt32(&bs.gcreq, 1)
bs.lk.Lock()
atomic.AddInt32(&bs.gcreq, -1)
return bs.lk.Unlock
}
@ -200,3 +209,7 @@ func (bs *blockstore) PinLock() func() {
bs.lk.RLock()
return bs.lk.RUnlock
}
func (bs *blockstore) GCRequested() bool {
return atomic.LoadInt32(&bs.gcreq) > 0
}

4
blocks/blockstore/write_cache.go
View File

@ -66,3 +66,7 @@ func (w *writecache) GCLock() func() {
func (w *writecache) PinLock() func() {
return w.blockstore.(GCBlockstore).PinLock()
}
func (w *writecache) GCRequested() bool {
return w.blockstore.(GCBlockstore).GCRequested()
}