mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 06:04:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Remove use of freelists for chunk bufs.

Browse source 
Change-Id: Ib887fdb61e1d96da0cd32545817b925ba88831c1
This commit is contained in:
Julius Volz 2014-08-20 15:27:24 +02:00 committed by Bjoern Rabenstein
parent 7b35e0f0b8
commit 8dfaa5ecd2
5 changed files with 2 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/local/chunk.go
View file

@ -18,7 +18,6 @@ type chunk interface {
newIterator() chunkIterator
marshal(io.Writer) error
unmarshal(io.Reader) error
close()
// TODO: remove?
values() <-chan *metric.SamplePair
@ -33,7 +32,6 @@ type chunkIterator interface {
func transcodeAndAdd(dst chunk, src chunk, s *metric.SamplePair) chunks {
numTranscodes.Inc()
defer src.close()
head := dst
body := chunks{}

11
storage/local/delta.go
View file

@ -51,8 +51,7 @@ type deltaEncodedChunk struct {
}
func newDeltaEncodedChunk(tb, vb deltaBytes, isInt bool) *deltaEncodedChunk {
buf := chunkBufs.Get()
buf = buf[:deltaHeaderIsIntOffset+1]
buf := make([]byte, deltaHeaderIsIntOffset+1, 1024)
buf[deltaHeaderTimeBytesOffset] = byte(tb)
buf[deltaHeaderValueBytesOffset] = byte(vb)
@ -73,8 +72,7 @@ func (c *deltaEncodedChunk) newFollowupChunk() chunk {
}
func (c *deltaEncodedChunk) clone() chunk {
buf := chunkBufs.Get()
buf = buf[:len(c.buf)]
buf := make([]byte, len(c.buf), 1024)
copy(buf, c.buf)
return &deltaEncodedChunk{
buf: buf,
@ -236,11 +234,6 @@ func (c *deltaEncodedChunk) add(s *metric.SamplePair) chunks {
return chunks{c}
}
func (c *deltaEncodedChunk) close() {
//fmt.Println("returning chunk")
chunkBufs.Give(c.buf)
}
func (c *deltaEncodedChunk) sampleSize() int {
return int(c.timeBytes() + c.valueBytes())
}

44
storage/local/freelist.go
View file

@ -1,44 +0,0 @@
package storage_ng
import (
"github.com/prometheus/prometheus/utility"
)
var chunkBufs = newChunkBufList(10000, 10000)
type chunkBufList struct {
l utility.FreeList
}
func newChunkBuf() []byte {
return make([]byte, 0, 1024) // TODO: This value somehow needs to be set in coordination with the one passed into the disk persistence.
}
func newChunkBufList(length, capacity int) *chunkBufList {
l := &chunkBufList{
l: utility.NewFreeList(capacity),
}
for i := 0; i < length; i++ {
l.l.Give(newChunkBuf())
}
return l
}
func (l *chunkBufList) Get() []byte {
numChunkGets.Inc()
if v, ok := l.l.Get(); ok {
return v.([]byte)
}
return newChunkBuf()
}
func (l *chunkBufList) Give(v []byte) bool {
numChunkGives.Inc()
v = v[:0]
return l.l.Give(v)
}
func (l *chunkBufList) Close() {
l.l.Close()
}

3
storage/local/persistence.go
View file

@ -148,9 +148,6 @@ func (p *diskPersistence) LoadChunks(fp clientmodel.Fingerprint, indexes []int)
if err == nil {
return
}
for _, c := range chunks {
c.close()
}
}()
typeBuf := make([]byte, 1)

1
storage/local/series.go
View file

@ -93,7 +93,6 @@ func (cd *chunkDesc) evictOnUnpin() {
func (cd *chunkDesc) evictNow() {
cd.firstTimeField = cd.chunk.firstTime()
cd.lastTimeField = cd.chunk.lastTime()
cd.chunk.close()
cd.chunk = nil
}