mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-10-30 21:30:16 +00:00 
			
		
		
		
	update cadvisor, docker, and runc godeps
This commit is contained in:
		
							
								
								
									
										12
									
								
								vendor/github.com/opencontainers/runc/libcontainer/restored_process.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								vendor/github.com/opencontainers/runc/libcontainer/restored_process.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -17,20 +17,20 @@ func newRestoredProcess(pid int, fds []string) (*restoredProcess, error) { | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	started, err := system.GetProcessStartTime(pid) | ||||
| 	stat, err := system.Stat(pid) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
| 	return &restoredProcess{ | ||||
| 		proc:             proc, | ||||
| 		processStartTime: started, | ||||
| 		processStartTime: stat.StartTime, | ||||
| 		fds:              fds, | ||||
| 	}, nil | ||||
| } | ||||
|  | ||||
| type restoredProcess struct { | ||||
| 	proc             *os.Process | ||||
| 	processStartTime string | ||||
| 	processStartTime uint64 | ||||
| 	fds              []string | ||||
| } | ||||
|  | ||||
| @@ -60,7 +60,7 @@ func (p *restoredProcess) wait() (*os.ProcessState, error) { | ||||
| 	return st, nil | ||||
| } | ||||
|  | ||||
| func (p *restoredProcess) startTime() (string, error) { | ||||
| func (p *restoredProcess) startTime() (uint64, error) { | ||||
| 	return p.processStartTime, nil | ||||
| } | ||||
|  | ||||
| @@ -81,7 +81,7 @@ func (p *restoredProcess) setExternalDescriptors(newFds []string) { | ||||
| // a persisted state. | ||||
| type nonChildProcess struct { | ||||
| 	processPid       int | ||||
| 	processStartTime string | ||||
| 	processStartTime uint64 | ||||
| 	fds              []string | ||||
| } | ||||
|  | ||||
| @@ -101,7 +101,7 @@ func (p *nonChildProcess) wait() (*os.ProcessState, error) { | ||||
| 	return nil, newGenericError(fmt.Errorf("restored process cannot be waited on"), SystemError) | ||||
| } | ||||
|  | ||||
| func (p *nonChildProcess) startTime() (string, error) { | ||||
| func (p *nonChildProcess) startTime() (uint64, error) { | ||||
| 	return p.processStartTime, nil | ||||
| } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user