Skip to content

C
criu
Commit 656a4637 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by Pavel Emelyanov
Browse files
Options

show: Convert simple array showing fns to use pb_show_msg 

[merges some Stas' patches]
Signed-off-by: 's avatarStanislav Kinsbursky <skinsbursky@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 04560495
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 85 deletions
cr-show.c
View file @ 656a4637
......@@ -70,41 +70,17 @@
static char local_buf[PAGE_SIZE];
static LIST_HEAD(pstree_list);
static char *fdtype2s(u8 type)
{
static char und[4];
static char *fdtypes[] = {
[FDINFO_REG] = "reg",
[FDINFO_INETSK] = "isk",
[FDINFO_PIPE] = "pipe",
[FDINFO_FIFO] = "fifo",
[FDINFO_UNIXSK] = "usk",
[FDINFO_EVENTFD] = "efd",
[FDINFO_EVENTPOLL] = "epl",
[FDINFO_INOTIFY] = "ify",
};
if (type > FDINFO_UND && type < FD_INFO_MAX)
return fdtypes[type];
snprintf(und, sizeof(und), "x%03d\n", (int)type);
return und;
}
void show_files(int fd_files, struct cr_options *o)
{
pr_img_head(CR_FD_FDINFO);
while (1) {
FdinfoEntry *e;
int ret = pb_read_eof(fd_files, &e, fdinfo_entry);
if (ret <= 0)
goto out;
pr_msg("type: %-5s fd: %-5d id: %#x flags %#x\n",
fdtype2s(e->type), e->fd, e->id, e->flags);
break;
pb_show_msg(e, &fdinfo_entry__descriptor);
fdinfo_entry__free_unpacked(e, NULL);
}
out:
pr_img_tail(CR_FD_FDINFO);
}
......@@ -134,12 +110,7 @@ void show_reg_files(int fd_reg_files, struct cr_options *o)
ret = pb_read_eof(fd_reg_files, &rfe, reg_file_entry);
if (ret <= 0)
break;
pr_msg("id: 0x%8x flags: 0x%4x pos: 0x%lx",
rfe->id, rfe->flags, rfe->pos);
if (rfe->name)
pr_msg(" --> %s", rfe->name);
pr_msg("\n");
pb_show_msg(rfe, &reg_file_entry__descriptor);
reg_file_entry__free_unpacked(rfe, NULL);
}
pr_img_tail(CR_FD_REG_FILES);
......@@ -158,20 +129,15 @@ void show_remap_files(int fd, struct cr_options *o)
RemapFilePathEntry *rfe;
pr_img_head(CR_FD_REMAP_FPATH);
while (1) {
int ret;
ret = pb_read_eof(fd, &rfe, remap_file_path_entry);
if (ret <= 0)
break;
pr_msg("%#x -> %#x (%s)\n", rfe->orig_id,
(rfe->remap_id & ~REMAP_GHOST),
remap_id_type(rfe->remap_id));
pb_show_msg(rfe, &remap_file_path_entry__descriptor);
remap_file_path_entry__free_unpacked(rfe, NULL);
}
pr_img_tail(CR_FD_REMAP_FPATH);
}
......@@ -213,19 +179,13 @@ void show_pipes(int fd_pipes, struct cr_options *o)
int ret;
pr_img_head(CR_FD_PIPES);
while (1) {
ret = pb_read_eof(fd_pipes, &e, pipe_entry);
if (ret <= 0)
goto out;
pr_msg("id: 0x%8x pipeid: 0x%8x flags: 0x%8x ",
e->id, e->pipe_id, e->flags);
pb_show_fown_cont(e->fown);
pr_msg("\n");
break;
pb_show_msg(e, &pipe_entry__descriptor);
pipe_entry__free_unpacked(e, NULL);
}
out:
pr_img_tail(CR_FD_PIPES);
}
......@@ -244,7 +204,7 @@ void show_fifo(int fd, struct cr_options *o)
while (1) {
if (pb_read_eof(fd, &e, fifo_entry) <= 0)
break;
pr_msg("id: 0x%8x pipeid: 0x%8x\n", e->id, e->pipe_id);
pb_show_msg(e, &fifo_entry__descriptor);
fifo_entry__free_unpacked(e, NULL);
}
pr_img_tail(CR_FD_FIFO);
......
eventfd.c
View file @ 656a4637
......@@ -53,10 +53,7 @@ void show_eventfds(int fd, struct cr_options *o)
ret = pb_read_eof(fd, &efe, eventfd_file_entry);
if (ret <= 0)
goto out;
pr_msg("id: %#08x flags %#04x counter: %#016lx ",
efe->id, efe->flags, efe->counter);
pb_show_fown_cont(efe->fown);
pr_msg("\n");
pb_show_msg(efe, &eventfd_file_entry__descriptor);
eventfd_file_entry__free_unpacked(efe, NULL);
}
......
eventpoll.c
View file @ 656a4637
......@@ -65,8 +65,7 @@ void show_eventpoll_tfd(int fd, struct cr_options *o)
ret = pb_read_eof(fd, &e, eventpoll_tfd_entry);
if (ret <= 0)
goto out;
pr_msg("id: %#08x tfd %#08x events %#08x data %#016lx\n",
e->id, e->tfd, e->events, e->data);
pb_show_msg(e, &eventpoll_tfd_entry__descriptor);
eventpoll_tfd_entry__free_unpacked(e, NULL);
}
......@@ -85,15 +84,11 @@ void show_eventpoll(int fd, struct cr_options *o)
ret = pb_read_eof(fd, &e, eventpoll_file_entry);
if (ret <= 0)
goto out;
pr_msg("id: %#08x flags %#04x ",
e->id, e->flags);
pb_show_fown_cont(e->fown);
pr_msg("\n");
break;
pb_show_msg(e, &eventpoll_file_entry__descriptor);
eventpoll_file_entry__free_unpacked(e, NULL);
}
out:
pr_img_tail(CR_FD_EVENTPOLL);
}
......
inotify.c
View file @ 656a4637
......@@ -74,15 +74,7 @@ void show_inotify_wd(int fd_inotify_wd, struct cr_options *o)
(int)e->f_handle->n_handle, FH_ENTRY_SIZES__min_entries);
goto out;
}
pr_msg("inotify-wd: id 0x%08x 0x%08x s_dev 0x%08x i_ino 0x%016lx "
" mask 0x%08x ignored_mask 0x%08x "
"[fhandle] bytes 0x%08x type 0x%08x "
"handle 0x%016lx:0x%016lx\n",
e->id, e->wd, e->s_dev, e->i_ino, e->mask, e->ignored_mask,
e->f_handle->bytes, e->f_handle->type,
e->f_handle->handle[0], e->f_handle->handle[1]);
pb_show_msg(e, &inotify_wd_entry__descriptor);
inotify_wd_entry__free_unpacked(e, NULL);
}
out:
......@@ -99,15 +91,10 @@ void show_inotify(int fd_inotify, struct cr_options *o)
ret = pb_read_eof(fd_inotify, &e, inotify_file_entry);
if (ret <= 0)
goto out;
pr_msg("inotify: id 0x%08x flags 0x%08x\n\t", e->id, e->flags);
pb_show_fown_cont(e->fown);
pr_msg("\n");
break;
pb_show_msg(e, &inotify_file_entry__descriptor);
inotify_file_entry__free_unpacked(e, NULL);
}
out:
pr_img_tail(CR_FD_INOTIFY);
}
......
mount.c
View file @ 656a4637
......@@ -506,16 +506,7 @@ void show_mountpoints(int fd, struct cr_options *o)
ret = pb_read_eof(fd, &me, mnt_entry);
if (ret <= 0)
break;
pr_msg("%d:%d [%s] ", me->mnt_id, me->parent_mnt_id,
decode_fstype(me->fstype));
pr_msg("%d:%d %s ", kdev_major(me->root_dev),
kdev_minor(me->root_dev), me->root);
pr_msg("@ %s ", me->mountpoint);
pr_msg("flags %08x ", me->flags);
pr_msg("dev %s ", me->source);
pr_msg("options %s\n", me->options);
pb_show_msg(me, &mnt_entry__descriptor);
mnt_entry__free_unpacked(me, NULL);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment