From: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Date: Mon, 13 Jul 2009 03:14:00 +0000 (+0900)
Subject: Add the strings of errno to cgrulesengd daemon's message.
X-Git-Tag: v0.35~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20f79da8f5822b8a5f4eac93dff775b81edcf181;p=thirdparty%2Flibcgroup.git

Add the strings of errno to cgrulesengd daemon's message.

Hi,

This patch adds  the strings of errno to cgrulesengd daemon's message.

For investigating a problem that cgrulesengd daemon finishes by
`service cgred reload`, I added the strings of errno to the daemon's
message. This strings were useful for investigating.

Thanks
Ken'ichi Ohmichi

Signed-off-by: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
---

diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c
index 4b04f3b4..92afb606 100644
--- a/src/daemon/cgrulesengd.c
+++ b/src/daemon/cgrulesengd.c
@@ -561,11 +561,11 @@ void cgre_receive_unix_domain_msg(int sk_unix)
 	caddr_len = sizeof(caddr);
 	fd_client = accept(sk_unix, (struct sockaddr *)&caddr, &caddr_len);
 	if (fd_client < 0) {
-		cgroup_dbg("accept error");
+		cgroup_dbg("accept error: %s\n", strerror(errno));
 		return;
 	}
 	if (read(fd_client, &pid, sizeof(pid)) < 0) {
-		cgroup_dbg("read error");
+		cgroup_dbg("read error: %s\n", strerror(errno));
 		goto close;
 	}
 	sprintf(path, "/proc/%d", pid);
@@ -574,7 +574,7 @@ void cgre_receive_unix_domain_msg(int sk_unix)
 		goto close;
 	}
 	if (read(fd_client, &flags, sizeof(flags)) < 0) {
-		cgroup_dbg("read error");
+		cgroup_dbg("read error: %s\n", strerror(errno));
 		goto close;
 	}
 	if (cgre_store_unchanged_process(pid, flags))
@@ -582,7 +582,7 @@ void cgre_receive_unix_domain_msg(int sk_unix)
 
 	if (write(fd_client, CGRULE_SUCCESS_STORE_PID,
 			sizeof(CGRULE_SUCCESS_STORE_PID)) < 0) {
-		cgroup_dbg("write error");
+		cgroup_dbg("write error: %s\n", strerror(errno));
 		goto close;
 	}
 close:
@@ -610,7 +610,7 @@ int cgre_create_netlink_socket_process_msg()
 	 */
 	sk_nl = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);
 	if (sk_nl == -1) {
-		cgroup_dbg("socket sk_nl error");
+		cgroup_dbg("socket sk_nl error: %s\n", strerror(errno));
 		return rc;
 	}
 
@@ -620,7 +620,7 @@ int cgre_create_netlink_socket_process_msg()
 	my_nla.nl_pad = 0;
 
 	if (bind(sk_nl, (struct sockaddr *)&my_nla, sizeof(my_nla)) < 0) {
-		cgroup_dbg("binding sk_nl error");
+		cgroup_dbg("binding sk_nl error: %s\n", strerror(errno));
 		goto close_and_exit;
 	}
 
@@ -647,7 +647,8 @@ int cgre_create_netlink_socket_process_msg()
 	cgroup_dbg("sending netlink message len=%d, cn_msg len=%d\n",
 		nl_hdr->nlmsg_len, (int) sizeof(struct cn_msg));
 	if (send(sk_nl, nl_hdr, nl_hdr->nlmsg_len, 0) != nl_hdr->nlmsg_len) {
-		cgroup_dbg("failed to send proc connector mcast ctl op!\n");
+		cgroup_dbg("failed to send proc connector mcast ctl op!: %s\n",
+			strerror(errno));
 		goto close_and_exit;
 	}
 	cgroup_dbg("sent\n");
@@ -657,7 +658,7 @@ int cgre_create_netlink_socket_process_msg()
 	 */
 	sk_unix = socket(PF_UNIX, SOCK_STREAM, 0);
 	if (sk_unix < 0) {
-		cgroup_dbg("socket sk_unix error");
+		cgroup_dbg("socket sk_unix error: %s\n", strerror(errno));
 		goto close_and_exit;
 	}
 	memset(&saddr, 0, sizeof(saddr));
@@ -666,11 +667,11 @@ int cgre_create_netlink_socket_process_msg()
 	unlink(CGRULE_CGRED_SOCKET_PATH);
 	if (bind(sk_unix, (struct sockaddr *)&saddr,
 	    sizeof(saddr.sun_family) + strlen(CGRULE_CGRED_SOCKET_PATH)) < 0) {
-		cgroup_dbg("binding sk_unix error");
+		cgroup_dbg("binding sk_unix error: %s\n", strerror(errno));
 		goto close_and_exit;
 	}
 	if (listen(sk_unix, 1) < 0) {
-		cgroup_dbg("listening sk_unix error");
+		cgroup_dbg("listening sk_unix error: %s\n", strerror(errno));
 		goto close_and_exit;
 	}
 	FD_ZERO(&readfds);
@@ -683,7 +684,7 @@ int cgre_create_netlink_socket_process_msg()
 	for(;;) {
 		memcpy(&fds, &readfds, sizeof(fd_set));
 		if (select(sk_max + 1, &fds, NULL, NULL, NULL) < 0) {
-			cgroup_dbg("selecting error");
+			cgroup_dbg("selecting error: %s\n", strerror(errno));
 			goto close_and_exit;
 		}
 		if (FD_ISSET(sk_nl, &fds)) {