Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
steam-runtime-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
steamrt
steam-runtime-tools
Commits
c2a82cad
Commit
c2a82cad
authored
4 years ago
by
Simon McVittie
Browse files
Options
Downloads
Patches
Plain Diff
adverb: When sent a common fatal signal, try to pass it on to the child
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
0241a714
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/adverb.c
+41
-1
41 additions, 1 deletion
src/adverb.c
with
41 additions
and
1 deletion
src/adverb.c
+
41
−
1
View file @
c2a82cad
...
@@ -55,6 +55,7 @@ static gboolean opt_verbose = FALSE;
...
@@ -55,6 +55,7 @@ static gboolean opt_verbose = FALSE;
static
gboolean
opt_version
=
FALSE
;
static
gboolean
opt_version
=
FALSE
;
static
gboolean
opt_wait
=
FALSE
;
static
gboolean
opt_wait
=
FALSE
;
static
gboolean
opt_write
=
FALSE
;
static
gboolean
opt_write
=
FALSE
;
static
GPid
child_pid
;
typedef
struct
typedef
struct
{
{
...
@@ -70,6 +71,16 @@ child_setup_cb (gpointer user_data)
...
@@ -70,6 +71,16 @@ child_setup_cb (gpointer user_data)
const
int
*
iter
;
const
int
*
iter
;
int
i
;
int
i
;
/* The adverb should wait for its child before it exits, but if it
* gets terminated prematurely, we want the child to terminate too.
* The child could reset this, but we assume it usually won't.
* This makes it exit even if we are killed by SIGKILL, unless it
* takes steps not to be. */
if
(
opt_exit_with_parent
&&
prctl
(
PR_SET_PDEATHSIG
,
SIGTERM
,
0
,
0
,
0
)
!=
0
)
pv_async_signal_safe_error
(
"Failed to set up parent-death signal
\n
"
,
LAUNCH_EX_FAILED
);
/* Unblock all signals */
/* Unblock all signals */
sigemptyset
(
&
set
);
sigemptyset
(
&
set
);
if
(
pthread_sigmask
(
SIG_SETMASK
,
&
set
,
NULL
)
==
-
1
)
if
(
pthread_sigmask
(
SIG_SETMASK
,
&
set
,
NULL
)
==
-
1
)
...
@@ -328,6 +339,23 @@ generate_locales (gchar **locpath_out,
...
@@ -328,6 +339,23 @@ generate_locales (gchar **locpath_out,
return
TRUE
;
return
TRUE
;
}
}
/* Only do async-signal-safe things here: see signal-safety(7) */
static
void
terminate_child_cb
(
int
signum
)
{
if
(
child_pid
!=
0
)
{
/* pass it on to the child we're going to wait for */
kill
(
child_pid
,
signum
);
}
else
{
/* guess I'll just die, then */
signal
(
signum
,
SIG_DFL
);
raise
(
signum
);
}
}
static
GOptionEntry
options
[]
=
static
GOptionEntry
options
[]
=
{
{
{
"fd"
,
'\0'
,
{
"fd"
,
'\0'
,
...
@@ -442,13 +470,13 @@ main (int argc,
...
@@ -442,13 +470,13 @@ main (int argc,
GError
**
error
=
&
local_error
;
GError
**
error
=
&
local_error
;
int
ret
=
EX_USAGE
;
int
ret
=
EX_USAGE
;
char
**
command_and_args
;
char
**
command_and_args
;
GPid
child_pid
;
int
wait_status
=
-
1
;
int
wait_status
=
-
1
;
g_autofree
gchar
*
locales_temp_dir
=
NULL
;
g_autofree
gchar
*
locales_temp_dir
=
NULL
;
g_auto
(
GStrv
)
my_environ
=
NULL
;
g_auto
(
GStrv
)
my_environ
=
NULL
;
g_autoptr
(
FILE
)
original_stdout
=
NULL
;
g_autoptr
(
FILE
)
original_stdout
=
NULL
;
ChildSetupData
child_setup_data
=
{
-
1
,
NULL
};
ChildSetupData
child_setup_data
=
{
-
1
,
NULL
};
sigset_t
mask
;
sigset_t
mask
;
struct
sigaction
terminate_child_action
=
{};
sigemptyset
(
&
mask
);
sigemptyset
(
&
mask
);
sigaddset
(
&
mask
,
SIGCHLD
);
sigaddset
(
&
mask
,
SIGCHLD
);
...
@@ -579,6 +607,16 @@ main (int argc,
...
@@ -579,6 +607,16 @@ main (int argc,
}
}
}
}
/* Respond to common termination signals by killing the child instead of
* ourselves */
terminate_child_action
.
sa_handler
=
terminate_child_cb
;
sigaction
(
SIGHUP
,
&
terminate_child_action
,
NULL
);
sigaction
(
SIGINT
,
&
terminate_child_action
,
NULL
);
sigaction
(
SIGQUIT
,
&
terminate_child_action
,
NULL
);
sigaction
(
SIGTERM
,
&
terminate_child_action
,
NULL
);
sigaction
(
SIGUSR1
,
&
terminate_child_action
,
NULL
);
sigaction
(
SIGUSR2
,
&
terminate_child_action
,
NULL
);
g_debug
(
"Launching child process..."
);
g_debug
(
"Launching child process..."
);
fflush
(
stdout
);
fflush
(
stdout
);
child_setup_data
.
original_stdout_fd
=
fileno
(
original_stdout
);
child_setup_data
.
original_stdout_fd
=
fileno
(
original_stdout
);
...
@@ -617,6 +655,8 @@ main (int argc,
...
@@ -617,6 +655,8 @@ main (int argc,
if
(
!
pv_wait_for_child_processes
(
child_pid
,
&
wait_status
,
error
))
if
(
!
pv_wait_for_child_processes
(
child_pid
,
&
wait_status
,
error
))
goto
out
;
goto
out
;
child_pid
=
0
;
if
(
WIFEXITED
(
wait_status
))
if
(
WIFEXITED
(
wait_status
))
{
{
ret
=
WEXITSTATUS
(
wait_status
);
ret
=
WEXITSTATUS
(
wait_status
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment