Skip to content

Commit

Permalink
cgroups: move cgroup_event_listener.c to tools/cgroup
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Tejun Heo <[email protected]>
  • Loading branch information
gthelen authored and htejun committed Jan 7, 2013
1 parent 12a9d2f commit 92e015b
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 13 deletions.
2 changes: 0 additions & 2 deletions Documentation/cgroups/00-INDEX
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions Documentation/cgroups/memcg_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 10 additions & 9 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
1 change: 1 addition & 0 deletions tools/cgroup/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cgroup_event_listener
11 changes: 11 additions & 0 deletions tools/cgroup/Makefile
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.

0 comments on commit 92e015b

Please sign in to comment.