runtime: remove unnecessary intermediate type, Status

rakyll · rakyll · commit 167219101f95 · 2016-01-28T00:31:33.000+01:00
Signed-off-by: Burcu Dogan &lt;jbd@google.com&gt;
diff --git a/api/grpc/server/server.go b/api/grpc/server/server.go
@@ -201,7 +201,7 @@ func (s *apiServer) State(ctx context.Context, r *types.StateRequest) (*types.St
 			Id:         c.ID(),
 			BundlePath: c.Path(),
 			Processes:  procs,
-			Status:     string(c.State().Status),
+			Status:     string(c.State()),
 		})
 	}
 	return state, nil
@@ -213,9 +213,7 @@ func (s *apiServer) UpdateContainer(ctx context.Context, r *types.UpdateContaine
 	if r.Signal != 0 {
 		e.Signal = syscall.Signal(r.Signal)
 	}
-	e.State = &runtime.State{
-		Status: runtime.Status(r.Status),
-	}
+	e.State = runtime.State(r.Status)
 	s.sv.SendEvent(e)
 	if err := <-e.Err; err != nil {
 		return nil, err
diff --git a/linux/linux.go b/linux/linux.go
@@ -289,19 +289,16 @@ func (c *libcontainerContainer) Pause() error {
 }
 
 func (c *libcontainerContainer) State() runtime.State {
-	s := runtime.State{}
 	// TODO: what to do with error
 	state, err := c.c.Status()
 	if err != nil {
-		return s
+		return runtime.State("")
 	}
 	switch state {
 	case libcontainer.Paused, libcontainer.Pausing:
-		s.Status = runtime.Paused
-	default:
-		s.Status = runtime.Running
+		return runtime.Paused
 	}
-	return s
+	return runtime.State("")
 }
 
 func (c *libcontainerContainer) ID() string {
diff --git a/runtime/container.go b/runtime/container.go
@@ -15,17 +15,13 @@ type Process interface {
 	Signal(os.Signal) error
 }
 
-type Status string
+type State string
 
 const (
-	Paused  Status = "paused"
-	Running Status = "running"
+	Paused  = State("paused")
+	Running = State("running")
 )
 
-type State struct {
-	Status Status
-}
-
 type Console interface {
 	io.ReadWriter
 	io.Closer
diff --git a/supervisor/event.go b/supervisor/event.go
@@ -52,7 +52,7 @@ type Event struct {
 	Status        int
 	Signal        os.Signal
 	Process       *specs.Process
-	State         *runtime.State
+	State         runtime.State
 	Containers    []runtime.Container
 	Checkpoint    *runtime.Checkpoint
 	Err           chan error
diff --git a/supervisor/update.go b/supervisor/update.go
@@ -12,8 +12,8 @@ func (h *UpdateEvent) Handle(e *Event) error {
 		return ErrContainerNotFound
 	}
 	container := i.container
-	if e.State.Status != "" {
-		switch e.State.Status {
+	if e.State != "" {
+		switch e.State {
 		case runtime.Running:
 			if err := container.Resume(); err != nil {
 				return ErrUnknownContainerStatus

Original file line number	Diff line number	Diff line change
`@@ -289,19 +289,16 @@ func (c *libcontainerContainer) Pause() error {`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`func (c *libcontainerContainer) State() runtime.State {`
`292`		`- s := runtime.State{}`
`293`	`292`	`// TODO: what to do with error`
`294`	`293`	`state, err := c.c.Status()`
`295`	`294`	`if err != nil {`
`296`		`- return s`
	`295`	`+ return runtime.State("")`
`297`	`296`	`}`
`298`	`297`	`switch state {`
`299`	`298`	`case libcontainer.Paused, libcontainer.Pausing:`
`300`		`- s.Status = runtime.Paused`
`301`		`- default:`
`302`		`- s.Status = runtime.Running`
	`299`	`+ return runtime.Paused`
`303`	`300`	`}`
`304`		`- return s`
	`301`	`+ return runtime.State("")`
`305`	`302`	`}`
`306`	`303`
`307`	`304`	`func (c *libcontainerContainer) ID() string {`