use state machine management for exec.Pid()

lifubang · lifubang · commit bbc2a995f97c · 2018-11-23T17:46:32.000+08:00
Signed-off-by: Lifubang &lt;lifubang@acmcoder.com&gt;
diff --git a/runtime/v1/linux/proc/deleted_state.go b/runtime/v1/linux/proc/deleted_state.go
@@ -69,3 +69,7 @@ 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,8 +69,10 @@ func (e *execProcess) ID() string {
 }
 
 func (e *execProcess) Pid() int {
-	e.mu.Lock()
-	defer e.mu.Unlock()
+	return e.execState.Pid()
+}
+
+func (e *execProcess) pidv() int {
 	return e.pid
 }
 
diff --git a/runtime/v1/linux/proc/exec_state.go b/runtime/v1/linux/proc/exec_state.go
@@ -31,6 +31,7 @@ type execState interface {
 	Delete(context.Context) error
 	Kill(context.Context, uint32, bool) error
 	SetExited(int)
+	Pid() int
 }
 
 type execCreatedState struct {
@@ -82,6 +83,12 @@ 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
 }
@@ -120,6 +127,12 @@ 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
 }
@@ -157,3 +170,7 @@ 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,3 +69,7 @@ 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,8 +69,10 @@ func (e *execProcess) ID() string {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`func (e *execProcess) Pid() int {`
`72`		`- e.mu.Lock()`
`73`		`- defer e.mu.Unlock()`
	`72`	`+ return e.execState.Pid()`
	`73`	`+}`
	`74`	`+`
	`75`	`+func (e *execProcess) pidv() int {`
`74`	`76`	`return e.pid`
`75`	`77`	`}`
`76`	`78`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ type execState interface {`
`31`	`31`	`Delete(context.Context) error`
`32`	`32`	`Kill(context.Context, uint32, bool) error`
`33`	`33`	`SetExited(int)`
	`34`	`+ Pid() int`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`type execCreatedState struct {`
`@@ -82,6 +83,12 @@ func (s *execCreatedState) SetExited(status int) {`
`82`	`83`	`}`
`83`	`84`	`}`
`84`	`85`
	`86`	`+func (s *execCreatedState) Pid() int {`
	`87`	`+ s.p.mu.Lock()`
	`88`	`+ defer s.p.mu.Unlock()`
	`89`	`+ return s.p.pidv()`
	`90`	`+}`
	`91`	`+`
`85`	`92`	`type execRunningState struct {`
`86`	`93`	`p *execProcess`
`87`	`94`	`}`
`@@ -120,6 +127,12 @@ func (s *execRunningState) SetExited(status int) {`
`120`	`127`	`}`
`121`	`128`	`}`
`122`	`129`
	`130`	`+func (s *execRunningState) Pid() int {`
	`131`	`+ s.p.mu.Lock()`
	`132`	`+ defer s.p.mu.Unlock()`
	`133`	`+ return s.p.pidv()`
	`134`	`+}`
	`135`	`+`
`123`	`136`	`type execStoppedState struct {`
`124`	`137`	`p *execProcess`
`125`	`138`	`}`
`@@ -157,3 +170,7 @@ func (s *execStoppedState) Kill(ctx context.Context, sig uint32, all bool) error`
`157`	`170`	`func (s *execStoppedState) SetExited(status int) {`
`158`	`171`	`// no op`
`159`	`172`	`}`
	`173`	`+`
	`174`	`+func (s *execStoppedState) Pid() int {`
	`175`	`+ return s.p.pidv()`
	`176`	`+}`