Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
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
zhul
criu
Commits
e2912397
Commit
e2912397
authored
Oct 08, 2012
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log: Set log level in parasite
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
3ef0d973
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
parasite.h
include/parasite.h
+5
-1
parasite-syscall.c
parasite-syscall.c
+4
-1
parasite.c
parasite.c
+4
-3
No files found.
include/parasite.h
View file @
e2912397
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
enum
{
enum
{
PARASITE_CMD_INIT
,
PARASITE_CMD_INIT
,
PARASITE_CMD_
SET_LOGFD
,
PARASITE_CMD_
CFG_LOG
,
PARASITE_CMD_FINI
,
PARASITE_CMD_FINI
,
PARASITE_CMD_DUMPPAGES_INIT
,
PARASITE_CMD_DUMPPAGES_INIT
,
...
@@ -44,6 +44,10 @@ struct parasite_init_args {
...
@@ -44,6 +44,10 @@ struct parasite_init_args {
struct
sockaddr_un
p_addr
;
struct
sockaddr_un
p_addr
;
};
};
struct
parasite_log_args
{
int
log_level
;
};
struct
parasite_dump_pages_args
{
struct
parasite_dump_pages_args
{
VmaEntry
vma_entry
;
VmaEntry
vma_entry
;
unsigned
long
nrpages_dumped
;
/* how many pages are dumped */
unsigned
long
nrpages_dumped
;
/* how many pages are dumped */
...
...
parasite-syscall.c
View file @
e2912397
...
@@ -360,12 +360,15 @@ static int parasite_prep_file(int fd, struct parasite_ctl *ctl)
...
@@ -360,12 +360,15 @@ static int parasite_prep_file(int fd, struct parasite_ctl *ctl)
static
int
parasite_set_logfd
(
struct
parasite_ctl
*
ctl
,
pid_t
pid
)
static
int
parasite_set_logfd
(
struct
parasite_ctl
*
ctl
,
pid_t
pid
)
{
{
int
ret
;
int
ret
;
struct
parasite_log_args
a
;
ret
=
parasite_send_fd
(
ctl
,
log_get_fd
());
ret
=
parasite_send_fd
(
ctl
,
log_get_fd
());
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
ret
=
parasite_execute
(
PARASITE_CMD_SET_LOGFD
,
ctl
,
NULL
,
0
);
a
.
log_level
=
log_get_loglevel
();
ret
=
parasite_execute
(
PARASITE_CMD_CFG_LOG
,
ctl
,
&
a
,
sizeof
(
a
));
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
...
...
parasite.c
View file @
e2912397
...
@@ -419,13 +419,14 @@ out_send_fd:
...
@@ -419,13 +419,14 @@ out_send_fd:
return
ret
;
return
ret
;
}
}
static
int
parasite_
set_logfd
(
)
static
int
parasite_
cfg_log
(
struct
parasite_log_args
*
args
)
{
{
int
ret
;
int
ret
;
ret
=
recv_fd
(
tsock
);
ret
=
recv_fd
(
tsock
);
if
(
ret
>=
0
)
{
if
(
ret
>=
0
)
{
log_set_fd
(
ret
);
log_set_fd
(
ret
);
log_set_loglevel
(
args
->
log_level
);
ret
=
0
;
ret
=
0
;
}
}
...
@@ -459,8 +460,8 @@ int __used parasite_service(unsigned int cmd, void *args)
...
@@ -459,8 +460,8 @@ int __used parasite_service(unsigned int cmd, void *args)
return
init
((
struct
parasite_init_args
*
)
args
);
return
init
((
struct
parasite_init_args
*
)
args
);
case
PARASITE_CMD_FINI
:
case
PARASITE_CMD_FINI
:
return
fini
();
return
fini
();
case
PARASITE_CMD_
SET_LOGFD
:
case
PARASITE_CMD_
CFG_LOG
:
return
parasite_
set_logfd
(
);
return
parasite_
cfg_log
((
struct
parasite_log_args
*
)
args
);
case
PARASITE_CMD_DUMPPAGES_INIT
:
case
PARASITE_CMD_DUMPPAGES_INIT
:
return
dump_pages_init
();
return
dump_pages_init
();
case
PARASITE_CMD_DUMPPAGES_FINI
:
case
PARASITE_CMD_DUMPPAGES_FINI
:
...
...
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