Commit 0c72ab18 authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

sk-unix: add more information messages

* A message about external sockets is printed before any action.
* Add a message, when a peer is added in a list of sockets.
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 1d6f3cce
...@@ -163,9 +163,11 @@ static int dump_one_unix_fd(int lfd, u32 id, const struct fd_parms *p) ...@@ -163,9 +163,11 @@ static int dump_one_unix_fd(int lfd, u32 id, const struct fd_parms *p)
* It can be external socket, so we defer dumping * It can be external socket, so we defer dumping
* until all sockets the program owns are processed. * until all sockets the program owns are processed.
*/ */
if (!peer->sd.already_dumped) if (!peer->sd.already_dumped) {
show_one_unix("Add a peer", peer);
list_add_tail(&peer->list, &unix_sockets); list_add_tail(&peer->list, &unix_sockets);
} }
}
} else if (ue.state == TCP_ESTABLISHED) { } else if (ue.state == TCP_ESTABLISHED) {
const struct unix_sk_listen_icon *e; const struct unix_sk_listen_icon *e;
...@@ -388,6 +390,8 @@ int fix_external_unix_sockets(void) ...@@ -388,6 +390,8 @@ int fix_external_unix_sockets(void)
FownEntry fown = FOWN_ENTRY__INIT; FownEntry fown = FOWN_ENTRY__INIT;
SkOptsEntry skopts = SK_OPTS_ENTRY__INIT; SkOptsEntry skopts = SK_OPTS_ENTRY__INIT;
show_one_unix("Dumping extern", sk);
BUG_ON(sk->sd.already_dumped); BUG_ON(sk->sd.already_dumped);
if (!opts.ext_unix_sk) { if (!opts.ext_unix_sk) {
...@@ -411,8 +415,6 @@ int fix_external_unix_sockets(void) ...@@ -411,8 +415,6 @@ int fix_external_unix_sockets(void)
e.fown = &fown; e.fown = &fown;
e.opts = &skopts; e.opts = &skopts;
show_one_unix("Dumping extern", sk);
if (pb_write_one(fdset_fd(glob_fdset, CR_FD_UNIXSK), &e, PB_UNIXSK)) if (pb_write_one(fdset_fd(glob_fdset, CR_FD_UNIXSK), &e, PB_UNIXSK))
goto err; goto err;
......
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