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

Merge pull request #1642 from mlaventure/arm-panic

Browse Source 
linux: Ensure count is 64bits aligned for proper atomic use on 32bits machines
This commit is contained in:
Kenfe-Mickaël Laventure 2017-10-16 10:56:02 -07:00 committed by GitHub
commit 7562047f6a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
metrics/cgroups/oom.go
View File

@ -44,11 +44,14 @@ type oomCollector struct {
} }
type oom struct { type oom struct {
// count needs to stay the first member of this struct to ensure 64bits
// alignment on a 32bits machine (e.g. arm32). This is necessary as we use
// the sync/atomic operations on this field.
count int64
id string id string
namespace string namespace string
c cgroups.Cgroup c cgroups.Cgroup
triggers []Trigger triggers []Trigger
count int64
} }
func (o *oomCollector) Add(id, namespace string, cg cgroups.Cgroup, triggers ...Trigger) error { func (o *oomCollector) Add(id, namespace string, cg cgroups.Cgroup, triggers ...Trigger) error {