kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Avoid unnecessary copies in cacher"

This commit is contained in:
Wojciech Tyczynski 2017-02-06 16:50:44 +01:00 committed by deads2k
parent 74dc1360f1
commit c2f76cc51b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/storage/cacher.go
View File

@ -752,7 +752,7 @@ func (c *errWatcher) Stop() {
type cacheWatcher struct { type cacheWatcher struct {
sync.Mutex sync.Mutex
copier runtime.ObjectCopier copier runtime.ObjectCopier
input chan *watchCacheEvent input chan watchCacheEvent
result chan watch.Event result chan watch.Event
done chan struct{} done chan struct{}
filter watchFilterFunc filter watchFilterFunc
@ -763,7 +763,7 @@ type cacheWatcher struct {
func newCacheWatcher(copier runtime.ObjectCopier, resourceVersion uint64, chanSize int, initEvents []*watchCacheEvent, filter watchFilterFunc, forget func(bool)) *cacheWatcher { func newCacheWatcher(copier runtime.ObjectCopier, resourceVersion uint64, chanSize int, initEvents []*watchCacheEvent, filter watchFilterFunc, forget func(bool)) *cacheWatcher {
watcher := &cacheWatcher{ watcher := &cacheWatcher{
copier: copier, copier: copier,
input: make(chan *watchCacheEvent, chanSize), input: make(chan watchCacheEvent, chanSize),
result: make(chan watch.Event, chanSize), result: make(chan watch.Event, chanSize),
done: make(chan struct{}), done: make(chan struct{}),
filter: filter, filter: filter,
@ -800,7 +800,7 @@ var timerPool sync.Pool
func (c *cacheWatcher) add(event *watchCacheEvent, budget *timeBudget) { func (c *cacheWatcher) add(event *watchCacheEvent, budget *timeBudget) {
// Try to send the event immediately, without blocking. // Try to send the event immediately, without blocking.
select { select {
case c.input <- event: case c.input <- *event:
return return
default: default:
} }
@ -820,7 +820,7 @@ func (c *cacheWatcher) add(event *watchCacheEvent, budget *timeBudget) {
defer timerPool.Put(t) defer timerPool.Put(t)
select { select {
case c.input <- event: case c.input <- *event:
stopped := t.Stop() stopped := t.Stop()
if !stopped { if !stopped {
// Consume triggered (but not yet received) timer event // Consume triggered (but not yet received) timer event
@ -928,7 +928,7 @@ func (c *cacheWatcher) process(initEvents []*watchCacheEvent, resourceVersion ui
} }
// only send events newer than resourceVersion // only send events newer than resourceVersion
if event.ResourceVersion > resourceVersion { if event.ResourceVersion > resourceVersion {
c.sendWatchCacheEvent(event) c.sendWatchCacheEvent(&event)
} }
} }
} }