@@ -16,7 +16,7 @@ import (

 	"strings"

 	"time"

-	containerd_cgroups "github.com/containerd/cgroups"

+	v1 "github.com/containerd/cgroups/stats/v1"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/blkiodev"

 	pblkiodev "github.com/docker/docker/api/types/blkiodev"

@@ -1347,7 +1347,7 @@ func (daemon *Daemon) conditionalUnmountOnCleanup(container *container.Container

 	return daemon.Unmount(container)

 }

-func copyBlkioEntry(entries []*containerd_cgroups.BlkIOEntry) []types.BlkioStatEntry {

+func copyBlkioEntry(entries []*v1.BlkIOEntry) []types.BlkioStatEntry {

 	out := make([]types.BlkioStatEntry, len(entries))

 	for i, re := range entries {

 		out[i] = types.BlkioStatEntry{

@@ -3,8 +3,8 @@ package types // import "github.com/docker/docker/libcontainerd/types"

 import (

 	"time"

-	"github.com/containerd/cgroups"

-	"github.com/opencontainers/runtime-spec/specs-go"

+	v1 "github.com/containerd/cgroups/stats/v1"

+	specs "github.com/opencontainers/runtime-spec/specs-go"

 )

 // Summary is not used on linux

@@ -13,13 +13,13 @@ type Summary struct{}

 // Stats holds metrics properties as returned by containerd

 type Stats struct {

 	Read    time.Time

-	Metrics *cgroups.Metrics

+	Metrics *v1.Metrics

 }

 // InterfaceToStats returns a stats object from the platform-specific interface.

 func InterfaceToStats(read time.Time, v interface{}) *Stats {

 	return &Stats{

-		Metrics: v.(*cgroups.Metrics),

+		Metrics: v.(*v1.Metrics),

 		Read:    read,

 	}

 }

@@ -120,7 +120,7 @@ google.golang.org/genproto                          694d95ba50e67b2e363f3483057d

 github.com/containerd/containerd                    7c1e88399ec0b0b077121d9d5ad97e647b11c870

 github.com/containerd/fifo                          a9fb20d87448d386e6d50b1f2e1fa70dcf0de43c

 github.com/containerd/continuity                    aaeac12a7ffcd198ae25440a9dff125c2e2703a7

-github.com/containerd/cgroups                       c4b9ac5c7601384c965b9646fc515884e091ebb9

+github.com/containerd/cgroups                       5fbad35c2a7e855762d3c60f2e474ffcad0d470a

 github.com/containerd/console                       0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f

 github.com/containerd/go-runc                       e029b79d8cda8374981c64eba71f28ec38e5526f

 github.com/containerd/typeurl                       2a93cfde8c20b23de8eb84a5adbc234ddf7a9e8d

@@ -26,17 +26,33 @@ import (

 	"strconv"

 	"strings"

+	v1 "github.com/containerd/cgroups/stats/v1"

 	specs "github.com/opencontainers/runtime-spec/specs-go"

 )

-func NewBlkio(root string) *blkioController {

-	return &blkioController{

-		root: filepath.Join(root, string(Blkio)),

+// NewBlkio returns a Blkio controller given the root folder of cgroups.

+// It may optionally accept other configuration options, such as ProcRoot(path)

+func NewBlkio(root string, options ...func(controller *blkioController)) *blkioController {

+	ctrl := &blkioController{

+		root:     filepath.Join(root, string(Blkio)),

+		procRoot: "/proc",

+	}

+	for _, opt := range options {

+		opt(ctrl)

+	}

+	return ctrl

+}

+

+// ProcRoot overrides the default location of the "/proc" filesystem

+func ProcRoot(path string) func(controller *blkioController) {

+	return func(c *blkioController) {

+		c.procRoot = path

 	}

 }

 type blkioController struct {

-	root string

+	root     string

+	procRoot string

 }

 func (b *blkioController) Name() Name {

@@ -72,8 +88,8 @@ func (b *blkioController) Update(path string, resources *specs.LinuxResources) e

 	return b.Create(path, resources)

 }

-func (b *blkioController) Stat(path string, stats *Metrics) error {

-	stats.Blkio = &BlkIOStat{}

+func (b *blkioController) Stat(path string, stats *v1.Metrics) error {

+	stats.Blkio = &v1.BlkIOStat{}

 	settings := []blkioStatSettings{

 		{

 			name:  "throttle.io_serviced",

@@ -122,7 +138,7 @@ func (b *blkioController) Stat(path string, stats *Metrics) error {

 			},

 		)

 	}

-	f, err := os.Open("/proc/diskstats")

+	f, err := os.Open(filepath.Join(b.procRoot, "diskstats"))

 	if err != nil {

 		return err

 	}

@@ -141,7 +157,7 @@ func (b *blkioController) Stat(path string, stats *Metrics) error {

 	return nil

 }

-func (b *blkioController) readEntry(devices map[deviceKey]string, path, name string, entry *[]*BlkIOEntry) error {

+func (b *blkioController) readEntry(devices map[deviceKey]string, path, name string, entry *[]*v1.BlkIOEntry) error {

 	f, err := os.Open(filepath.Join(b.Path(path), fmt.Sprintf("blkio.%s", name)))

 	if err != nil {

 		return err

@@ -180,7 +196,7 @@ func (b *blkioController) readEntry(devices map[deviceKey]string, path, name str

 		if err != nil {

 			return err

 		}

-		*entry = append(*entry, &BlkIOEntry{

+		*entry = append(*entry, &v1.BlkIOEntry{

 			Device: devices[deviceKey{major, minor}],

 			Major:  major,

 			Minor:  minor,

@@ -268,7 +284,7 @@ type blkioSettings struct {

 type blkioStatSettings struct {

 	name  string

-	entry *[]*BlkIOEntry

+	entry *[]*v1.BlkIOEntry

 }

 func uintf(v interface{}) []byte {

@@ -25,6 +25,7 @@ import (

 	"strings"

 	"sync"

+	v1 "github.com/containerd/cgroups/stats/v1"

 	specs "github.com/opencontainers/runtime-spec/specs-go"

 	"github.com/pkg/errors"

 )

@@ -246,7 +247,7 @@ func (c *cgroup) Delete() error {

 }

 // Stat returns the current metrics for the cgroup

-func (c *cgroup) Stat(handlers ...ErrorHandler) (*Metrics, error) {

+func (c *cgroup) Stat(handlers ...ErrorHandler) (*v1.Metrics, error) {

 	c.mu.Lock()

 	defer c.mu.Unlock()

 	if c.err != nil {

@@ -256,10 +257,10 @@ func (c *cgroup) Stat(handlers ...ErrorHandler) (*Metrics, error) {

 		handlers = append(handlers, errPassthrough)

 	}

 	var (

-		stats = &Metrics{

-			CPU: &CPUStat{

-				Throttling: &Throttle{},

-				Usage:      &CPUUsage{},

+		stats = &v1.Metrics{

+			CPU: &v1.CPUStat{

+				Throttling: &v1.Throttle{},

+				Usage:      &v1.CPUUsage{},

 			},

 		}

 		wg   = &sync.WaitGroup{}

@@ -19,6 +19,7 @@ package cgroups

 import (

 	"os"

+	v1 "github.com/containerd/cgroups/stats/v1"

 	specs "github.com/opencontainers/runtime-spec/specs-go"

 )

@@ -68,7 +69,7 @@ type Cgroup interface {

 	// subsystems are moved one at a time

 	MoveTo(Cgroup) error

 	// Stat returns the stats for all subsystems in the cgroup

-	Stat(...ErrorHandler) (*Metrics, error)

+	Stat(...ErrorHandler) (*v1.Metrics, error)

 	// Update updates all the subsystems with the provided resource changes

 	Update(resources *specs.LinuxResources) error

 	// Processes returns all the processes in a select subsystem for the cgroup

@@ -24,6 +24,7 @@ import (

 	"path/filepath"

 	"strconv"

+	v1 "github.com/containerd/cgroups/stats/v1"

 	specs "github.com/opencontainers/runtime-spec/specs-go"

 )

@@ -100,7 +101,7 @@ func (c *cpuController) Update(path string, resources *specs.LinuxResources) err

 	return c.Create(path, resources)

 }

-func (c *cpuController) Stat(path string, stats *Metrics) error {

+func (c *cpuController) Stat(path string, stats *v1.Metrics) error {

 	f, err := os.Open(filepath.Join(c.Path(path), "cpu.stat"))

 	if err != nil {

 		return err

@@ -22,6 +22,8 @@ import (

 	"path/filepath"

 	"strconv"

 	"strings"

+

+	v1 "github.com/containerd/cgroups/stats/v1"

 )

 const nanosecondsInSecond = 1000000000

@@ -46,7 +48,7 @@ func (c *cpuacctController) Path(path string) string {

 	return filepath.Join(c.root, path)

 }

-func (c *cpuacctController) Stat(path string, stats *Metrics) error {

+func (c *cpuacctController) Stat(path string, stats *v1.Metrics) error {

 	user, kernel, err := c.getUsage(path)

 	if err != nil {

 		return err

new file mode 100644

@@ -0,0 +1,13 @@

+module github.com/containerd/cgroups

+

+go 1.12

+

+require (

+	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e

+	github.com/docker/go-units v0.4.0

+	github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e

+	github.com/gogo/protobuf v1.2.1

+	github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700

+	github.com/pkg/errors v0.8.1

+	golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f

+)

@@ -23,6 +23,7 @@ import (

 	"strconv"

 	"strings"

+	v1 "github.com/containerd/cgroups/stats/v1"

 	specs "github.com/opencontainers/runtime-spec/specs-go"

 )

@@ -67,7 +68,7 @@ func (h *hugetlbController) Create(path string, resources *specs.LinuxResources)

 	return nil

 }

-func (h *hugetlbController) Stat(path string, stats *Metrics) error {

+func (h *hugetlbController) Stat(path string, stats *v1.Metrics) error {

 	for _, size := range h.sizes {

 		s, err := h.readSizeStat(path, size)

 		if err != nil {

@@ -78,8 +79,8 @@ func (h *hugetlbController) Stat(path string, stats *Metrics) error {

 	return nil

 }

-func (h *hugetlbController) readSizeStat(path, size string) (*HugetlbStat, error) {

-	s := HugetlbStat{

+func (h *hugetlbController) readSizeStat(path, size string) (*v1.HugetlbStat, error) {

+	s := v1.HugetlbStat{

 		Pagesize: size,

 	}

 	for _, t := range []struct {

@@ -27,19 +27,48 @@ import (

 	"strings"

 	"syscall"

-	"golang.org/x/sys/unix"

-

+	v1 "github.com/containerd/cgroups/stats/v1"

 	specs "github.com/opencontainers/runtime-spec/specs-go"

+	"golang.org/x/sys/unix"

 )

-func NewMemory(root string) *memoryController {

-	return &memoryController{

-		root: filepath.Join(root, string(Memory)),

+// NewMemory returns a Memory controller given the root folder of cgroups.

+// It may optionally accept other configuration options, such as IgnoreModules(...)

+func NewMemory(root string, options ...func(*memoryController)) *memoryController {

+	mc := &memoryController{

+		root:    filepath.Join(root, string(Memory)),

+		ignored: map[string]struct{}{},

+	}

+	for _, opt := range options {

+		opt(mc)

+	}

+	return mc

+}

+

+// IgnoreModules configure the memory controller to not read memory metrics for some

+// module names (e.g. passing "memsw" would avoid all the memory.memsw.* entries)

+func IgnoreModules(names ...string) func(*memoryController) {

+	return func(mc *memoryController) {

+		for _, name := range names {

+			mc.ignored[name] = struct{}{}

+		}

+	}

+}

+

+// OptionalSwap allows the memory controller to not fail if cgroups is not accounting

+// Swap memory (there are no memory.memsw.* entries)

+func OptionalSwap() func(*memoryController) {

+	return func(mc *memoryController) {

+		_, err := os.Stat(filepath.Join(mc.root, "memory.memsw.usage_in_bytes"))

+		if os.IsNotExist(err) {

+			mc.ignored["memsw"] = struct{}{}

+		}

 	}

 }

 type memoryController struct {

-	root string

+	root    string

+	ignored map[string]struct{}

 }

 func (m *memoryController) Name() Name {

@@ -97,24 +126,24 @@ func (m *memoryController) Update(path string, resources *specs.LinuxResources)

 	return m.set(path, settings)

 }

-func (m *memoryController) Stat(path string, stats *Metrics) error {

+func (m *memoryController) Stat(path string, stats *v1.Metrics) error {

 	f, err := os.Open(filepath.Join(m.Path(path), "memory.stat"))

 	if err != nil {

 		return err

 	}

 	defer f.Close()

-	stats.Memory = &MemoryStat{

-		Usage:     &MemoryEntry{},

-		Swap:      &MemoryEntry{},

-		Kernel:    &MemoryEntry{},

-		KernelTCP: &MemoryEntry{},

+	stats.Memory = &v1.MemoryStat{

+		Usage:     &v1.MemoryEntry{},

+		Swap:      &v1.MemoryEntry{},

+		Kernel:    &v1.MemoryEntry{},

+		KernelTCP: &v1.MemoryEntry{},

 	}

 	if err := m.parseStats(f, stats.Memory); err != nil {

 		return err

 	}

 	for _, t := range []struct {

 		module string

-		entry  *MemoryEntry

+		entry  *v1.MemoryEntry

 	}{

 		{

 			module: "",

@@ -133,6 +162,9 @@ func (m *memoryController) Stat(path string, stats *Metrics) error {

 			entry:  stats.Memory.KernelTCP,

 		},

 	} {

+		if _, ok := m.ignored[t.module]; ok {

+			continue

+		}

 		for _, tt := range []struct {

 			name  string

 			value *uint64

@@ -197,7 +229,7 @@ func writeEventFD(root string, cfd, efd uintptr) error {

 	return err

 }

-func (m *memoryController) parseStats(r io.Reader, stat *MemoryStat) error {

+func (m *memoryController) parseStats(r io.Reader, stat *v1.MemoryStat) error {

 	var (

 		raw  = make(map[string]uint64)

 		sc   = bufio.NewScanner(r)

@@ -282,7 +314,7 @@ func getMemorySettings(resources *specs.LinuxResources) []memorySettings {

 			value: mem.Limit,

 		},

 		{

-			name: "soft_limit_in_bytes",

+			name:  "soft_limit_in_bytes",

 			value: mem.Reservation,

 		},

 		{

deleted file mode 100644

@@ -1,4696 +0,0 @@

-// Code generated by protoc-gen-gogo. DO NOT EDIT.

-// source: github.com/containerd/cgroups/metrics.proto

-

-/*

-	Package cgroups is a generated protocol buffer package.

-

-	It is generated from these files:

-		github.com/containerd/cgroups/metrics.proto

-

-	It has these top-level messages:

-		Metrics

-		HugetlbStat

-		PidsStat

-		CPUStat

-		CPUUsage

-		Throttle

-		MemoryStat

-		MemoryEntry

-		BlkIOStat

-		BlkIOEntry

-		RdmaStat

-		RdmaEntry

-		NetworkStat

-*/

-package cgroups

-

-import proto "github.com/gogo/protobuf/proto"

-import fmt "fmt"

-import math "math"

-import _ "github.com/gogo/protobuf/gogoproto"

-

-import strings "strings"

-import reflect "reflect"

-

-import io "io"

-

-// Reference imports to suppress errors if they are not otherwise used.

-var _ = proto.Marshal

-var _ = fmt.Errorf

-var _ = math.Inf

-

-// This is a compile-time assertion to ensure that this generated file

-// is compatible with the proto package it is being compiled against.

-// A compilation error at this line likely means your copy of the

-// proto package needs to be updated.

-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package

-

-type Metrics struct {

-	Hugetlb []*HugetlbStat `protobuf:"bytes,1,rep,name=hugetlb" json:"hugetlb,omitempty"`

-	Pids    *PidsStat      `protobuf:"bytes,2,opt,name=pids" json:"pids,omitempty"`

-	CPU     *CPUStat       `protobuf:"bytes,3,opt,name=cpu" json:"cpu,omitempty"`

-	Memory  *MemoryStat    `protobuf:"bytes,4,opt,name=memory" json:"memory,omitempty"`

-	Blkio   *BlkIOStat     `protobuf:"bytes,5,opt,name=blkio" json:"blkio,omitempty"`

-	Rdma    *RdmaStat      `protobuf:"bytes,6,opt,name=rdma" json:"rdma,omitempty"`

-	Network []*NetworkStat `protobuf:"bytes,7,rep,name=network" json:"network,omitempty"`

-}

-

-func (m *Metrics) Reset()                    { *m = Metrics{} }

-func (*Metrics) ProtoMessage()               {}

-func (*Metrics) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{0} }

-

-type HugetlbStat struct {

-	Usage    uint64 `protobuf:"varint,1,opt,name=usage,proto3" json:"usage,omitempty"`

-	Max      uint64 `protobuf:"varint,2,opt,name=max,proto3" json:"max,omitempty"`

-	Failcnt  uint64 `protobuf:"varint,3,opt,name=failcnt,proto3" json:"failcnt,omitempty"`

-	Pagesize string `protobuf:"bytes,4,opt,name=pagesize,proto3" json:"pagesize,omitempty"`

-}

-

-func (m *HugetlbStat) Reset()                    { *m = HugetlbStat{} }

-func (*HugetlbStat) ProtoMessage()               {}

-func (*HugetlbStat) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{1} }

-

-type PidsStat struct {

-	Current uint64 `protobuf:"varint,1,opt,name=current,proto3" json:"current,omitempty"`

-	Limit   uint64 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`

-}

-

-func (m *PidsStat) Reset()                    { *m = PidsStat{} }

-func (*PidsStat) ProtoMessage()               {}

-func (*PidsStat) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{2} }

-

-type CPUStat struct {

-	Usage      *CPUUsage `protobuf:"bytes,1,opt,name=usage" json:"usage,omitempty"`

-	Throttling *Throttle `protobuf:"bytes,2,opt,name=throttling" json:"throttling,omitempty"`

-}

-

-func (m *CPUStat) Reset()                    { *m = CPUStat{} }

-func (*CPUStat) ProtoMessage()               {}

-func (*CPUStat) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{3} }

-

-type CPUUsage struct {

-	// values in nanoseconds

-	Total  uint64   `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"`

-	Kernel uint64   `protobuf:"varint,2,opt,name=kernel,proto3" json:"kernel,omitempty"`

-	User   uint64   `protobuf:"varint,3,opt,name=user,proto3" json:"user,omitempty"`

-	PerCPU []uint64 `protobuf:"varint,4,rep,packed,name=per_cpu,json=perCpu" json:"per_cpu,omitempty"`

-}

-

-func (m *CPUUsage) Reset()                    { *m = CPUUsage{} }

-func (*CPUUsage) ProtoMessage()               {}

-func (*CPUUsage) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{4} }

-

-type Throttle struct {

-	Periods          uint64 `protobuf:"varint,1,opt,name=periods,proto3" json:"periods,omitempty"`

-	ThrottledPeriods uint64 `protobuf:"varint,2,opt,name=throttled_periods,json=throttledPeriods,proto3" json:"throttled_periods,omitempty"`

-	ThrottledTime    uint64 `protobuf:"varint,3,opt,name=throttled_time,json=throttledTime,proto3" json:"throttled_time,omitempty"`

-}

-

-func (m *Throttle) Reset()                    { *m = Throttle{} }

-func (*Throttle) ProtoMessage()               {}

-func (*Throttle) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{5} }

-

-type MemoryStat struct {

-	Cache                   uint64       `protobuf:"varint,1,opt,name=cache,proto3" json:"cache,omitempty"`

-	RSS                     uint64       `protobuf:"varint,2,opt,name=rss,proto3" json:"rss,omitempty"`

-	RSSHuge                 uint64       `protobuf:"varint,3,opt,name=rss_huge,json=rssHuge,proto3" json:"rss_huge,omitempty"`

-	MappedFile              uint64       `protobuf:"varint,4,opt,name=mapped_file,json=mappedFile,proto3" json:"mapped_file,omitempty"`

-	Dirty                   uint64       `protobuf:"varint,5,opt,name=dirty,proto3" json:"dirty,omitempty"`

-	Writeback               uint64       `protobuf:"varint,6,opt,name=writeback,proto3" json:"writeback,omitempty"`

-	PgPgIn                  uint64       `protobuf:"varint,7,opt,name=pg_pg_in,json=pgPgIn,proto3" json:"pg_pg_in,omitempty"`

-	PgPgOut                 uint64       `protobuf:"varint,8,opt,name=pg_pg_out,json=pgPgOut,proto3" json:"pg_pg_out,omitempty"`

-	PgFault                 uint64       `protobuf:"varint,9,opt,name=pg_fault,json=pgFault,proto3" json:"pg_fault,omitempty"`

-	PgMajFault              uint64       `protobuf:"varint,10,opt,name=pg_maj_fault,json=pgMajFault,proto3" json:"pg_maj_fault,omitempty"`

-	InactiveAnon            uint64       `protobuf:"varint,11,opt,name=inactive_anon,json=inactiveAnon,proto3" json:"inactive_anon,omitempty"`

-	ActiveAnon              uint64       `protobuf:"varint,12,opt,name=active_anon,json=activeAnon,proto3" json:"active_anon,omitempty"`

-	InactiveFile            uint64       `protobuf:"varint,13,opt,name=inactive_file,json=inactiveFile,proto3" json:"inactive_file,omitempty"`

-	ActiveFile              uint64       `protobuf:"varint,14,opt,name=active_file,json=activeFile,proto3" json:"active_file,omitempty"`

-	Unevictable             uint64       `protobuf:"varint,15,opt,name=unevictable,proto3" json:"unevictable,omitempty"`

-	HierarchicalMemoryLimit uint64       `protobuf:"varint,16,opt,name=hierarchical_memory_limit,json=hierarchicalMemoryLimit,proto3" json:"hierarchical_memory_limit,omitempty"`

-	HierarchicalSwapLimit   uint64       `protobuf:"varint,17,opt,name=hierarchical_swap_limit,json=hierarchicalSwapLimit,proto3" json:"hierarchical_swap_limit,omitempty"`

-	TotalCache              uint64       `protobuf:"varint,18,opt,name=total_cache,json=totalCache,proto3" json:"total_cache,omitempty"`

-	TotalRSS                uint64       `protobuf:"varint,19,opt,name=total_rss,json=totalRss,proto3" json:"total_rss,omitempty"`

-	TotalRSSHuge            uint64       `protobuf:"varint,20,opt,name=total_rss_huge,json=totalRssHuge,proto3" json:"total_rss_huge,omitempty"`

-	TotalMappedFile         uint64       `protobuf:"varint,21,opt,name=total_mapped_file,json=totalMappedFile,proto3" json:"total_mapped_file,omitempty"`

-	TotalDirty              uint64       `protobuf:"varint,22,opt,name=total_dirty,json=totalDirty,proto3" json:"total_dirty,omitempty"`

-	TotalWriteback          uint64       `protobuf:"varint,23,opt,name=total_writeback,json=totalWriteback,proto3" json:"total_writeback,omitempty"`

-	TotalPgPgIn             uint64       `protobuf:"varint,24,opt,name=total_pg_pg_in,json=totalPgPgIn,proto3" json:"total_pg_pg_in,omitempty"`

-	TotalPgPgOut            uint64       `protobuf:"varint,25,opt,name=total_pg_pg_out,json=totalPgPgOut,proto3" json:"total_pg_pg_out,omitempty"`

-	TotalPgFault            uint64       `protobuf:"varint,26,opt,name=total_pg_fault,json=totalPgFault,proto3" json:"total_pg_fault,omitempty"`

-	TotalPgMajFault         uint64       `protobuf:"varint,27,opt,name=total_pg_maj_fault,json=totalPgMajFault,proto3" json:"total_pg_maj_fault,omitempty"`

-	TotalInactiveAnon       uint64       `protobuf:"varint,28,opt,name=total_inactive_anon,json=totalInactiveAnon,proto3" json:"total_inactive_anon,omitempty"`

-	TotalActiveAnon         uint64       `protobuf:"varint,29,opt,name=total_active_anon,json=totalActiveAnon,proto3" json:"total_active_anon,omitempty"`

-	TotalInactiveFile       uint64       `protobuf:"varint,30,opt,name=total_inactive_file,json=totalInactiveFile,proto3" json:"total_inactive_file,omitempty"`

-	TotalActiveFile         uint64       `protobuf:"varint,31,opt,name=total_active_file,json=totalActiveFile,proto3" json:"total_active_file,omitempty"`

-	TotalUnevictable        uint64       `protobuf:"varint,32,opt,name=total_unevictable,json=totalUnevictable,proto3" json:"total_unevictable,omitempty"`

-	Usage                   *MemoryEntry `protobuf:"bytes,33,opt,name=usage" json:"usage,omitempty"`

-	Swap                    *MemoryEntry `protobuf:"bytes,34,opt,name=swap" json:"swap,omitempty"`

-	Kernel                  *MemoryEntry `protobuf:"bytes,35,opt,name=kernel" json:"kernel,omitempty"`

-	KernelTCP               *MemoryEntry `protobuf:"bytes,36,opt,name=kernel_tcp,json=kernelTcp" json:"kernel_tcp,omitempty"`

-}

-

-func (m *MemoryStat) Reset()                    { *m = MemoryStat{} }

-func (*MemoryStat) ProtoMessage()               {}

-func (*MemoryStat) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{6} }

-

-type MemoryEntry struct {

-	Limit   uint64 `protobuf:"varint,1,opt,name=limit,proto3" json:"limit,omitempty"`

-	Usage   uint64 `protobuf:"varint,2,opt,name=usage,proto3" json:"usage,omitempty"`

-	Max     uint64 `protobuf:"varint,3,opt,name=max,proto3" json:"max,omitempty"`

-	Failcnt uint64 `protobuf:"varint,4,opt,name=failcnt,proto3" json:"failcnt,omitempty"`

-}

-

-func (m *MemoryEntry) Reset()                    { *m = MemoryEntry{} }

-func (*MemoryEntry) ProtoMessage()               {}

-func (*MemoryEntry) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{7} }

-

-type BlkIOStat struct {

-	IoServiceBytesRecursive []*BlkIOEntry `protobuf:"bytes,1,rep,name=io_service_bytes_recursive,json=ioServiceBytesRecursive" json:"io_service_bytes_recursive,omitempty"`

-	IoServicedRecursive     []*BlkIOEntry `protobuf:"bytes,2,rep,name=io_serviced_recursive,json=ioServicedRecursive" json:"io_serviced_recursive,omitempty"`

-	IoQueuedRecursive       []*BlkIOEntry `protobuf:"bytes,3,rep,name=io_queued_recursive,json=ioQueuedRecursive" json:"io_queued_recursive,omitempty"`

-	IoServiceTimeRecursive  []*BlkIOEntry `protobuf:"bytes,4,rep,name=io_service_time_recursive,json=ioServiceTimeRecursive" json:"io_service_time_recursive,omitempty"`

-	IoWaitTimeRecursive     []*BlkIOEntry `protobuf:"bytes,5,rep,name=io_wait_time_recursive,json=ioWaitTimeRecursive" json:"io_wait_time_recursive,omitempty"`

-	IoMergedRecursive       []*BlkIOEntry `protobuf:"bytes,6,rep,name=io_merged_recursive,json=ioMergedRecursive" json:"io_merged_recursive,omitempty"`

-	IoTimeRecursive         []*BlkIOEntry `protobuf:"bytes,7,rep,name=io_time_recursive,json=ioTimeRecursive" json:"io_time_recursive,omitempty"`

-	SectorsRecursive        []*BlkIOEntry `protobuf:"bytes,8,rep,name=sectors_recursive,json=sectorsRecursive" json:"sectors_recursive,omitempty"`

-}

-

-func (m *BlkIOStat) Reset()                    { *m = BlkIOStat{} }

-func (*BlkIOStat) ProtoMessage()               {}

-func (*BlkIOStat) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{8} }

-

-type BlkIOEntry struct {

-	Op     string `protobuf:"bytes,1,opt,name=op,proto3" json:"op,omitempty"`

-	Device string `protobuf:"bytes,2,opt,name=device,proto3" json:"device,omitempty"`

-	Major  uint64 `protobuf:"varint,3,opt,name=major,proto3" json:"major,omitempty"`

-	Minor  uint64 `protobuf:"varint,4,opt,name=minor,proto3" json:"minor,omitempty"`

-	Value  uint64 `protobuf:"varint,5,opt,name=value,proto3" json:"value,omitempty"`

-}

-

-func (m *BlkIOEntry) Reset()                    { *m = BlkIOEntry{} }

-func (*BlkIOEntry) ProtoMessage()               {}

-func (*BlkIOEntry) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{9} }

-

-type RdmaStat struct {

-	Current []*RdmaEntry `protobuf:"bytes,1,rep,name=current" json:"current,omitempty"`

-	Limit   []*RdmaEntry `protobuf:"bytes,2,rep,name=limit" json:"limit,omitempty"`

-}

-

-func (m *RdmaStat) Reset()                    { *m = RdmaStat{} }

-func (*RdmaStat) ProtoMessage()               {}

-func (*RdmaStat) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{10} }

-

-type RdmaEntry struct {

-	Device     string `protobuf:"bytes,1,opt,name=device,proto3" json:"device,omitempty"`

-	HcaHandles uint32 `protobuf:"varint,2,opt,name=hca_handles,json=hcaHandles,proto3" json:"hca_handles,omitempty"`

-	HcaObjects uint32 `protobuf:"varint,3,opt,name=hca_objects,json=hcaObjects,proto3" json:"hca_objects,omitempty"`

-}

-

-func (m *RdmaEntry) Reset()                    { *m = RdmaEntry{} }

-func (*RdmaEntry) ProtoMessage()               {}

-func (*RdmaEntry) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{11} }

-

-type NetworkStat struct {

-	Name      string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`

-	RxBytes   uint64 `protobuf:"varint,2,opt,name=rx_bytes,json=rxBytes,proto3" json:"rx_bytes,omitempty"`

-	RxPackets uint64 `protobuf:"varint,3,opt,name=rx_packets,json=rxPackets,proto3" json:"rx_packets,omitempty"`

-	RxErrors  uint64 `protobuf:"varint,4,opt,name=rx_errors,json=rxErrors,proto3" json:"rx_errors,omitempty"`

-	RxDropped uint64 `protobuf:"varint,5,opt,name=rx_dropped,json=rxDropped,proto3" json:"rx_dropped,omitempty"`

-	TxBytes   uint64 `protobuf:"varint,6,opt,name=tx_bytes,json=txBytes,proto3" json:"tx_bytes,omitempty"`

-	TxPackets uint64 `protobuf:"varint,7,opt,name=tx_packets,json=txPackets,proto3" json:"tx_packets,omitempty"`

-	TxErrors  uint64 `protobuf:"varint,8,opt,name=tx_errors,json=txErrors,proto3" json:"tx_errors,omitempty"`

-	TxDropped uint64 `protobuf:"varint,9,opt,name=tx_dropped,json=txDropped,proto3" json:"tx_dropped,omitempty"`

-}

-

-func (m *NetworkStat) Reset()                    { *m = NetworkStat{} }

-func (*NetworkStat) ProtoMessage()               {}

-func (*NetworkStat) Descriptor() ([]byte, []int) { return fileDescriptorMetrics, []int{12} }

-

-func init() {

-	proto.RegisterType((*Metrics)(nil), "io.containerd.cgroups.v1.Metrics")

-	proto.RegisterType((*HugetlbStat)(nil), "io.containerd.cgroups.v1.HugetlbStat")

-	proto.RegisterType((*PidsStat)(nil), "io.containerd.cgroups.v1.PidsStat")

-	proto.RegisterType((*CPUStat)(nil), "io.containerd.cgroups.v1.CPUStat")

-	proto.RegisterType((*CPUUsage)(nil), "io.containerd.cgroups.v1.CPUUsage")

-	proto.RegisterType((*Throttle)(nil), "io.containerd.cgroups.v1.Throttle")

-	proto.RegisterType((*MemoryStat)(nil), "io.containerd.cgroups.v1.MemoryStat")

-	proto.RegisterType((*MemoryEntry)(nil), "io.containerd.cgroups.v1.MemoryEntry")

-	proto.RegisterType((*BlkIOStat)(nil), "io.containerd.cgroups.v1.BlkIOStat")

-	proto.RegisterType((*BlkIOEntry)(nil), "io.containerd.cgroups.v1.BlkIOEntry")

-	proto.RegisterType((*RdmaStat)(nil), "io.containerd.cgroups.v1.RdmaStat")

-	proto.RegisterType((*RdmaEntry)(nil), "io.containerd.cgroups.v1.RdmaEntry")

-	proto.RegisterType((*NetworkStat)(nil), "io.containerd.cgroups.v1.NetworkStat")

-}

-func (m *Metrics) Marshal() (dAtA []byte, err error) {

-	size := m.Size()

-	dAtA = make([]byte, size)

-	n, err := m.MarshalTo(dAtA)

-	if err != nil {

-		return nil, err

-	}

-	return dAtA[:n], nil

-}

-

-func (m *Metrics) MarshalTo(dAtA []byte) (int, error) {

-	var i int

-	_ = i

-	var l int

-	_ = l

-	if len(m.Hugetlb) > 0 {

-		for _, msg := range m.Hugetlb {

-			dAtA[i] = 0xa

-			i++

-			i = encodeVarintMetrics(dAtA, i, uint64(msg.Size()))

-			n, err := msg.MarshalTo(dAtA[i:])

-			if err != nil {

-				return 0, err

-			}

-			i += n

-		}

-	}

-	if m.Pids != nil {

-		dAtA[i] = 0x12

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Pids.Size()))

-		n1, err := m.Pids.MarshalTo(dAtA[i:])

-		if err != nil {

-			return 0, err

-		}

-		i += n1

-	}

-	if m.CPU != nil {

-		dAtA[i] = 0x1a

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.CPU.Size()))

-		n2, err := m.CPU.MarshalTo(dAtA[i:])

-		if err != nil {

-			return 0, err

-		}

-		i += n2

-	}

-	if m.Memory != nil {

-		dAtA[i] = 0x22

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Memory.Size()))

-		n3, err := m.Memory.MarshalTo(dAtA[i:])

-		if err != nil {

-			return 0, err

-		}

-		i += n3

-	}

-	if m.Blkio != nil {

-		dAtA[i] = 0x2a

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Blkio.Size()))

-		n4, err := m.Blkio.MarshalTo(dAtA[i:])

-		if err != nil {

-			return 0, err

-		}

-		i += n4

-	}

-	if m.Rdma != nil {

-		dAtA[i] = 0x32

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Rdma.Size()))

-		n5, err := m.Rdma.MarshalTo(dAtA[i:])

-		if err != nil {

-			return 0, err

-		}

-		i += n5

-	}

-	if len(m.Network) > 0 {

-		for _, msg := range m.Network {

-			dAtA[i] = 0x3a

-			i++

-			i = encodeVarintMetrics(dAtA, i, uint64(msg.Size()))

-			n, err := msg.MarshalTo(dAtA[i:])

-			if err != nil {

-				return 0, err

-			}

-			i += n

-		}

-	}

-	return i, nil

-}

-

-func (m *HugetlbStat) Marshal() (dAtA []byte, err error) {

-	size := m.Size()

-	dAtA = make([]byte, size)

-	n, err := m.MarshalTo(dAtA)

-	if err != nil {

-		return nil, err

-	}

-	return dAtA[:n], nil

-}

-

-func (m *HugetlbStat) MarshalTo(dAtA []byte) (int, error) {

-	var i int

-	_ = i

-	var l int

-	_ = l

-	if m.Usage != 0 {

-		dAtA[i] = 0x8

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Usage))

-	}

-	if m.Max != 0 {

-		dAtA[i] = 0x10

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Max))

-	}

-	if m.Failcnt != 0 {

-		dAtA[i] = 0x18

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Failcnt))

-	}

-	if len(m.Pagesize) > 0 {

-		dAtA[i] = 0x22

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(len(m.Pagesize)))

-		i += copy(dAtA[i:], m.Pagesize)

-	}

-	return i, nil

-}

-

-func (m *PidsStat) Marshal() (dAtA []byte, err error) {

-	size := m.Size()

-	dAtA = make([]byte, size)

-	n, err := m.MarshalTo(dAtA)

-	if err != nil {

-		return nil, err

-	}

-	return dAtA[:n], nil

-}

-

-func (m *PidsStat) MarshalTo(dAtA []byte) (int, error) {

-	var i int

-	_ = i

-	var l int

-	_ = l

-	if m.Current != 0 {

-		dAtA[i] = 0x8

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Current))

-	}

-	if m.Limit != 0 {

-		dAtA[i] = 0x10

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Limit))

-	}

-	return i, nil

-}

-

-func (m *CPUStat) Marshal() (dAtA []byte, err error) {

-	size := m.Size()

-	dAtA = make([]byte, size)

-	n, err := m.MarshalTo(dAtA)

-	if err != nil {

-		return nil, err

-	}

-	return dAtA[:n], nil

-}

-

-func (m *CPUStat) MarshalTo(dAtA []byte) (int, error) {

-	var i int

-	_ = i

-	var l int

-	_ = l

-	if m.Usage != nil {

-		dAtA[i] = 0xa

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Usage.Size()))

-		n6, err := m.Usage.MarshalTo(dAtA[i:])

-		if err != nil {

-			return 0, err

-		}

-		i += n6

-	}

-	if m.Throttling != nil {

-		dAtA[i] = 0x12

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Throttling.Size()))

-		n7, err := m.Throttling.MarshalTo(dAtA[i:])

-		if err != nil {

-			return 0, err

-		}

-		i += n7

-	}

-	return i, nil

-}

-

-func (m *CPUUsage) Marshal() (dAtA []byte, err error) {

-	size := m.Size()

-	dAtA = make([]byte, size)

-	n, err := m.MarshalTo(dAtA)

-	if err != nil {

-		return nil, err

-	}

-	return dAtA[:n], nil

-}

-

-func (m *CPUUsage) MarshalTo(dAtA []byte) (int, error) {

-	var i int

-	_ = i

-	var l int

-	_ = l

-	if m.Total != 0 {

-		dAtA[i] = 0x8

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Total))

-	}

-	if m.Kernel != 0 {

-		dAtA[i] = 0x10

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.Kernel))

-	}

-	if m.User != 0 {

-		dAtA[i] = 0x18

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(m.User))

-	}

-	if len(m.PerCPU) > 0 {

-		dAtA9 := make([]byte, len(m.PerCPU)*10)

-		var j8 int

-		for _, num := range m.PerCPU {

-			for num >= 1<<7 {

-				dAtA9[j8] = uint8(uint64(num)&0x7f | 0x80)

-				num >>= 7

-				j8++

-			}

-			dAtA9[j8] = uint8(num)

-			j8++

-		}

-		dAtA[i] = 0x22

-		i++

-		i = encodeVarintMetrics(dAtA, i, uint64(j8))

-		i += copy(dAtA[i:], dAtA9[:j8])

-	}