Menu
▾
▴
Re: [LTP] CPU Accounting Controller test case for LTP.
|
From: Subrata M. <su...@li...> - 2009-08-07 12:43:15
|
Hi Raj,
Including few more people for review. My few nitpicks below.
On Fri, 2009-08-07 at 16:49 +0530, Rajasekhar Duddu wrote:
> Hi, I have developed a testcase for CPU Accounting Controller which is
> used to group tasks using cgroups and account the CPU usage of these groups of tasks.
>
> Here I am posting the patch, please review the patch and let me know if
> it needs any changes, thanks.
>
>
> diff -rupN ltp-full-20090731//testcases/kernel/controllers/cpuacct/cpuacct_task.c ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/cpuacct_task.c
> --- ltp-full-20090731//testcases/kernel/controllers/cpuacct/cpuacct_task.c 1970-01-01 00:00:00.000000000 +0000
> +++ ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/cpuacct_task.c 2009-08-07 07:08:17.000000000 +0000
> @@ -0,0 +1,18 @@
> +#include<stdio.h>
> +
> +int main(void)
> +{
> + FILE *fp;
> +
> + while(1)
> + {
> +
> + fp=fopen("txt.x", "w");
> + fclose(fp);
> +
> + }
> +
> + return 0;
> +}
> +
> +
> diff -rupN ltp-full-20090731//testcases/kernel/controllers/cpuacct/cpuacct_testplan.txt ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/cpuacct_testplan.txt
> --- ltp-full-20090731//testcases/kernel/controllers/cpuacct/cpuacct_testplan.txt 1970-01-01 00:00:00.000000000 +0000
> +++ ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/cpuacct_testplan.txt 2009-08-07 10:49:01.000000000 +0000
> @@ -0,0 +1,44 @@
> +The CPU Accounting controller testplan includes a complete set of
> +testcases that test the CPU Accounting controller in different scenarios.
> +
> +
> +TESTCASE DESCRIPTION:
> +====================
> +
> +These tests will check if the cpu usage of the child cgroup is
> +getting reflected in the parent cgroup.Reports PASS if the cpu
> +usage is same for both the cgroups and FAIL if they differ.
> +
> +In these tests cpu usage of the tasks running in a group is read in
> +terms of 3 different stat values.
> +
> +'cpuacct.usage' gives the current cpu usage of the task running
> +in the group.
> +'cpuacct.usage_percpu' gives the cpu usage of each cpu.
> +'cpuacct.stat' gives the user and system cpu usage of the task running
> +in the group.
> +
> +Test01: STAT CHECK TEST
> +-------------------------------
> +This test is run by running a task in the child group and reading it's stat
> +values and comparing them with the parent group's stat values.
> +
> +Test02: STAT CHECK TEST
> +-------------------------------
> +This test is run by running num_online_cpus number of tasks in 2 child groups,
> +adding the stat values from the child groups and comparing them with the
> +parent's stat values.
> +
> +The values reported for user and system time in cpuacct.stat is not very
> +accurate and they can vary from the actual values by Threshold*num_online_cpus in the
> +worst case.
> +Where Threshold T = max(num_online_cpus^2, 32)
> +
> +In this test case, we allow for a max difference between actual and reported
> +values to be 2T. If the difference between parent's value and children's value
> +is greater than 2T, we mark the test as failed.
> +
> +
> +For any other information please refer to
> +Documentation/controllers/cpuacct.txt in kernel documentation.
> +
> diff -rupN ltp-full-20090731//testcases/kernel/controllers/cpuacct/Makefile ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/Makefile
> --- ltp-full-20090731//testcases/kernel/controllers/cpuacct/Makefile 1970-01-01 00:00:00.000000000 +0000
> +++ ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/Makefile 2009-08-07 07:08:17.000000000 +0000
> @@ -0,0 +1,16 @@
> +CFLAGS += -Wall
> +CPPFLAGS += -I../../../../include -I../libcontrollers
> +LDLIBS += -lm -L../../../../lib/ -L../libcontrollers -lcontrollers -lltp
> +
> +SRCS = $(wildcard *.c)
> +
> +TARGETS = $(patsubst %.c,%,$(SRCS))
> +
> +all: $(TARGETS)
> +
> +clean:
> + rm -f $(TARGETS) *.o
> +
> +install:
> + @set -e; for i in $(TARGETS) run_cpuacct_test.sh myfunctions.sh; do ln -f $$i ../../../bin/$$i ; chmod +x $$i ; done
> +
> diff -rupN ltp-full-20090731//testcases/kernel/controllers/cpuacct/myfunctions.sh ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/myfunctions.sh
> --- ltp-full-20090731//testcases/kernel/controllers/cpuacct/myfunctions.sh 1970-01-01 00:00:00.000000000 +0000
> +++ ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/myfunctions.sh 2009-08-07 07:08:17.000000000 +0000
> @@ -0,0 +1,114 @@
> +#!/bin/bash
> +# usage ./myfunctions.sh
Can this be changed to some other name apart from myfunctions.sh ?
> +
> +#################################################################################
> +# Copyright (c) International Business Machines Corp., 2008 #
Change to 2009 where we are now ;-)
And then check you patch against linux*/scripts/checkpatch.pl for any
inconsistencies.
Regards--
Subrata
> +# #
> +# This program is free software; you can redistribute it and/or modify #
> +# it under the terms of the GNU General Public License as published by #
> +# the Free Software Foundation; either version 2 of the License, or #
> +# (at your option) any later version. #
> +# #
> +# This program is distributed in the hope that it will be useful, #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See #
> +# the GNU General Public License for more details. #
> +# #
> +# You should have received a copy of the GNU General Public License #
> +# along with this program; if not, write to the Free Software #
> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
> +# #
> +#################################################################################
> +################################################################################
> +# Name Of File: myfunctions.sh #
> +# #
> +# Description: This file has functions for the setup for testing cpu account #
> +# controller. setup includes creating controller device, #
> +# mounting it with cgroup filesystem with option cpu account #
> +# and creating groups in it. #
> +# #
> +# Functions: setup(): creaes /dev/cpuacct, mounts cgroup fs on it, creates #
> +# groups in that etc. #
> +# usage(): Shows the usage of this file. #
> +# cleanup(): Does full system cleanup #
> +# #
> +# Precaution: Avoid system use by other applications/users to get fair and #
> +# appropriate results (avoid unnecessary killing of applicatio) #
> +# #
> +# Author: Rajasekhar Duddu <raj...@in...> #
> +# #
> +# History: #
> +# #
> +# DATE NAME EMAIL DESC #
> +# #
> +# 14/07/09 Rajasekhar D <raj...@in...> Created this test #
> +# #
> +################################################################################
> +
> +
> + # Write the cleanup function
> +cleanup ()
> +{
> + echo "Cleanup called";
> + rm -rf txt.x 2> /dev/null
> + rm -f cpuacct_task 2>/dev/null
> + rmdir /dev/cpuacct/group*/group* 2> /dev/null
> + rmdir /dev/cpuacct/group* 2> /dev/null
> + umount /dev/cpuacct/ 2> /dev/null
> + rmdir /dev/cpuacct 2> /dev/null
> + rm -rf tmp2 2> /dev/null
> +}
> +task_kill ()
> +{
> + for i in `ps -e | grep cpuacct_task | cut -d" " -f1`
> + do
> + kill -SIGUSR1 $i
> + done
> + rm -rf $PWD/txt.x 2> /dev/null
> + rm -f $PWD/cpuacct_task[0-8] 2>/dev/null
> +
> +}
> +#Create /dev/cpuacct & mount the cgroup file system with
> +#cpu accounting controller
> +
> +#clean any group created eralier (if any)
> +
> +setup ()
> +{
> + if [ -e /dev/cpuacct ]
> + then
> + echo "WARN:/dev/cpuacct already exist..overwriting";
> + rmdir /dev/cpuacct/group*/group* 2> /dev/null
> + rmdir /dev/cpuacct/group* 2> /dev/null
> + umount /dev/cpuacct/ 2> /dev/null
> + rmdir /dev/cpuacct 2> /dev/null
> +
> + mkdir /dev/cpuacct;
> + else
> + mkdir /dev/cpuacct
> + fi
> + mount -t cgroup -ocpuacct none /dev/cpuacct 2> /dev/null
> + if [ $? -ne 0 ]
> + then
> + echo "TFAIL: Could not mount cgroup filesystem for cpu accounting on /dev/cpuacct..Exiting test";
> + cleanup;
> + exit -1;
> + fi
> +
> + # Group created earlier may again be visible if not cleaned properly...so clean them
> + if [ -e /dev/cpuacct/group_1 ]
> + then
> + rmdir /dev/cpuacct/group*/group* 2> /dev/null
> + rmdir /dev/cpuacct/group* 2> /dev/null
> + echo "WARN: Earlier groups found and removed...";
> + fi
> +
> +}
> +
> +# The usage of the script file
> +usage()
> +{
> + echo "Could not start cpu account controller test";
> + echo "usage: run_cpuacct_test.sh $TEST_NUM ";
> + echo "Skipping the cpu account controller test...";
> +}
> diff -rupN ltp-full-20090731//testcases/kernel/controllers/cpuacct/README ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/README
> --- ltp-full-20090731//testcases/kernel/controllers/cpuacct/README 1970-01-01 00:00:00.000000000 +0000
> +++ ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/README 2009-08-07 07:08:17.000000000 +0000
> @@ -0,0 +1,51 @@
> +TEST SUITE:
> +
> +The directory cpuacct contains the tests related to cpu accounting controller.
> +More testcases are expected to be added in future.
> +
> +TESTS AIM:
> +
> +The aim of the tests is to test cpu accounting controller functionality.
> +
> +FILES DESCRIPTION:
> +
> +cpuacct_task.c
> +---------------
> +This is the task which is run for eating up the cpu time.
> +
> +
> +myfunctions.sh
> +----------
> +This file contains the functions which are common for all the tests. For ex.
> +the setup and cleanup functions which do the setup for running the test and do
> +the cleanup once the test finishes. The setup() function creates /dev/cpuacct
> +directory and mounts cgroup filesystem on it with accounting controller. It
> +then creates a number(n) of groups in /dev/cpuacct. The cleanup function does a
> +complete cleanup of the system.
> +
> +Most of the error scenarios have been taken care of for a sane cleanup of the
> +system. However if cleanup fails in any case, just manually execute the
> +commands written in cleanup function in myfunctions.sh.
> +One of the most common causes of failed cleanup is that you have done cd into
> +any of the groups in controller dir tree.
> +
> +run_cpuacct_test.sh
> +------------------
> +This script creates different scenarios for cpu accounting controller testing and
> +starting (n) tasks in different groups to do some cpu allocations etc. It
> +checks for the cpu usage of the groups and reports test pass/fail accordingly.
> +
> +Makefile
> +--------
> +
> +The usual makefile for this directory
> +
> +PASS/FAIL CRITERION:
> +==================
> +The test cases are intelligent enough in deciding the pass or failure of a
> +test.
> +
> +README:
> +--------
> +The one you have gone through.
> +
> diff -rupN ltp-full-20090731//testcases/kernel/controllers/cpuacct/run_cpuacct_test.sh ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/run_cpuacct_test.sh
> --- ltp-full-20090731//testcases/kernel/controllers/cpuacct/run_cpuacct_test.sh 1970-01-01 00:00:00.000000000 +0000
> +++ ltp-full-20090731.src//testcases/kernel/controllers/cpuacct/run_cpuacct_test.sh 2009-08-07 10:48:24.000000000 +0000
> @@ -0,0 +1,375 @@
> +#!/bin/bash
> +# usage ./run_cpuacct_test.sh $TEST_NUM
> +
> +#################################################################################
> +# Copyright (c) International Business Machines Corp., 2008 #
> +# #
> +# This program is free software; you can redistribute it and/or modify #
> +# it under the terms of the GNU General Public License as published by #
> +# the Free Software Foundation; either version 2 of the License, or #
> +# (at your option) any later version. #
> +# #
> +# This program is distributed in the hope that it will be useful, #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See #
> +# the GNU General Public License for more details. #
> +# #
> +# You should have received a copy of the GNU General Public License #
> +# along with this program; if not, write to the Free Software #
> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
> +# #
> +#################################################################################
> +# Name Of File: run_cpuacct_test.sh #
> +# #
> +# Description: This file runs the setup for testing different cpu acctount #
> +# controller features. After setup it runs diff test cases in #
> +# diff setup. #
> +# #
> +# Test 01: Tests Cpu usage of Hierarchical cgroups #
> +# #
> +# Precaution: Avoid system use by other applications/users to get fair and #
> +# appropriate results (avoid unnecessary killing of applicatio) #
> +# #
> +# Author: Rajasekhar Duddu <raj...@in...> #
> +# #
> +# History: #
> +# #
> +# DATE NAME EMAIL DESC #
> +# #
> +# 14/07/09 Rajasekhar D <raj...@in...> Created this test #
> +# #
> +#################################################################################
> +
> +export TCID="cpuacct_test01";
> +export TST_TOTAL=1;
> +export TST_COUNT=1;
> +
> +TEST_NUM=$1;
> +SCRIPT_PID=$$;
> +RC=0;
> +PWD=`pwd`;
> +
> +cd $LTPROOT/testcases/bin/ 2> /dev/null
> +. myfunctions.sh
> +
> +if [ "$USER" != root ]; then
> + tst_brkm TBROK ignored "Test must be run as root"
> + exit 0
> +fi
> +
> +tst_kvercmp 2 6 30 2> /dev/null
> +if [ $? -eq 0 ]; then
> + tst_brkm TBROK ignored "Test should be run with kernel 2.6.30 or newer"
> + exit 0
> +fi
> +
> +task_kill 2> /dev/null
> +cleanup
> +
> +cgroup_path="/dev/cpuacct";
> +num_online_cpus=`cat /proc/cpuinfo | grep -w processor | wc -l`
> +
> +#Function to create tasks equal to num_online_cpus.
> +nr_tasks ()
> +{
> + $PWD/cpuacct_task &
> + pid=$!
> +}
> +
> +#Function to caluculate the threshold value.
> +get_threshold ()
> +{
> + num_online_cpus=`expr $num_online_cpus \* $num_online_cpus`
> + if [ $num_online_cpus -le 32 ]
> + then
> + threshold=32
> + else
> + threshold=$num_online_cpus
> + fi
> +
> + threshold=`expr $threshold \* 2`
> +}
> +#Function which is called for reading the cpuacct.usage_percpu stat value for Parent and Child cgroups.
> +per_cpu_usage ()
> +{
> + attrc=0
> + attrp=0
> + i=0
> + k=0
> + while read line
> + do
> + j=0
> + for k in $line
> + do
> + j=`expr $j + $k`
> + done
> + if [ "$i" == "0" ]
> + then
> + attrp=$j
> + i=`expr $i + 1`
> + else
> + attrc=`expr $j + $attrc`
> + fi
> + done < "./tmp2"
> +}
> +
> +#Function which verifies the cpu accounting of the Parent and the Child cgroups.
> +
> +check_attr()
> +{
> +
> + if [ "$1" == "1" ]
> + then
> + if [ "$2" == "cpuacct.stat" ]
> + then
> + attr1="`sed -n 1p tmp2`"
> + attr2="`sed -n 2p tmp2`"
> + attr3="`sed -n 3p tmp2`"
> + attr4="`sed -n 4p tmp2`"
> + echo
> + echo "$2 for Parent cgroup is $attr1 : $attr2"
> + echo "$2 for Child cgroup is $attr3 : $attr4"
> +
> + if [ "$attr1" == "$attr3" ] && [ "$attr2" == "$attr4" ]
> + then
> + RC=$?
> + echo "TPASS CPU Accounting Controller: $2 PASSED"
> +
> + else
> + RC=$?
> + echo "TFAIL CPU Accounting Controller : $2 FAILED"
> + fi
> + elif [ "$2" == "cpuacct.usage_percpu" ]
> + then
> + per_cpu_usage
> + echo
> + echo "$2 for Parent cgroup : $attrp"
> + echo "$2 for Child cgroup : $attrc"
> + if [ "$attrp" == "$attrc" ]
> + then
> + RC=$?
> + echo "TPASS CPU Accounting Controller: $2 PASSED"
> + else
> + RC=$?
> + echo "TFAIL CPU Accounting Controller : $2 FAILED"
> + fi
> + else
> + attr1="`sed -n 1p tmp2`"
> + attr2="`sed -n 2p tmp2`"
> +
> + echo
> + echo "$2 for Parent cgroup is $attr1"
> + echo "$2 for Child cgroup is $attr2"
> + if [ "$attr1" == "$attr2" ]
> + then
> + RC=$?
> + echo "TPASS CPU Accounting Controller: $2 PASSED"
> + else
> + RC=$?
> + echo "TFAIL CPU Accounting Controller : $2 FAILED"
> + fi
> +
> + fi
> + else
> +
> + if [ "$2" == "cpuacct.stat" ]
> + then
> + attr0="`sed -n 1p tmp2 | cut -d" " -f2`"
> + attr1="`sed -n 2p tmp2 | cut -d" " -f2`"
> + attr2="`sed -n 3p tmp2 | cut -d" " -f2`"
> + attr3="`sed -n 4p tmp2 | cut -d" " -f2`"
> + attr4="`sed -n 5p tmp2 | cut -d" " -f2`"
> + attr5="`sed -n 6p tmp2 | cut -d" " -f2`"
> + attr_usr=`expr $attr2 + $attr4 `
> + attr_sys=`expr $attr3 + $attr5`
> + echo
> + echo "$2 for Parent cgroup : $attr0::$attr1"
> + echo "$2 for Child cgroup : $attr_usr::$attr_sys"
> + get_threshold
> + diff_usr=`expr $attr0 - $attr_usr `
> + [ ${diff_usr} -le 0 ] && diff_usr=$((0 - $diff_usr))
> +
> + diff_sys=`expr $attr1 - $attr_sys`
> + [ ${diff_sys} -le 0 ] && diff_sys=$((0 - $diff_sys))
> +
> + if [ "$diff_usr" -le "$threshold " ] && [ "$diff_sys" -le "$threshold" ]
> + then
> + RC=$?
> + echo "TPASS CPU Accounting Controller: $2 PASSED"
> + else
> + RC=$?
> + echo "TFAIL CPU Accounting Controller : $2 FAILED"
> + fi
> + elif [ "$2" == "cpuacct.usage_percpu" ]
> + then
> + per_cpu_usage
> + echo
> + echo "$2 for Parent cgroup : $attrp"
> + echo "$2 for Child cgroup : $attrc"
> + if [ "$attrp" == "$attrc" ]
> + then
> + RC=$?
> + echo "TPASS CPU Accounting Controller: $2 PASSED"
> + else
> + RC=$?
> + echo "TFAIL CPU Accounting Controller : $2 FAILED"
> + fi
> +
> + else
> + attr0="`sed -n 1p tmp2`"
> + attr1="`sed -n 2p tmp2`"
> + attr2="`sed -n 3p tmp2`"
> + attr=`expr $attr1 + $attr2`
> + echo
> + echo "$2 for Parent cgroup : $attr0"
> + echo "$2 for Child cgroup : $attr"
> + if [ "$attr0" == "$attr" ]
> + then
> + RC=$?
> + echo "TPASS CPU Accounting Controller: $2 PASSED"
> + else
> + RC=$?
> + echo "TFAIL CPU Accounting Controller : $2 FAILED"
> + fi
> + fi
> + fi
> +}
> +
> +echo "TEST $TEST_NUM: CPU ACCOUNTING CONTROLLER TESTING";
> +echo "RUNNING SETUP.....";
> +setup;
> +
> +echo "TEST STARTED: Please avoid using system while this test executes";
> +
> +
> +status=0
> +case ${TEST_NUM} in
> +
> + "1" )
> + gcc -o $PWD/cpuacct_task $PWD/cpuacct_task.c
> + ls $PWD/cpuacct_task &> /dev/null
> + if [ $? -ne 0 ]
> + then
> + echo "TFAIL Task file cpuacct_task.c not compiled..Please check Makefile...Exiting test"
> + exit -1
> + fi
> + $PWD/cpuacct_task &
> + pid=$!
> +
> + mkdir $cgroup_path/group_1 $cgroup_path/group_1/group_11/ 2> /dev/null
> + if [ $? -ne 0 ]
> + then
> + echo "TFAIL Cannot create cpuacct cgroups..Exiting Test "
> + cleanup
> + exit -1
> + fi
> + echo $pid > /$cgroup_path/group_1/group_11/tasks 2> /dev/null
> + if [ $? -ne 0 ]
> + then
> + echo "TFAIL Not able to move a task to the cgroup...Exiting Test"
> + cleanup 2> /dev/null
> + exit -1
> + fi
> + sleep 5
> + task_kill 2> /dev/null
> + for i in cpuacct.usage cpuacct.usage_percpu cpuacct.stat
> + do
> + cat $cgroup_path/group_1/$i $cgroup_path/group_1/group_11/$i > tmp2
> + check_attr $1 $i
> + done
> + if [ $RC -ne 0 ]
> + then
> + status=1
> + fi
> +
> + if [ $status -eq 0 ]
> + then
> + echo
> + echo "CPU Accounting Controller test executed successfully."
> + cleanup 2> /dev/null
> + cd $PWD
> + exit 0
> + else
> + echo
> + echo "CPU Accounting Controller test execution Failed "
> + cleanup 2> /dev/null
> + cd $PWD
> + exit -1
> + fi
> + ;;
> +
> + "2" )
> + mkdir $cgroup_path/group_1 $cgroup_path/group_1/group_11 $cgroup_path/group_1/group_12 2> /dev/null
> + if [ $? -ne 0 ]
> + then
> + echo "TFAIL Cannot create cpuacct cgroups..Exiting Test "
> + cleanup 2> /dev/null
> + exit -1
> + fi
> +
> + gcc -o $PWD/cpuacct_task $PWD/cpuacct_task.c
> + ls $PWD/cpuacct_task &> /dev/null
> + if [ $? -ne 0 ]
> + then
> + echo "TFAIL Task file cpuacct_task.c not compiled..Please check Makefile...Exiting test"
> + cleanup 2> /dev/null
> + exit -1
> + fi
> +
> + for (( m=0 ; m<=$num_online_cpus ; m++ ))
> + do
> + nr_tasks
> + echo $pid > $cgroup_path/group_1/group_11/tasks 2> /dev/null
> + if [ $? -ne 0 ]
> + then
> + echo "TFAIL Not able to move a task to the cgroup...Exiting Test"
> + cleanup 2> /dev/null
> + exit -1
> + fi
> +
> +
> + nr_tasks
> + echo $pid > $cgroup_path/group_1/group_12/tasks 2> /dev/null
> + if [ $? -ne 0 ]
> + then
> + echo "TFAIL Not able to move a task to the cgroup...Exiting Test"
> + cleanup 2> /dev/null
> + exit -1
> + fi
> + sleep 2
> +
> + done
> + task_kill 2> /dev/null
> +
> + for i in cpuacct.usage cpuacct.usage_percpu cpuacct.stat
> + do
> + cat $cgroup_path/group_1/$i $cgroup_path/group_1/group_11/$i $cgroup_path/group_1/group_12/$i > tmp2
> + check_attr $1 $i
> + done
> + if [ $RC -ne 0 ]
> + then
> + status=1
> + fi
> + if [ $status -eq 0 ]
> + then
> + echo
> + echo "CPU Accounting Controller test executed successfully."
> + cleanup 2> /dev/null
> + cd $PWD
> + exit 0
> + else
> + echo
> + echo "CPU Accounting Controller test execution Failed "
> + cleanup 2> /dev/null
> + cd $PWD
> + exit -1
> + fi
> +
> + ;;
> +
> + * )
> + usage
> + exit -1
> + ;;
> + esac
> +
> diff -rupN ltp-full-20090731//testcases/kernel/controllers/Makefile ltp-full-20090731.src//testcases/kernel/controllers/Makefile
> --- ltp-full-20090731//testcases/kernel/controllers/Makefile 2009-07-30 17:27:58.000000000 +0000
> +++ ltp-full-20090731.src//testcases/kernel/controllers/Makefile 2009-08-07 07:04:09.000000000 +0000
> @@ -7,6 +7,8 @@ CHECK_MEMCTL := $(shell grep -w memory /
> CHECK_BLOCKIOCTL := $(shell grep -w blockio /proc/cgroups 2>/dev/null|cut -f1)
> CHECK_FREEZER := $(shell grep -w freezer /proc/cgroups 2>/dev/null| cut -f1)
> CHECK_CPUSETCTL = $(shell grep -w cpuset /proc/cgroups 2>/dev/null|cut -f1)
> +CHECK_CPUACCTCTL := $(shell grep -w cpuacct /proc/cgroups 2>/dev/null|cut -f1)
> +
> endif
>
> ifdef CROSS_COMPILE
> @@ -18,6 +20,7 @@ SUBDIRS += memctl
> SUBDIRS += io-throttle
> SUBDIRS += freezer
> SUBDIRS += cpuset
> +SUBDIRS += cpuacct
> else
> $(info "Kernel is not compiled with control cgroup support")
> endif
> @@ -60,6 +63,11 @@ SUBDIRS += cpuset
> else
> $(info "Kernel is not compiled with cpuset resource controller support")
> endif
> +ifeq ($(CHECK_CPUACCTCTL),cpuacct)
> +SUBDIRS += cpuacct
> +else
> +$(info "Kernel is not compiled with cpuacct resource controller support")
> +endif
> endif
>
> # If at least one of the controllers is available then build libcontrollers.
> diff -rupN ltp-full-20090731//testcases/kernel/controllers/README ltp-full-20090731.src//testcases/kernel/controllers/README
> --- ltp-full-20090731//testcases/kernel/controllers/README 2009-05-11 10:02:46.000000000 +0000
> +++ ltp-full-20090731.src//testcases/kernel/controllers/README 2009-08-07 07:00:28.000000000 +0000
> @@ -51,6 +51,10 @@ libcontrollers
> --------------
> This directory contains the library for cpucontroller testing.
>
> +cpuacct
> +-----------
> +Directory containing the cpu accounting controller testcases.
> +
> Makefile
> --------
> The usual Makefile to conduct all the tests.
> diff -rupN ltp-full-20090731//testcases/kernel/controllers/test_controllers.sh ltp-full-20090731.src//testcases/kernel/controllers/test_controllers.sh
> --- ltp-full-20090731//testcases/kernel/controllers/test_controllers.sh 2009-07-30 17:27:58.000000000 +0000
> +++ ltp-full-20090731.src//testcases/kernel/controllers/test_controllers.sh 2009-08-07 07:07:37.000000000 +0000
> @@ -43,6 +43,7 @@ then
> IOTHROTTLE_CONTROLLER=`grep -w blockio /proc/cgroups | cut -f1`;
> FREEZER=`grep -w freezer /proc/cgroups | cut -f1`;
> CPUSET_CONTROLLER=`grep -w cpuset /proc/cgroups | cut -f1`
> + CPUACCOUNT_CONTROLLER=`grep -w cpuacct /proc/cgroups | cut -f1`
>
> if [ "$CPU_CONTROLLER" = "cpu" ]
> then
> @@ -115,10 +116,22 @@ then
> echo "Kernel does not support cpuset controller";
> echo "Skipping all cpuset controller testcases....";
> fi
> +
> + if [ "$CPUACCOUNT_CONTROLLER" = "cpuacct" ]
> + then
> + $LTPROOT/testcases/bin/run_cpuacct_test.sh 1;
> + $LTPROOT/testcases/bin/run_cpuacct_test.sh 2;
> + else
> + echo "Could not start cpu accounting controller test";
> + echo "usage: run_cpuacct_test.sh $TEST_NUM ";
> + echo "Skipping the cpu accounting controller test...";
>
> +
> else
> echo "CONTROLLERS TESTCASES: WARNING"
> echo "Kernel does not support for control groups";
> echo "Skipping all controllers testcases....";
> +
> fi
>
> exit 0;
>
>
> Thanks
|