diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-03-03 22:13:29 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-03-03 22:13:29 +0000 |
| commit | 5f5127ba9ddb8f52d43827b6ab96b8169af5075f (patch) | |
| tree | 701124de37c5bf475ba6920641948d637da0ee8b /pkg/sentry/kernel/futex | |
| parent | 56f91c540e938374a025c31cf23aa2e4d00cacec (diff) | |
| parent | 844e4d284cddf9795a0db7c38f926fe7b49bb873 (diff) | |
Merge release-20200219.0-91-g844e4d2 (automated)
Diffstat (limited to 'pkg/sentry/kernel/futex')
| -rwxr-xr-x | pkg/sentry/kernel/futex/waiter_list.go | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/pkg/sentry/kernel/futex/waiter_list.go b/pkg/sentry/kernel/futex/waiter_list.go index cca5c4721..b6baa1b5b 100755 --- a/pkg/sentry/kernel/futex/waiter_list.go +++ b/pkg/sentry/kernel/futex/waiter_list.go @@ -54,8 +54,9 @@ func (l *waiterList) Back() *Waiter { // PushFront inserts the element e at the front of list l. func (l *waiterList) PushFront(e *Waiter) { - waiterElementMapper{}.linkerFor(e).SetNext(l.head) - waiterElementMapper{}.linkerFor(e).SetPrev(nil) + linker := waiterElementMapper{}.linkerFor(e) + linker.SetNext(l.head) + linker.SetPrev(nil) if l.head != nil { waiterElementMapper{}.linkerFor(l.head).SetPrev(e) @@ -68,8 +69,9 @@ func (l *waiterList) PushFront(e *Waiter) { // PushBack inserts the element e at the back of list l. func (l *waiterList) PushBack(e *Waiter) { - waiterElementMapper{}.linkerFor(e).SetNext(nil) - waiterElementMapper{}.linkerFor(e).SetPrev(l.tail) + linker := waiterElementMapper{}.linkerFor(e) + linker.SetNext(nil) + linker.SetPrev(l.tail) if l.tail != nil { waiterElementMapper{}.linkerFor(l.tail).SetNext(e) @@ -98,10 +100,14 @@ func (l *waiterList) PushBackList(m *waiterList) { // InsertAfter inserts e after b. func (l *waiterList) InsertAfter(b, e *Waiter) { - a := waiterElementMapper{}.linkerFor(b).Next() - waiterElementMapper{}.linkerFor(e).SetNext(a) - waiterElementMapper{}.linkerFor(e).SetPrev(b) - waiterElementMapper{}.linkerFor(b).SetNext(e) + bLinker := waiterElementMapper{}.linkerFor(b) + eLinker := waiterElementMapper{}.linkerFor(e) + + a := bLinker.Next() + + eLinker.SetNext(a) + eLinker.SetPrev(b) + bLinker.SetNext(e) if a != nil { waiterElementMapper{}.linkerFor(a).SetPrev(e) @@ -112,10 +118,13 @@ func (l *waiterList) InsertAfter(b, e *Waiter) { // InsertBefore inserts e before a. func (l *waiterList) InsertBefore(a, e *Waiter) { - b := waiterElementMapper{}.linkerFor(a).Prev() - waiterElementMapper{}.linkerFor(e).SetNext(a) - waiterElementMapper{}.linkerFor(e).SetPrev(b) - waiterElementMapper{}.linkerFor(a).SetPrev(e) + aLinker := waiterElementMapper{}.linkerFor(a) + eLinker := waiterElementMapper{}.linkerFor(e) + + b := aLinker.Prev() + eLinker.SetNext(a) + eLinker.SetPrev(b) + aLinker.SetPrev(e) if b != nil { waiterElementMapper{}.linkerFor(b).SetNext(e) |