* Remove specialized handler and archive struct and restructure handlers pkg. * Refactor RPM archive handlers to use a library instead of shelling out * make rpm handling context aware * update test * Refactor AR/deb archive handler to use an existing library instead of shelling out * Update tests * Handle non-archive data within the DefaultHandler * make structs and methods private * Remove non-archive data handling within sources * add max size check * add filename and size to context kvp * move skip file check and is binary check before opening file * fix test * preserve existing funcitonality of not handling non-archive files in HandleFile * Handle non-archive data within the DefaultHandler * rebase * Remove non-archive data handling within sources * Adjust check for rpm/deb archive type * add additional deb mime type * add gzip * move diskbuffered rereader setup into handler pkg * remove DiskBuffereReader creation logic within sources * update comment * move rewind closer * reduce log verbosity * add metrics for file handling * add metrics for errors * make defaultBufferSize a const * add metrics for file handling * add metrics for errors * fix tests * add metrics for max archive depth and skipped files * update error * skip symlinks and dirs * update err * Address incompatible reader to openArchive * remove nil check * fix err assignment * Allow git cat-file blob to complete before trying to handle the file * wrap compReader with DiskbufferReader * Allow git cat-file blob to complete before trying to handle the file * updates * use buffer writer * update * refactor * update context pkg * revert stuff * update test * fix test * remove * use correct reader * add metrics for file handling * add metrics for errors * fix tests * rebase * add metrics for errors * add metrics for max archive depth and skipped files * update error * skip symlinks and dirs * update err * fix err assignment * rebase * remove * Update write method in contentWriter interface * Add bufferReadSeekCloser * update name * update comment * fix lint * Remove specialized handler and archive struct and restructure handlers pkg. * Refactor RPM archive handlers to use a library instead of shelling out * make rpm handling context aware * update test * Refactor AR/deb archive handler to use an existing library instead of shelling out * Update tests * add max size check * add filename and size to context kvp * move skip file check and is binary check before opening file * fix test * preserve existing funcitonality of not handling non-archive files in HandleFile * Handle non-archive data within the DefaultHandler * rebase * Remove non-archive data handling within sources * Handle non-archive data within the DefaultHandler * add gzip * move diskbuffered rereader setup into handler pkg * remove DiskBuffereReader creation logic within sources * update comment * move rewind closer * reduce log verbosity * make defaultBufferSize a const * add metrics for file handling * add metrics for errors * fix tests * add metrics for max archive depth and skipped files * update error * skip symlinks and dirs * update err * Address incompatible reader to openArchive * remove nil check * fix err assignment * wrap compReader with DiskbufferReader * Allow git cat-file blob to complete before trying to handle the file * updates * use buffer writer * update * refactor * update context pkg * revert stuff * update test * remove * rebase * go mod tidy * lint check * update metric to ms * update metric * update comments * dont use ptr * update * fix * Remove specialized handler and archive struct and restructure handlers pkg. * Refactor RPM archive handlers to use a library instead of shelling out * make rpm handling context aware * update test * Refactor AR/deb archive handler to use an existing library instead of shelling out * Update tests * add max size check * add filename and size to context kvp * move skip file check and is binary check before opening file * fix test * preserve existing funcitonality of not handling non-archive files in HandleFile * Adjust check for rpm/deb archive type * add additional deb mime type * update comment * go mod tidy * update go mod * Add a buffered file reader * update comments * use Buffered File Readder * return buffer * update * fix * return * go mod tidy * merge * use a shared pool * use sync.Once * reorganzie * remove unused code * fix double init * fix stuff * nil check * reduce allocations * updates * update metrics * updates * reset buffer instead of putting it back * skip binaries * skip * concurrently process diffs * close chan * concurrently enumerate orgs * increase workers * ignore pbix and vsdx files * add metrics for gitparse's Diffchan * fix metric * update metrics * update * fix checks * fix * inc * update * reduce * Create workers to handle binary files * modify workers * updates * add check * delete code * use custom reader * rename struct * add nonarchive handler * fix break * add comments * add tests * refactor * remove log * do not scan rpm links * simplify * rename var * rename * fix benchmark * add buffer * buffer * buffer * handle panic * merge main * merge main * add recover * revert stuff * revert * revert to using reader * fixes * remove * update * fixes * linter * fix test * move buffers pkg out of writers pkg * rename * [refactor] - move buffer pool logic into own pkg (#2828) * move buffer pool logic into own pkg * fix test * fix test * whoops * [feat] - additional buffer pool (#2829) * move buffer pool logic into own pkg * move * fix test * fix test * fix test * remove * fix test * whoops * revert * fix
79 lines
1.7 KiB
Go
79 lines
1.7 KiB
Go
package pool
|
|
|
|
import (
|
|
"bytes"
|
|
"sync"
|
|
|
|
"github.com/trufflesecurity/trufflehog/v3/pkg/buffers/buffer"
|
|
)
|
|
|
|
type poolMetrics struct{}
|
|
|
|
func (poolMetrics) recordShrink(amount int) {
|
|
shrinkCount.Inc()
|
|
shrinkAmount.Add(float64(amount))
|
|
}
|
|
|
|
func (poolMetrics) recordBufferRetrival() {
|
|
activeBufferCount.Inc()
|
|
checkoutCount.Inc()
|
|
bufferCount.Inc()
|
|
}
|
|
|
|
func (poolMetrics) recordBufferReturn(buf *buffer.Buffer) {
|
|
activeBufferCount.Dec()
|
|
buf.RecordMetric()
|
|
}
|
|
|
|
// Pool of buffers.
|
|
type Pool struct {
|
|
*sync.Pool
|
|
bufferSize int
|
|
|
|
metrics poolMetrics
|
|
}
|
|
|
|
const defaultBufferSize = 1 << 12 // 4KB
|
|
// NewBufferPool creates a new instance of BufferPool.
|
|
func NewBufferPool(size int) *Pool {
|
|
pool := &Pool{bufferSize: size}
|
|
|
|
pool.Pool = &sync.Pool{
|
|
New: func() any {
|
|
return &buffer.Buffer{Buffer: bytes.NewBuffer(make([]byte, 0, pool.bufferSize))}
|
|
},
|
|
}
|
|
|
|
return pool
|
|
}
|
|
|
|
// Get returns a Buffer from the pool.
|
|
func (p *Pool) Get() *buffer.Buffer {
|
|
buf, ok := p.Pool.Get().(*buffer.Buffer)
|
|
if !ok {
|
|
buf = &buffer.Buffer{Buffer: bytes.NewBuffer(make([]byte, 0, p.bufferSize))}
|
|
}
|
|
p.metrics.recordBufferRetrival()
|
|
buf.ResetMetric()
|
|
|
|
return buf
|
|
}
|
|
|
|
// Put returns a Buffer to the pool.
|
|
func (p *Pool) Put(buf *buffer.Buffer) {
|
|
p.metrics.recordBufferReturn(buf)
|
|
|
|
// If the Buffer is more than twice the default size, replace it with a new Buffer.
|
|
// This prevents us from returning very large buffers to the pool.
|
|
const maxAllowedCapacity = 2 * defaultBufferSize
|
|
if buf.Cap() > int(maxAllowedCapacity) {
|
|
p.metrics.recordShrink(buf.Cap() - defaultBufferSize)
|
|
buf = &buffer.Buffer{Buffer: bytes.NewBuffer(make([]byte, 0, p.bufferSize))}
|
|
} else {
|
|
// Reset the Buffer to clear any existing data.
|
|
buf.Reset()
|
|
}
|
|
|
|
p.Pool.Put(buf)
|
|
}
|