Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
83ee7875
Commit
83ee7875
authored
Jul 13, 2010
by
Ferenc Wagner
Committed by
Daniel Lezcano
Jul 13, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
generalize the name of the signal handler
Signed-off-by:
Ferenc Wagner
<
wferi@niif.hu
>
Signed-off-by:
Daniel Lezcano
<
dlezcano@fr.ibm.com
>
parent
f3304a29
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
start.c
src/lxc/start.c
+5
-5
No files found.
src/lxc/start.c
View file @
83ee7875
...
...
@@ -190,7 +190,7 @@ int lxc_check_inherited(int fd_to_ignore)
return
ret
;
}
static
int
setup_sig
chld
_fd
(
sigset_t
*
oldmask
)
static
int
setup_sig
nal
_fd
(
sigset_t
*
oldmask
)
{
sigset_t
mask
;
int
fd
;
...
...
@@ -222,7 +222,7 @@ static int setup_sigchld_fd(sigset_t *oldmask)
return
fd
;
}
static
int
sig
chld
_handler
(
int
fd
,
void
*
data
,
static
int
sig
nal
_handler
(
int
fd
,
void
*
data
,
struct
lxc_epoll_descr
*
descr
)
{
struct
signalfd_siginfo
siginfo
;
...
...
@@ -305,7 +305,7 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
goto
out_sigfd
;
}
if
(
lxc_mainloop_add_handler
(
&
descr
,
sigfd
,
sig
chld
_handler
,
&
pid
))
{
if
(
lxc_mainloop_add_handler
(
&
descr
,
sigfd
,
sig
nal
_handler
,
&
pid
))
{
ERROR
(
"failed to add handler for the signal"
);
goto
out_mainloop_open
;
}
...
...
@@ -371,7 +371,7 @@ struct lxc_handler *lxc_init(const char *name, struct lxc_conf *conf)
/* the signal fd has to be created before forking otherwise
* if the child process exits before we setup the signal fd,
* the event will be lost and the command will be stuck */
handler
->
sigfd
=
setup_sig
chld
_fd
(
&
handler
->
oldmask
);
handler
->
sigfd
=
setup_sig
nal
_fd
(
&
handler
->
oldmask
);
if
(
handler
->
sigfd
<
0
)
{
ERROR
(
"failed to set sigchild fd handler"
);
goto
out_delete_console
;
...
...
@@ -402,7 +402,7 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
lxc_set_state
(
name
,
handler
,
STOPPING
);
lxc_set_state
(
name
,
handler
,
STOPPED
);
/* reset mask set by setup_sig
chld
_fd */
/* reset mask set by setup_sig
nal
_fd */
if
(
sigprocmask
(
SIG_SETMASK
,
&
handler
->
oldmask
,
NULL
))
WARN
(
"failed to restore sigprocmask"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment