github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move runtime interfaces to runtime package

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-06-28 10:10:59 -07:00
parent bd25543f5a
commit 7c8acca29a
11 changed files with 72 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
metrics/cgroups/cgroups.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/containerd/cgroups"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/runtime"
metrics "github.com/docker/go-metrics"
"golang.org/x/net/context"
)
@@ -40,10 +41,10 @@ type cgroupsMonitor struct {
collector *Collector
oom *OOMCollector
context context.Context
events chan<- *plugin.Event
events chan<- *runtime.Event
}
func (m *cgroupsMonitor) Monitor(c plugin.Task) error {
func (m *cgroupsMonitor) Monitor(c runtime.Task) error {
info := c.Info()
state, err := c.State(m.context)
if err != nil {
@@ -59,20 +60,20 @@ func (m *cgroupsMonitor) Monitor(c plugin.Task) error {
return m.oom.Add(info.ID, info.Namespace, cg, m.trigger)
}
func (m *cgroupsMonitor) Stop(c plugin.Task) error {
func (m *cgroupsMonitor) Stop(c runtime.Task) error {
info := c.Info()
m.collector.Remove(info.ID, info.Namespace)
return nil
}
func (m *cgroupsMonitor) Events(events chan<- *plugin.Event) {
func (m *cgroupsMonitor) Events(events chan<- *runtime.Event) {
m.events = events
}
func (m *cgroupsMonitor) trigger(id string, cg cgroups.Cgroup) {
m.events <- &plugin.Event{
m.events <- &runtime.Event{
Timestamp: time.Now(),
Type: plugin.OOMEvent,
Type: runtime.OOMEvent,
ID: id,
}
}