Commit 3d280e02 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Andrei Vagin

epoll: Print efd id when showing targets

To figure out efd:tfd mapping easier by reading the logs.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent f15fe7cf
...@@ -44,10 +44,10 @@ int is_eventpoll_link(char *link) ...@@ -44,10 +44,10 @@ int is_eventpoll_link(char *link)
return is_anon_link_type(link, "[eventpoll]"); return is_anon_link_type(link, "[eventpoll]");
} }
static void pr_info_eventpoll_tfd(char *action, EventpollTfdEntry *e) static void pr_info_eventpoll_tfd(char *action, uint32_t id, EventpollTfdEntry *e)
{ {
pr_info("%seventpoll-tfd: tfd %8d events %#08x data %#016"PRIx64"\n", pr_info("%seventpoll-tfd: id %#08x tfd %8d events %#08x data %#016"PRIx64"\n",
action, e->tfd, e->events, e->data); action, id, e->tfd, e->events, e->data);
} }
static void pr_info_eventpoll(char *action, EventpollFileEntry *e) static void pr_info_eventpoll(char *action, EventpollFileEntry *e)
...@@ -196,7 +196,7 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p) ...@@ -196,7 +196,7 @@ static int dump_one_eventpoll(int lfd, u32 id, const struct fd_parms *p)
ret = pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE); ret = pb_write_one(img_from_set(glob_imgset, CR_FD_FILES), &fe, PB_FILE);
if (!ret) { if (!ret) {
for (i = 0; i < e.n_tfd; i++) for (i = 0; i < e.n_tfd; i++)
pr_info_eventpoll_tfd("Dumping: ", e.tfd[i]); pr_info_eventpoll_tfd("Dumping: ", e.id, e.tfd[i]);
} }
/* Restore former values to free resources */ /* Restore former values to free resources */
...@@ -277,7 +277,7 @@ static int eventpoll_retore_tfd(int fd, int id, EventpollTfdEntry *tdefe) ...@@ -277,7 +277,7 @@ static int eventpoll_retore_tfd(int fd, int id, EventpollTfdEntry *tdefe)
{ {
struct epoll_event event; struct epoll_event event;
pr_info_eventpoll_tfd("Restore ", tdefe); pr_info_eventpoll_tfd("Restore ", id, tdefe);
event.events = tdefe->events; event.events = tdefe->events;
event.data.u64 = tdefe->data; event.data.u64 = tdefe->data;
......
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