Revert "use state machine management for exec.Pid()"

Random-Liu · Random-Liu · commit 9777d76890e9 · 2019-01-31T18:59:34.000-08:00
This reverts commit bbc2a99. Signed-off-by: Lantao Liu <lantaol@google.com>
diff --git a/runtime/v1/linux/proc/deleted_state.go b/runtime/v1/linux/proc/deleted_state.go
@@ -69,7 +69,3 @@ func (s *deletedState) SetExited(status int) {
 func (s *deletedState) Exec(ctx context.Context, path string, r *ExecConfig) (proc.Process, error) {
 	return nil, errors.Errorf("cannot exec in a deleted state")
 }
-
-func (s *deletedState) Pid() int {
-	return -1
-}
diff --git a/runtime/v1/linux/proc/exec.go b/runtime/v1/linux/proc/exec.go
@@ -69,10 +69,8 @@ func (e *execProcess) ID() string {
 }
 
 func (e *execProcess) Pid() int {
-	return e.execState.Pid()
-}
-
-func (e *execProcess) pidv() int {
+	e.mu.Lock()
+	defer e.mu.Unlock()
 	return e.pid
 }
 
diff --git a/runtime/v1/linux/proc/exec_state.go b/runtime/v1/linux/proc/exec_state.go
@@ -31,7 +31,6 @@ type execState interface {
 	Delete(context.Context) error
 	Kill(context.Context, uint32, bool) error
 	SetExited(int)
-	Pid() int
 }
 
 type execCreatedState struct {
@@ -83,12 +82,6 @@ func (s *execCreatedState) SetExited(status int) {
 	}
 }
 
-func (s *execCreatedState) Pid() int {
-	s.p.mu.Lock()
-	defer s.p.mu.Unlock()
-	return s.p.pidv()
-}
-
 type execRunningState struct {
 	p *execProcess
 }
@@ -127,12 +120,6 @@ func (s *execRunningState) SetExited(status int) {
 	}
 }
 
-func (s *execRunningState) Pid() int {
-	s.p.mu.Lock()
-	defer s.p.mu.Unlock()
-	return s.p.pidv()
-}
-
 type execStoppedState struct {
 	p *execProcess
 }
@@ -170,7 +157,3 @@ func (s *execStoppedState) Kill(ctx context.Context, sig uint32, all bool) error
 func (s *execStoppedState) SetExited(status int) {
 	// no op
 }
-
-func (s *execStoppedState) Pid() int {
-	return s.p.pidv()
-}

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,3 @@ func (s *deletedState) SetExited(status int) {`
`69`	`69`	`func (s deletedState) Exec(ctx context.Context, path string, r ExecConfig) (proc.Process, error) {`
`70`	`70`	`return nil, errors.Errorf("cannot exec in a deleted state")`
`71`	`71`	`}`
`72`		`-`
`73`		`-func (s *deletedState) Pid() int {`
`74`		`- return -1`
`75`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,8 @@ func (e *execProcess) ID() string {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`func (e *execProcess) Pid() int {`
`72`		`- return e.execState.Pid()`
`73`		`-}`
`74`		`-`
`75`		`-func (e *execProcess) pidv() int {`
	`72`	`+ e.mu.Lock()`
	`73`	`+ defer e.mu.Unlock()`
`76`	`74`	`return e.pid`
`77`	`75`	`}`
`78`	`76`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ type execState interface {`
`31`	`31`	`Delete(context.Context) error`
`32`	`32`	`Kill(context.Context, uint32, bool) error`
`33`	`33`	`SetExited(int)`
`34`		`- Pid() int`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`type execCreatedState struct {`
`@@ -83,12 +82,6 @@ func (s *execCreatedState) SetExited(status int) {`
`83`	`82`	`}`
`84`	`83`	`}`
`85`	`84`
`86`		`-func (s *execCreatedState) Pid() int {`
`87`		`- s.p.mu.Lock()`
`88`		`- defer s.p.mu.Unlock()`
`89`		`- return s.p.pidv()`
`90`		`-}`
`91`		`-`
`92`	`85`	`type execRunningState struct {`
`93`	`86`	`p *execProcess`
`94`	`87`	`}`
`@@ -127,12 +120,6 @@ func (s *execRunningState) SetExited(status int) {`
`127`	`120`	`}`
`128`	`121`	`}`
`129`	`122`
`130`		`-func (s *execRunningState) Pid() int {`
`131`		`- s.p.mu.Lock()`
`132`		`- defer s.p.mu.Unlock()`
`133`		`- return s.p.pidv()`
`134`		`-}`
`135`		`-`
`136`	`123`	`type execStoppedState struct {`
`137`	`124`	`p *execProcess`
`138`	`125`	`}`
`@@ -170,7 +157,3 @@ func (s *execStoppedState) Kill(ctx context.Context, sig uint32, all bool) error`
`170`	`157`	`func (s *execStoppedState) SetExited(status int) {`
`171`	`158`	`// no op`
`172`	`159`	`}`
`173`		`-`
`174`		`-func (s *execStoppedState) Pid() int {`
`175`		`- return s.p.pidv()`
`176`		`-}`