mirror of
				https://github.com/kata-containers/kata-containers.git
				synced 2025-10-31 17:37:20 +00:00 
			
		
		
		
	runtime: containerd-shim-v2: fix govet fieldalignment
Fix structures alignment Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
		| @@ -24,19 +24,21 @@ type exec struct { | |||||||
| 	cmds      *types.Cmd | 	cmds      *types.Cmd | ||||||
| 	tty       *tty | 	tty       *tty | ||||||
| 	ttyio     *ttyIO | 	ttyio     *ttyIO | ||||||
|  |  | ||||||
|  | 	stdinPipe io.WriteCloser | ||||||
|  |  | ||||||
|  | 	exitTime time.Time | ||||||
|  |  | ||||||
|  | 	exitIOch    chan struct{} | ||||||
|  | 	stdinCloser chan struct{} | ||||||
|  |  | ||||||
|  | 	exitCh chan uint32 | ||||||
|  |  | ||||||
| 	id string | 	id string | ||||||
|  |  | ||||||
| 	exitCode int32 | 	exitCode int32 | ||||||
|  |  | ||||||
| 	status task.Status | 	status task.Status | ||||||
|  |  | ||||||
| 	exitIOch chan struct{} |  | ||||||
| 	exitCh   chan uint32 |  | ||||||
|  |  | ||||||
| 	stdinCloser chan struct{} |  | ||||||
| 	stdinPipe   io.WriteCloser |  | ||||||
|  |  | ||||||
| 	exitTime time.Time |  | ||||||
| } | } | ||||||
|  |  | ||||||
| type tty struct { | type tty struct { | ||||||
|   | |||||||
| @@ -106,15 +106,33 @@ func New(ctx context.Context, id string, publisher cdshim.Publisher, shutdown fu | |||||||
| } | } | ||||||
|  |  | ||||||
| type exit struct { | type exit struct { | ||||||
|  | 	timestamp time.Time | ||||||
| 	id        string | 	id        string | ||||||
| 	execid    string | 	execid    string | ||||||
| 	pid       uint32 | 	pid       uint32 | ||||||
| 	status    int | 	status    int | ||||||
| 	timestamp time.Time |  | ||||||
| } | } | ||||||
|  |  | ||||||
| // service is the shim implementation of a remote shim over GRPC | // service is the shim implementation of a remote shim over GRPC | ||||||
| type service struct { | type service struct { | ||||||
|  | 	sandbox vc.VCSandbox | ||||||
|  |  | ||||||
|  | 	ctx     context.Context | ||||||
|  | 	rootCtx context.Context // root context for tracing | ||||||
|  |  | ||||||
|  | 	containers map[string]*container | ||||||
|  |  | ||||||
|  | 	config *oci.RuntimeConfig | ||||||
|  |  | ||||||
|  | 	monitor chan error | ||||||
|  | 	ec      chan exit | ||||||
|  |  | ||||||
|  | 	events chan interface{} | ||||||
|  |  | ||||||
|  | 	cancel func() | ||||||
|  |  | ||||||
|  | 	id string | ||||||
|  |  | ||||||
| 	mu          sync.Mutex | 	mu          sync.Mutex | ||||||
| 	eventSendMu sync.Mutex | 	eventSendMu sync.Mutex | ||||||
|  |  | ||||||
| @@ -125,19 +143,6 @@ type service struct { | |||||||
|  |  | ||||||
| 	// shim's pid | 	// shim's pid | ||||||
| 	pid uint32 | 	pid uint32 | ||||||
|  |  | ||||||
| 	ctx        context.Context |  | ||||||
| 	rootCtx    context.Context // root context for tracing |  | ||||||
| 	sandbox    vc.VCSandbox |  | ||||||
| 	containers map[string]*container |  | ||||||
| 	config     *oci.RuntimeConfig |  | ||||||
| 	events     chan interface{} |  | ||||||
| 	monitor    chan error |  | ||||||
|  |  | ||||||
| 	cancel func() |  | ||||||
|  |  | ||||||
| 	ec chan exit |  | ||||||
| 	id string |  | ||||||
| } | } | ||||||
|  |  | ||||||
| func newCommand(ctx context.Context, id, containerdBinary, containerdAddress string) (*sysexec.Cmd, error) { | func newCommand(ctx context.Context, id, containerdBinary, containerdAddress string) (*sysexec.Cmd, error) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user