diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-04 10:41:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 10:41:05 -0800 |
| commit | bf5f779331870d31863c486619daae3fcea458eb (patch) | |
| tree | aafcacc17883a8df4734bed0aadbaca59a9882fe /libpod/pod_easyjson.go | |
| parent | 6868b5aa1444404113bc6a4582203fbbf89490c2 (diff) | |
| parent | 56c5c89408f89fc3733692786d66eb44133b2c59 (diff) | |
| download | podman-bf5f779331870d31863c486619daae3fcea458eb.tar.gz podman-bf5f779331870d31863c486619daae3fcea458eb.tar.bz2 podman-bf5f779331870d31863c486619daae3fcea458eb.zip | |
Merge pull request #1235 from mheon/shm_locking
SHM locking for Libpod
Diffstat (limited to 'libpod/pod_easyjson.go')
| -rw-r--r-- | libpod/pod_easyjson.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libpod/pod_easyjson.go b/libpod/pod_easyjson.go index 8ea9a5e72..71862dad0 100644 --- a/libpod/pod_easyjson.go +++ b/libpod/pod_easyjson.go @@ -501,6 +501,8 @@ func easyjsonBe091417DecodeGithubComContainersLibpodLibpod4(in *jlexer.Lexer, ou if data := in.Raw(); in.Ok() { in.AddError((out.CreatedTime).UnmarshalJSON(data)) } + case "lockID": + out.LockID = uint32(in.Uint32()) default: in.SkipRecursive() } @@ -675,6 +677,16 @@ func easyjsonBe091417EncodeGithubComContainersLibpodLibpod4(out *jwriter.Writer, } out.Raw((in.CreatedTime).MarshalJSON()) } + { + const prefix string = ",\"lockID\":" + if first { + first = false + out.RawString(prefix[1:]) + } else { + out.RawString(prefix) + } + out.Uint32(uint32(in.LockID)) + } out.RawByte('}') } |