vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

conmon: Return the exit status code

Browse source 
waitpid fills its second argument with a value that
contains the process exit code in the 8 least significant
bits. Instead of returning the complete value and then
convert it from ocid, return the exit status directly
by using WEXITSTATUS from conmon.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2017-01-10 20:19:01 +01:00
parent 61e60bfe47
commit 9a4a1092fe
No known key found for this signature in database
GPG key ID: 8A803CDD4F566C4A
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conmon/conmon.c
View file

@ -303,10 +303,12 @@ int main(int argc, char *argv[])
/* Wait for the container process and record its exit code */ /* Wait for the container process and record its exit code */
while ((pid = waitpid(-1, &status, 0)) > 0) { while ((pid = waitpid(-1, &status, 0)) > 0) {
printf("PID %d exited\n", pid); int exit_status = WEXITSTATUS(status);
printf("PID %d exited with status %d\n", pid, exit_status);
if (pid == cpid) { if (pid == cpid) {
_cleanup_free_ char *status_str = NULL; _cleanup_free_ char *status_str = NULL;
ret = asprintf(&status_str, "%d", status); ret = asprintf(&status_str, "%d", exit_status);
if (ret < 0) { if (ret < 0) {
pexit("Failed to allocate memory for status"); pexit("Failed to allocate memory for status");
} }

2
oci/oci.go
View file

@ -335,7 +335,7 @@ func (r *Runtime) UpdateStatus(c *Container) error {
if err != nil { if err != nil {
return fmt.Errorf("status code conversion failed: %v", err) return fmt.Errorf("status code conversion failed: %v", err)
} }
c.state.ExitCode = int32(utils.StatusToExitCode(statusCode)) c.state.ExitCode = int32(statusCode)
} }
return nil return nil

5
utils/utils.go
View file

@ -125,8 +125,3 @@ func dockerRemove(container string) error {
_, err := ExecCmd("docker", "rm", container) _, err := ExecCmd("docker", "rm", container)
return err return err
} }
// StatusToExitCode converts wait status code to an exit code
func StatusToExitCode(status int) int {
return ((status) & 0xff00) >> 8
}