From b8530cb803abaa5512b978580f5d6c6628a9cf51 Mon Sep 17 00:00:00 2001 From: Oliver Tonnhofer Date: Fri, 20 Nov 2015 22:54:53 +0100 Subject: [PATCH] remove freeBuffer/freeNode hack --- cache/delta.go | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/cache/delta.go b/cache/delta.go index 871593e..39c0684 100644 --- a/cache/delta.go +++ b/cache/delta.go @@ -322,10 +322,6 @@ func (self *DeltaCoordsCache) PutCoords(nodes []element.Node) error { return nil } -var ( - freeBuffer = make(chan []byte, 4) -) - func (p *DeltaCoordsCache) putCoordsPacked(bunchId int64, nodes []element.Node) error { keyBuf := idToKeyBuf(bunchId) @@ -333,12 +329,7 @@ func (p *DeltaCoordsCache) putCoordsPacked(bunchId int64, nodes []element.Node) return p.db.Delete(p.wo, keyBuf) } - var data []byte - select { - case data = <-freeBuffer: - default: - } - + data := make([]byte, 512) data = binary.MarshalDeltaNodes(nodes, data) err := p.db.Put(p.wo, keyBuf, data) @@ -346,11 +337,6 @@ func (p *DeltaCoordsCache) putCoordsPacked(bunchId int64, nodes []element.Node) return err } - select { - case freeBuffer <- data: - default: - } - return nil } @@ -377,10 +363,6 @@ func (self *DeltaCoordsCache) getBunchId(nodeId int64) int64 { return nodeId / self.bunchSize } -var ( - freeNodes = make(chan []element.Node, 4) -) - func (self *DeltaCoordsCache) getBunch(bunchId int64) (*coordsBunch, error) { self.mu.Lock() bunch, ok := self.table[bunchId] @@ -388,12 +370,7 @@ func (self *DeltaCoordsCache) getBunch(bunchId int64) (*coordsBunch, error) { needsGet := false if !ok { elem := self.lruList.PushFront(bunchId) - select { - case nodes = <-freeNodes: - nodes = nodes[:0] - default: - nodes = make([]element.Node, 0, self.bunchSize) - } + nodes = make([]element.Node, 0, self.bunchSize) bunch = &coordsBunch{id: bunchId, coords: nodes, elem: elem} needsGet = true self.table[bunchId] = bunch @@ -429,10 +406,6 @@ func (self *DeltaCoordsCache) CheckCapacity() error { return err } } - select { - case freeNodes <- bunch.coords: - default: - } delete(self.table, bunchId) } return nil