diff options
author | gVisor bot <gvisor-bot@google.com> | 2019-08-31 02:15:10 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-08-31 02:15:10 +0000 |
commit | 15bc1f77009efefdd417e986507f74f6efd629a4 (patch) | |
tree | c15fed84ebcfdc31ec3540e42b23935291955e50 /pkg/sentry/kernel/sessions.go | |
parent | 5f40ea3e1fb621e6bcf2dc04bd516003c86808e0 (diff) | |
parent | 0352cf5866ddb5eea24fa35c69e2e43038cfb60a (diff) |
Merge 0352cf58 (automated)
Diffstat (limited to 'pkg/sentry/kernel/sessions.go')
-rw-r--r-- | pkg/sentry/kernel/sessions.go | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/pkg/sentry/kernel/sessions.go b/pkg/sentry/kernel/sessions.go index e5f297478..81fcd8258 100644 --- a/pkg/sentry/kernel/sessions.go +++ b/pkg/sentry/kernel/sessions.go @@ -47,11 +47,6 @@ type Session struct { // The id is immutable. id SessionID - // foreground is the foreground process group. - // - // This is protected by TaskSet.mu. - foreground *ProcessGroup - // ProcessGroups is a list of process groups in this Session. This is // protected by TaskSet.mu. processGroups processGroupList @@ -265,14 +260,12 @@ func (pg *ProcessGroup) SendSignal(info *arch.SignalInfo) error { func (tg *ThreadGroup) CreateSession() error { tg.pidns.owner.mu.Lock() defer tg.pidns.owner.mu.Unlock() - tg.signalHandlers.mu.Lock() - defer tg.signalHandlers.mu.Unlock() return tg.createSession() } // createSession creates a new session for a threadgroup. // -// Precondition: callers must hold TaskSet.mu and the signal mutex for writing. +// Precondition: callers must hold TaskSet.mu for writing. func (tg *ThreadGroup) createSession() error { // Get the ID for this thread in the current namespace. id := tg.pidns.tgids[tg] @@ -353,9 +346,6 @@ func (tg *ThreadGroup) createSession() error { ns.processGroups[ProcessGroupID(local)] = pg } - // Disconnect from the controlling terminal. - tg.tty = nil - return nil } |