Make events chan local to supervisor

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2015-12-02 17:44:39 -08:00
parent 5eac8891ed
commit 3ea5dd79e0
2 changed files with 4 additions and 8 deletions

View File

@ -89,10 +89,9 @@ func daemon(stateDir string, concurrency, bufferSize int) error {
w := containerd.NewWorker(supervisor, wg)
go w.Start()
}
events := make(chan *containerd.Event, bufferSize)
// start the signal handler in the background.
go startSignalHandler(supervisor, bufferSize)
if err := supervisor.Start(events); err != nil {
if err := supervisor.Start(); err != nil {
return err
}
server := v1.NewServer(supervisor)

View File

@ -31,6 +31,7 @@ func NewSupervisor(stateDir string, tasks chan *StartTask) (*Supervisor, error)
runtime: r,
journal: j,
tasks: tasks,
events: make(chan *Event, 2048),
}
// register default event handlers
s.handlers = map[EventType]Handler{
@ -87,16 +88,12 @@ func (s *Supervisor) NotifySubscribers(e *Event) {
// executing new containers.
//
// This event loop is the only thing that is allowed to modify state of containers and processes.
func (s *Supervisor) Start(events chan *Event) error {
if events == nil {
return ErrEventChanNil
}
s.events = events
func (s *Supervisor) Start() error {
go func() {
// allocate an entire thread to this goroutine for the main event loop
// so that nothing else is scheduled over the top of it.
goruntime.LockOSThread()
for e := range events {
for e := range s.events {
EventsCounter.Inc(1)
s.journal.write(e)
h, ok := s.handlers[e.Type]