* [PATCH 1/2] cgroups: move cgroup_event_listener.c to tools/cgroup
@ 2013-01-04 21:05 Greg Thelen
2013-01-04 21:05 ` [PATCH 2/2] cgroups: fix cgroup_event_listener error handling Greg Thelen
2013-01-07 17:42 ` [PATCH 1/2] cgroups: move cgroup_event_listener.c to tools/cgroup Tejun Heo
0 siblings, 2 replies; 7+ messages in thread
From: Greg Thelen @ 2013-01-04 21:05 UTC (permalink / raw)
To: Tejun Heo, Li Zefan
Cc: containers, cgroups, linux-doc, linux-kernel, Greg Thelen
Move the cgroup_event_listener.c tool from Documentation into the new
tools/cgroup directory.
This change involves wiring cgroup_event_listener.c into the tools/
make system so that is can be built with:
$ make tools/cgroup
Signed-off-by: Greg Thelen <gthelen@google.com>
---
Documentation/cgroups/00-INDEX | 2 -
Documentation/cgroups/cgroup_event_listener.c | 110 -------------------------
Documentation/cgroups/memcg_test.txt | 3 +-
tools/Makefile | 19 ++--
tools/cgroup/.gitignore | 1 +
tools/cgroup/Makefile | 11 +++
tools/cgroup/cgroup_event_listener.c | 110 +++++++++++++++++++++++++
7 files changed, 133 insertions(+), 123 deletions(-)
delete mode 100644 Documentation/cgroups/cgroup_event_listener.c
create mode 100644 tools/cgroup/.gitignore
create mode 100644 tools/cgroup/Makefile
create mode 100644 tools/cgroup/cgroup_event_listener.c
diff --git a/Documentation/cgroups/00-INDEX b/Documentation/cgroups/00-INDEX
index f78b90a..f5635a0 100644
--- a/Documentation/cgroups/00-INDEX
+++ b/Documentation/cgroups/00-INDEX
@@ -4,8 +4,6 @@ blkio-controller.txt
- Description for Block IO Controller, implementation and usage details.
cgroups.txt
- Control Groups definition, implementation details, examples and API.
-cgroup_event_listener.c
- - A user program for cgroup listener.
cpuacct.txt
- CPU Accounting Controller; account CPU usage for groups of tasks.
cpusets.txt
diff --git a/Documentation/cgroups/cgroup_event_listener.c b/Documentation/cgroups/cgroup_event_listener.c
deleted file mode 100644
index 3e082f9..0000000
--- a/Documentation/cgroups/cgroup_event_listener.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * cgroup_event_listener.c - Simple listener of cgroup events
- *
- * Copyright (C) Kirill A. Shutemov <kirill@shutemov.name>
- */
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <sys/eventfd.h>
-
-#define USAGE_STR "Usage: cgroup_event_listener <path-to-control-file> <args>\n"
-
-int main(int argc, char **argv)
-{
- int efd = -1;
- int cfd = -1;
- int event_control = -1;
- char event_control_path[PATH_MAX];
- char line[LINE_MAX];
- int ret;
-
- if (argc != 3) {
- fputs(USAGE_STR, stderr);
- return 1;
- }
-
- cfd = open(argv[1], O_RDONLY);
- if (cfd == -1) {
- fprintf(stderr, "Cannot open %s: %s\n", argv[1],
- strerror(errno));
- goto out;
- }
-
- ret = snprintf(event_control_path, PATH_MAX, "%s/cgroup.event_control",
- dirname(argv[1]));
- if (ret >= PATH_MAX) {
- fputs("Path to cgroup.event_control is too long\n", stderr);
- goto out;
- }
-
- event_control = open(event_control_path, O_WRONLY);
- if (event_control == -1) {
- fprintf(stderr, "Cannot open %s: %s\n", event_control_path,
- strerror(errno));
- goto out;
- }
-
- efd = eventfd(0, 0);
- if (efd == -1) {
- perror("eventfd() failed");
- goto out;
- }
-
- ret = snprintf(line, LINE_MAX, "%d %d %s", efd, cfd, argv[2]);
- if (ret >= LINE_MAX) {
- fputs("Arguments string is too long\n", stderr);
- goto out;
- }
-
- ret = write(event_control, line, strlen(line) + 1);
- if (ret == -1) {
- perror("Cannot write to cgroup.event_control");
- goto out;
- }
-
- while (1) {
- uint64_t result;
-
- ret = read(efd, &result, sizeof(result));
- if (ret == -1) {
- if (errno == EINTR)
- continue;
- perror("Cannot read from eventfd");
- break;
- }
- assert(ret == sizeof(result));
-
- ret = access(event_control_path, W_OK);
- if ((ret == -1) && (errno == ENOENT)) {
- puts("The cgroup seems to have removed.");
- ret = 0;
- break;
- }
-
- if (ret == -1) {
- perror("cgroup.event_control "
- "is not accessible any more");
- break;
- }
-
- printf("%s %s: crossed\n", argv[1], argv[2]);
- }
-
-out:
- if (efd >= 0)
- close(efd);
- if (event_control >= 0)
- close(event_control);
- if (cfd >= 0)
- close(cfd);
-
- return (ret != 0);
-}
diff --git a/Documentation/cgroups/memcg_test.txt b/Documentation/cgroups/memcg_test.txt
index fc8fa97..ce94a83 100644
--- a/Documentation/cgroups/memcg_test.txt
+++ b/Documentation/cgroups/memcg_test.txt
@@ -399,8 +399,7 @@ Under below explanation, we assume CONFIG_MEM_RES_CTRL_SWAP=y.
9.10 Memory thresholds
Memory controller implements memory thresholds using cgroups notification
- API. You can use Documentation/cgroups/cgroup_event_listener.c to test
- it.
+ API. You can use tools/cgroup/cgroup_event_listener.c to test it.
(Shell-A) Create cgroup and run event listener
# mkdir /cgroup/A
diff --git a/tools/Makefile b/tools/Makefile
index 1f9a529..fc57a28 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,6 +3,7 @@ include scripts/Makefile.include
help:
@echo 'Possible targets:'
@echo ''
+ @echo ' cgroup - cgroup tools'
@echo ' cpupower - a tool for all things x86 CPU power'
@echo ' firewire - the userspace part of nosy, an IEEE-1394 traffic sniffer'
@echo ' lguest - a minimal 32-bit x86 hypervisor'
@@ -33,7 +34,7 @@ help:
cpupower: FORCE
$(call descend,power/$@)
-firewire lguest perf usb virtio vm: FORCE
+cgroup firewire lguest perf usb virtio vm: FORCE
$(call descend,$@)
selftests: FORCE
@@ -45,7 +46,7 @@ turbostat x86_energy_perf_policy: FORCE
cpupower_install:
$(call descend,power/$(@:_install=),install)
-firewire_install lguest_install perf_install usb_install virtio_install vm_install:
+cgroup_install firewire_install lguest_install perf_install usb_install virtio_install vm_install:
$(call descend,$(@:_install=),install)
selftests_install:
@@ -54,14 +55,14 @@ selftests_install:
turbostat_install x86_energy_perf_policy_install:
$(call descend,power/x86/$(@:_install=),install)
-install: cpupower_install firewire_install lguest_install perf_install \
- selftests_install turbostat_install usb_install virtio_install \
- vm_install x86_energy_perf_policy_install
+install: cgroup_install cpupower_install firewire_install lguest_install \
+ perf_install selftests_install turbostat_install usb_install \
+ virtio_install vm_install x86_energy_perf_policy_install
cpupower_clean:
$(call descend,power/cpupower,clean)
-firewire_clean lguest_clean perf_clean usb_clean virtio_clean vm_clean:
+cgroup_clean firewire_clean lguest_clean perf_clean usb_clean virtio_clean vm_clean:
$(call descend,$(@:_clean=),clean)
selftests_clean:
@@ -70,8 +71,8 @@ selftests_clean:
turbostat_clean x86_energy_perf_policy_clean:
$(call descend,power/x86/$(@:_clean=),clean)
-clean: cpupower_clean firewire_clean lguest_clean perf_clean selftests_clean \
- turbostat_clean usb_clean virtio_clean vm_clean \
- x86_energy_perf_policy_clean
+clean: cgroup_clean cpupower_clean firewire_clean lguest_clean perf_clean \
+ selftests_clean turbostat_clean usb_clean virtio_clean \
+ vm_clean x86_energy_perf_policy_clean
.PHONY: FORCE
diff --git a/tools/cgroup/.gitignore b/tools/cgroup/.gitignore
new file mode 100644
index 0000000..633cd9b
--- /dev/null
+++ b/tools/cgroup/.gitignore
@@ -0,0 +1 @@
+cgroup_event_listener
diff --git a/tools/cgroup/Makefile b/tools/cgroup/Makefile
new file mode 100644
index 0000000..b428619
--- /dev/null
+++ b/tools/cgroup/Makefile
@@ -0,0 +1,11 @@
+# Makefile for cgroup tools
+
+CC = $(CROSS_COMPILE)gcc
+CFLAGS = -Wall -Wextra
+
+all: cgroup_event_listener
+%: %.c
+ $(CC) $(CFLAGS) -o $@ $^
+
+clean:
+ $(RM) cgroup_event_listener
diff --git a/tools/cgroup/cgroup_event_listener.c b/tools/cgroup/cgroup_event_listener.c
new file mode 100644
index 0000000..3e082f9
--- /dev/null
+++ b/tools/cgroup/cgroup_event_listener.c
@@ -0,0 +1,110 @@
+/*
+ * cgroup_event_listener.c - Simple listener of cgroup events
+ *
+ * Copyright (C) Kirill A. Shutemov <kirill@shutemov.name>
+ */
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <libgen.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <sys/eventfd.h>
+
+#define USAGE_STR "Usage: cgroup_event_listener <path-to-control-file> <args>\n"
+
+int main(int argc, char **argv)
+{
+ int efd = -1;
+ int cfd = -1;
+ int event_control = -1;
+ char event_control_path[PATH_MAX];
+ char line[LINE_MAX];
+ int ret;
+
+ if (argc != 3) {
+ fputs(USAGE_STR, stderr);
+ return 1;
+ }
+
+ cfd = open(argv[1], O_RDONLY);
+ if (cfd == -1) {
+ fprintf(stderr, "Cannot open %s: %s\n", argv[1],
+ strerror(errno));
+ goto out;
+ }
+
+ ret = snprintf(event_control_path, PATH_MAX, "%s/cgroup.event_control",
+ dirname(argv[1]));
+ if (ret >= PATH_MAX) {
+ fputs("Path to cgroup.event_control is too long\n", stderr);
+ goto out;
+ }
+
+ event_control = open(event_control_path, O_WRONLY);
+ if (event_control == -1) {
+ fprintf(stderr, "Cannot open %s: %s\n", event_control_path,
+ strerror(errno));
+ goto out;
+ }
+
+ efd = eventfd(0, 0);
+ if (efd == -1) {
+ perror("eventfd() failed");
+ goto out;
+ }
+
+ ret = snprintf(line, LINE_MAX, "%d %d %s", efd, cfd, argv[2]);
+ if (ret >= LINE_MAX) {
+ fputs("Arguments string is too long\n", stderr);
+ goto out;
+ }
+
+ ret = write(event_control, line, strlen(line) + 1);
+ if (ret == -1) {
+ perror("Cannot write to cgroup.event_control");
+ goto out;
+ }
+
+ while (1) {
+ uint64_t result;
+
+ ret = read(efd, &result, sizeof(result));
+ if (ret == -1) {
+ if (errno == EINTR)
+ continue;
+ perror("Cannot read from eventfd");
+ break;
+ }
+ assert(ret == sizeof(result));
+
+ ret = access(event_control_path, W_OK);
+ if ((ret == -1) && (errno == ENOENT)) {
+ puts("The cgroup seems to have removed.");
+ ret = 0;
+ break;
+ }
+
+ if (ret == -1) {
+ perror("cgroup.event_control "
+ "is not accessible any more");
+ break;
+ }
+
+ printf("%s %s: crossed\n", argv[1], argv[2]);
+ }
+
+out:
+ if (efd >= 0)
+ close(efd);
+ if (event_control >= 0)
+ close(event_control);
+ if (cfd >= 0)
+ close(cfd);
+
+ return (ret != 0);
+}
--
1.7.7.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] cgroups: fix cgroup_event_listener error handling
2013-01-04 21:05 [PATCH 1/2] cgroups: move cgroup_event_listener.c to tools/cgroup Greg Thelen
@ 2013-01-04 21:05 ` Greg Thelen
2013-01-07 17:44 ` Tejun Heo
2013-01-07 17:42 ` [PATCH 1/2] cgroups: move cgroup_event_listener.c to tools/cgroup Tejun Heo
1 sibling, 1 reply; 7+ messages in thread
From: Greg Thelen @ 2013-01-04 21:05 UTC (permalink / raw)
To: Tejun Heo, Li Zefan
Cc: containers, cgroups, linux-doc, linux-kernel, Greg Thelen
If the <absolute-path-to-control-file> command line parameter cannot
be opened, then cgroup_event_listener prints an error message and
tries to return an error. However, due to an uninitialized variable
the return value was undefined.
With this patch such failures always return non-zero error.
Compiler warning found this:
$ gcc -Wall -O2 cgroup_event_listener.c
cgroup_event_listener.c: In function ‘main’:
cgroup_event_listener.c:109:2: warning: ‘ret’ may be used uninitialized in this function [-Wuninitialized]
Signed-off-by: Greg Thelen <gthelen@google.com>
---
tools/cgroup/cgroup_event_listener.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/cgroup/cgroup_event_listener.c b/tools/cgroup/cgroup_event_listener.c
index 3e082f9..a70f00c 100644
--- a/tools/cgroup/cgroup_event_listener.c
+++ b/tools/cgroup/cgroup_event_listener.c
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
if (cfd == -1) {
fprintf(stderr, "Cannot open %s: %s\n", argv[1],
strerror(errno));
- goto out;
+ return 1;
}
ret = snprintf(event_control_path, PATH_MAX, "%s/cgroup.event_control",
--
1.7.7.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] cgroups: move cgroup_event_listener.c to tools/cgroup
2013-01-04 21:05 [PATCH 1/2] cgroups: move cgroup_event_listener.c to tools/cgroup Greg Thelen
2013-01-04 21:05 ` [PATCH 2/2] cgroups: fix cgroup_event_listener error handling Greg Thelen
@ 2013-01-07 17:42 ` Tejun Heo
1 sibling, 0 replies; 7+ messages in thread
From: Tejun Heo @ 2013-01-07 17:42 UTC (permalink / raw)
To: Greg Thelen; +Cc: Li Zefan, containers, cgroups, linux-doc, linux-kernel
On Fri, Jan 04, 2013 at 01:05:17PM -0800, Greg Thelen wrote:
> Move the cgroup_event_listener.c tool from Documentation into the new
> tools/cgroup directory.
>
> This change involves wiring cgroup_event_listener.c into the tools/
> make system so that is can be built with:
> $ make tools/cgroup
>
> Signed-off-by: Greg Thelen <gthelen@google.com>
Applied to cgroup/for-3.9.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] cgroups: fix cgroup_event_listener error handling
2013-01-04 21:05 ` [PATCH 2/2] cgroups: fix cgroup_event_listener error handling Greg Thelen
@ 2013-01-07 17:44 ` Tejun Heo
[not found] ` <20130107174427.GM3926-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Tejun Heo @ 2013-01-07 17:44 UTC (permalink / raw)
To: Greg Thelen; +Cc: Li Zefan, containers, cgroups, linux-doc, linux-kernel
On Fri, Jan 04, 2013 at 01:05:18PM -0800, Greg Thelen wrote:
> If the <absolute-path-to-control-file> command line parameter cannot
> be opened, then cgroup_event_listener prints an error message and
> tries to return an error. However, due to an uninitialized variable
> the return value was undefined.
>
> With this patch such failures always return non-zero error.
>
> Compiler warning found this:
> $ gcc -Wall -O2 cgroup_event_listener.c
> cgroup_event_listener.c: In function ‘main’:
> cgroup_event_listener.c:109:2: warning: ‘ret’ may be used uninitialized in this function [-Wuninitialized]
>
> Signed-off-by: Greg Thelen <gthelen@google.com>
> ---
> tools/cgroup/cgroup_event_listener.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/tools/cgroup/cgroup_event_listener.c b/tools/cgroup/cgroup_event_listener.c
> index 3e082f9..a70f00c 100644
> --- a/tools/cgroup/cgroup_event_listener.c
> +++ b/tools/cgroup/cgroup_event_listener.c
> @@ -35,7 +35,7 @@ int main(int argc, char **argv)
> if (cfd == -1) {
> fprintf(stderr, "Cannot open %s: %s\n", argv[1],
> strerror(errno));
> - goto out;
> + return 1;
Hmm... so, event_control open failure path is broken the same way.
Can you please fix it together? Please just remove the cleanup path.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] cgroups: fix cgroup_event_listener error handling
[not found] ` <20130107174427.GM3926-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org>
@ 2013-01-07 19:50 ` Greg Thelen
[not found] ` <xr93a9sklqme.fsf-aSPv4SP+Du0KgorLzL7FmE7CuiCeIGUxQQ4Iyu8u01E@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Greg Thelen @ 2013-01-07 19:50 UTC (permalink / raw)
To: Tejun Heo
Cc: cgroups-u79uwXL29TY76Z2rM5mHXA,
containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-doc-u79uwXL29TY76Z2rM5mHXA
On Mon, Jan 07 2013, Tejun Heo wrote:
> On Fri, Jan 04, 2013 at 01:05:18PM -0800, Greg Thelen wrote:
>> If the <absolute-path-to-control-file> command line parameter cannot
>> be opened, then cgroup_event_listener prints an error message and
>> tries to return an error. However, due to an uninitialized variable
>> the return value was undefined.
>>
>> With this patch such failures always return non-zero error.
>>
>> Compiler warning found this:
>> $ gcc -Wall -O2 cgroup_event_listener.c
>> cgroup_event_listener.c: In function ‘main’:
>> cgroup_event_listener.c:109:2: warning: ‘ret’ may be used uninitialized in this function [-Wuninitialized]
>>
>> Signed-off-by: Greg Thelen <gthelen@google.com>
>> ---
>> tools/cgroup/cgroup_event_listener.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/tools/cgroup/cgroup_event_listener.c b/tools/cgroup/cgroup_event_listener.c
>> index 3e082f9..a70f00c 100644
>> --- a/tools/cgroup/cgroup_event_listener.c
>> +++ b/tools/cgroup/cgroup_event_listener.c
>> @@ -35,7 +35,7 @@ int main(int argc, char **argv)
>> if (cfd == -1) {
>> fprintf(stderr, "Cannot open %s: %s\n", argv[1],
>> strerror(errno));
>> - goto out;
>> + return 1;
>
> Hmm... so, event_control open failure path is broken the same way.
> Can you please fix it together? Please just remove the cleanup path.
Done. Patch below.
---8<---
cgroups: fix cgroup_event_listener error handling
The error handling in cgroup_event_listener.c did not correctly deal
with either an error opening either <control_file> or
cgroup.event_control. Due to an uninitialized variable the program
exit code was undefined if either of these opens failed.
This patch simplifies and corrects cgroup_event_listener.c error
handling by:
1. using err*() rather than printf(),exit()
2. depending on process exit to close open files
With this patch failures always return non-zero error.
Signed-off-by: Greg Thelen <gthelen@google.com>
---
tools/cgroup/cgroup_event_listener.c | 72 ++++++++++-----------------------
1 files changed, 22 insertions(+), 50 deletions(-)
diff --git a/tools/cgroup/cgroup_event_listener.c b/tools/cgroup/cgroup_event_listener.c
index 3e082f9..4eb5507 100644
--- a/tools/cgroup/cgroup_event_listener.c
+++ b/tools/cgroup/cgroup_event_listener.c
@@ -5,6 +5,7 @@
*/
#include <assert.h>
+#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <libgen.h>
@@ -15,7 +16,7 @@
#include <sys/eventfd.h>
-#define USAGE_STR "Usage: cgroup_event_listener <path-to-control-file> <args>\n"
+#define USAGE_STR "Usage: cgroup_event_listener <path-to-control-file> <args>"
int main(int argc, char **argv)
{
@@ -26,49 +27,33 @@ int main(int argc, char **argv)
char line[LINE_MAX];
int ret;
- if (argc != 3) {
- fputs(USAGE_STR, stderr);
- return 1;
- }
+ if (argc != 3)
+ errx(1, "%s", USAGE_STR);
cfd = open(argv[1], O_RDONLY);
- if (cfd == -1) {
- fprintf(stderr, "Cannot open %s: %s\n", argv[1],
- strerror(errno));
- goto out;
- }
+ if (cfd == -1)
+ err(1, "Cannot open %s", argv[1]);
ret = snprintf(event_control_path, PATH_MAX, "%s/cgroup.event_control",
dirname(argv[1]));
- if (ret >= PATH_MAX) {
- fputs("Path to cgroup.event_control is too long\n", stderr);
- goto out;
- }
+ if (ret >= PATH_MAX)
+ errx(1, "Path to cgroup.event_control is too long");
event_control = open(event_control_path, O_WRONLY);
- if (event_control == -1) {
- fprintf(stderr, "Cannot open %s: %s\n", event_control_path,
- strerror(errno));
- goto out;
- }
+ if (event_control == -1)
+ err(1, "Cannot open %s", event_control_path);
efd = eventfd(0, 0);
- if (efd == -1) {
- perror("eventfd() failed");
- goto out;
- }
+ if (efd == -1)
+ err(1, "eventfd() failed");
ret = snprintf(line, LINE_MAX, "%d %d %s", efd, cfd, argv[2]);
- if (ret >= LINE_MAX) {
- fputs("Arguments string is too long\n", stderr);
- goto out;
- }
+ if (ret >= LINE_MAX)
+ errx(1, "Arguments string is too long");
ret = write(event_control, line, strlen(line) + 1);
- if (ret == -1) {
- perror("Cannot write to cgroup.event_control");
- goto out;
- }
+ if (ret == -1)
+ err(1, "Cannot write to cgroup.event_control");
while (1) {
uint64_t result;
@@ -77,34 +62,21 @@ int main(int argc, char **argv)
if (ret == -1) {
if (errno == EINTR)
continue;
- perror("Cannot read from eventfd");
- break;
+ err(1, "Cannot read from eventfd");
}
assert(ret == sizeof(result));
ret = access(event_control_path, W_OK);
if ((ret == -1) && (errno == ENOENT)) {
- puts("The cgroup seems to have removed.");
- ret = 0;
- break;
- }
-
- if (ret == -1) {
- perror("cgroup.event_control "
- "is not accessible any more");
+ puts("The cgroup seems to have removed.");
break;
}
+ if (ret == -1)
+ err(1, "cgroup.event_control is not accessible any more");
+
printf("%s %s: crossed\n", argv[1], argv[2]);
}
-out:
- if (efd >= 0)
- close(efd);
- if (event_control >= 0)
- close(event_control);
- if (cfd >= 0)
- close(cfd);
-
- return (ret != 0);
+ return 0;
}
--
1.7.7.3
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/containers
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] cgroups: fix cgroup_event_listener error handling
[not found] ` <xr93a9sklqme.fsf-aSPv4SP+Du0KgorLzL7FmE7CuiCeIGUxQQ4Iyu8u01E@public.gmane.org>
@ 2013-01-08 6:28 ` Li Zefan
[not found] ` <50EBBC9C.7060909-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 7+ messages in thread
From: Li Zefan @ 2013-01-08 6:28 UTC (permalink / raw)
To: Greg Thelen
Cc: Tejun Heo, cgroups-u79uwXL29TY76Z2rM5mHXA,
containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-doc-u79uwXL29TY76Z2rM5mHXA
> cgroups: fix cgroup_event_listener error handling
>
> The error handling in cgroup_event_listener.c did not correctly deal
> with either an error opening either <control_file> or
> cgroup.event_control. Due to an uninitialized variable the program
> exit code was undefined if either of these opens failed.
>
> This patch simplifies and corrects cgroup_event_listener.c error
> handling by:
> 1. using err*() rather than printf(),exit()
> 2. depending on process exit to close open files
>
> With this patch failures always return non-zero error.
>
> Signed-off-by: Greg Thelen <gthelen-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
Acked-by: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> ---
> tools/cgroup/cgroup_event_listener.c | 72 ++++++++++-----------------------
> 1 files changed, 22 insertions(+), 50 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] cgroups: fix cgroup_event_listener error handling
[not found] ` <50EBBC9C.7060909-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
@ 2013-01-08 18:08 ` Tejun Heo
0 siblings, 0 replies; 7+ messages in thread
From: Tejun Heo @ 2013-01-08 18:08 UTC (permalink / raw)
To: Li Zefan
Cc: containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-doc-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cgroups-u79uwXL29TY76Z2rM5mHXA
On Tue, Jan 08, 2013 at 02:28:44PM +0800, Li Zefan wrote:
> > cgroups: fix cgroup_event_listener error handling
> >
> > The error handling in cgroup_event_listener.c did not correctly deal
> > with either an error opening either <control_file> or
> > cgroup.event_control. Due to an uninitialized variable the program
> > exit code was undefined if either of these opens failed.
> >
> > This patch simplifies and corrects cgroup_event_listener.c error
> > handling by:
> > 1. using err*() rather than printf(),exit()
> > 2. depending on process exit to close open files
> >
> > With this patch failures always return non-zero error.
> >
> > Signed-off-by: Greg Thelen <gthelen-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
>
> Acked-by: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
Applied to cgroup/for-3.9.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-01-08 18:08 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-04 21:05 [PATCH 1/2] cgroups: move cgroup_event_listener.c to tools/cgroup Greg Thelen
2013-01-04 21:05 ` [PATCH 2/2] cgroups: fix cgroup_event_listener error handling Greg Thelen
2013-01-07 17:44 ` Tejun Heo
[not found] ` <20130107174427.GM3926-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org>
2013-01-07 19:50 ` Greg Thelen
[not found] ` <xr93a9sklqme.fsf-aSPv4SP+Du0KgorLzL7FmE7CuiCeIGUxQQ4Iyu8u01E@public.gmane.org>
2013-01-08 6:28 ` Li Zefan
[not found] ` <50EBBC9C.7060909-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2013-01-08 18:08 ` Tejun Heo
2013-01-07 17:42 ` [PATCH 1/2] cgroups: move cgroup_event_listener.c to tools/cgroup Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).