Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-29 04:50:26 +00:00
Code Issues Projects Releases Wiki Activity

protobuf: use pretty output for pstree

Browse source 
Signed-off-by: Stanislav Kinsbursky <skinsbursky@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Stanislav Kinsbursky 2012-08-14 14:49:40 +04:00 • committed by Pavel Emelyanov
parent 3904b402bb
commit 694576723c
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cr-show.c
View file

@ -283,7 +283,8 @@ static void pstree_handler(int fd, void *obj, int collect)
void show_collect_pstree(int fd, int collect)
{
pb_show_plain_payload(fd, PB_PSTREE, pstree_handler, collect);
pb_show_plain_payload_pretty(fd, PB_PSTREE, pstree_handler,
collect, "1:%d 2:%d 3:%d 4:%d 5:%d");
}
void show_pstree(int fd, struct cr_options *o)

11
include/protobuf.h
View file

@ -82,8 +82,15 @@ extern void do_pb_show_plain(int fd, int type, int single_entry,
void (*payload_hadler)(int fd, void *obj, int flags),
int flags, const char *pretty_fmt);
#define pb_show_plain_payload(__fd, __type, payload_hadler, flags) \
do_pb_show_plain(__fd, __type, 0, payload_hadler, flags, NULL)
/* Don't have objects at hands to also do typechecking here */
#define pb_show_plain_payload_pretty(__fd, __type, payload_hadler, flags, pretty) \
do_pb_show_plain(__fd, __type, 0, payload_hadler, flags, pretty)
#define pb_show_plain_payload(__fd, __proto_message_name, payload_hadler, flags) \
pb_show_plain_payload_pretty(__fd, __proto_message_name, payload_hadler, flags, NULL)
#define pb_show_plain_pretty(__fd, __proto_message_name, __pretty) \
pb_show_plain_payload_pretty(__fd, __proto_message_name, NULL, 0, __pretty)
#define pb_show_plain(__fd, __type) \
pb_show_plain_payload(__fd, __type, NULL, 0)