* [LTP] [PATCH V2] controllers/cpuacct: rewrote testcases
@ 2015-11-10 17:03 Cedric Hnyda
2015-11-10 18:45 ` Cyril Hrubis
0 siblings, 1 reply; 2+ messages in thread
From: Cedric Hnyda @ 2015-11-10 17:03 UTC (permalink / raw)
To: ltp
Rewrote cpuacct testcases since they were outdated.
Removed old files
Added 6 tests for cpuacct.
Signed-off-by: Cedric Hnyda <chnyda@suse.com>
---
runtest/controllers | 7 +
testcases/kernel/controllers/cpuacct/.gitignore | 2 +-
testcases/kernel/controllers/cpuacct/README | 51 ----
testcases/kernel/controllers/cpuacct/cpuacct.sh | 173 +++++++++++
.../kernel/controllers/cpuacct/cpuacct_setup.sh | 122 --------
.../kernel/controllers/cpuacct/cpuacct_task.c | 42 +++
.../kernel/controllers/cpuacct/cpuacct_task01.c | 17 --
.../controllers/cpuacct/cpuacct_testplan.txt | 44 ---
.../kernel/controllers/cpuacct/run_cpuacct_test.sh | 340 ---------------------
9 files changed, 223 insertions(+), 575 deletions(-)
delete mode 100644 testcases/kernel/controllers/cpuacct/README
create mode 100755 testcases/kernel/controllers/cpuacct/cpuacct.sh
delete mode 100755 testcases/kernel/controllers/cpuacct/cpuacct_setup.sh
create mode 100644 testcases/kernel/controllers/cpuacct/cpuacct_task.c
delete mode 100644 testcases/kernel/controllers/cpuacct/cpuacct_task01.c
delete mode 100644 testcases/kernel/controllers/cpuacct/cpuacct_testplan.txt
delete mode 100755 testcases/kernel/controllers/cpuacct/run_cpuacct_test.sh
diff --git a/runtest/controllers b/runtest/controllers
index 6d9daf4..4043caa 100644
--- a/runtest/controllers
+++ b/runtest/controllers
@@ -197,6 +197,13 @@ cgroup_fj_stress_memory_1_100_100_2 run_cgroup_test_fj.sh stress memory 1 100 10
controllers test_controllers.sh
+cpuacct_1_1 cpuacct.sh 1 1
+cpuacct_1_10 cpuacct.sh 1 10
+cpuacct_10_10 cpuacct.sh 10 10
+cpuacct_1_100 cpuacct.sh 1 100
+cpuacct_100_1 cpuacct.sh 100 1
+cpuacct_100_100 cpuacct.sh 100 100
+
cpuset_base_ops cpuset_base_ops_testset.sh
cpuset_inherit cpuset_inherit_testset.sh
cpuset_exclusive cpuset_exclusive_test.sh
diff --git a/testcases/kernel/controllers/cpuacct/.gitignore b/testcases/kernel/controllers/cpuacct/.gitignore
index 0dfdad3..b7a47ad 100644
--- a/testcases/kernel/controllers/cpuacct/.gitignore
+++ b/testcases/kernel/controllers/cpuacct/.gitignore
@@ -1 +1 @@
-/cpuacct_task01
+/cpuacct_task
diff --git a/testcases/kernel/controllers/cpuacct/README b/testcases/kernel/controllers/cpuacct/README
deleted file mode 100644
index 383f252..0000000
--- a/testcases/kernel/controllers/cpuacct/README
+++ /dev/null
@@ -1,51 +0,0 @@
-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_task01.c
----------------
-This is the task which is run for eating up the cpu time.
-
-
-cpuacct_setup.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 setup.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 --git a/testcases/kernel/controllers/cpuacct/cpuacct.sh b/testcases/kernel/controllers/cpuacct/cpuacct.sh
new file mode 100755
index 0000000..445e549
--- /dev/null
+++ b/testcases/kernel/controllers/cpuacct/cpuacct.sh
@@ -0,0 +1,173 @@
+#!/bin/bash
+
+################################################################################
+## ##
+## Copyright (c) 2015 SUSE ##
+## ##
+## 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ##
+## USA ##
+## ##
+## Author: Cedric Hnyda <chnyda@suse.com> ##
+## ##
+################################################################################
+
+# Usage
+# ./cpuacct.sh nbsubgroup nbprocess
+#
+# 1) nbsubgroup : number of subgroup to create
+# 2) nbprocess : number of process to attach to each subgroup
+#
+# Description
+#
+# 1) Find if cpuacct is mounted, if not mounted, cpuacct will be mounted
+# 2) Create a subgroup ltp_test in cpuacct
+# 3) Create nbsubgroup subgroup in ltp_test and attach them nbprocess process
+# 4) Check that ltp_test/subgroup*/cpuacct.usage != 0 (test1)
+# 5) Check that sum ltp_test/subgroup*/cpuacct.usage = ltp_test/cpuacct.usage
+# (test2)
+# 6) cleanup
+
+mounted=1
+mount_point=""
+max=$1
+nbprocess=$2
+
+cd $LTPROOT/testcases/bin
+
+export TCID="cpuacct_$1_$2"
+export TESTROOT=`pwd`
+export TST_TOTAL=3;
+export TST_COUNT=1;
+status=0
+
+. test.sh
+
+verify_result()
+{
+ result=$1
+ expected=$2
+ message=$3
+ if [ "$result" -ne "$expected" ]; then
+ tst_resm TINFO "expected $expected, got $result"
+ cleanup;
+ tst_brkm TBROK NULL $message
+ fi
+}
+
+mount_cpuacct()
+{
+ ROD mount -t cgroup -o cpuacct none $mount_point
+}
+
+umount_cpuacct()
+{
+ tst_resm TINFO "Umounting cpuacct"
+ umount $mount_point
+ verify_result $? 0 "Error occured while umounting cgroup"
+}
+
+do_mkdir()
+{
+ mkdir -p $1
+ verify_result $? 0 "Error occured with mkdir"
+}
+
+do_rmdir()
+{
+ rmdir $1
+ verify_result $? 0 "Error occured with rmdir"
+}
+
+setup()
+{
+ mount_point=`grep -w cpuacct /proc/mounts | cut -f 2 | cut -d " " -f2`
+ tst_resm TINFO "cpuacct: $mount_point"
+ if [ "$mount_point" = "" ]; then
+ mounted=0
+ mount_point=/dev/cgroup
+ fi
+
+ testpath=$mount_point/ltp_$TCID
+
+ if [ "$mounted" -eq "0" ]; then
+ do_mkdir $mount_point
+ mount_cpuacct
+ fi
+ do_mkdir $testpath
+}
+
+cleanup()
+{
+ tst_resm TINFO "removing created directories"
+ rmdir $testpath/subgroup_*;
+ rmdir $testpath;
+ if [ "$mounted" -ne 1 ] ; then
+ umount_cpuacct
+ do_rmdir $mount_point
+ fi
+}
+
+setup;
+
+# create subgroups
+for i in `seq 1 $max`
+do
+ do_mkdir $testpath/subgroup_$i
+done
+
+# create and attach process to subgroups
+for i in `seq 1 $max`
+do
+ for j in `seq 1 $nbprocess`
+ do
+ cpuacct_task $testpath/subgroup_$i/tasks &
+ done
+done
+
+for job in `jobs -p`
+do
+ wait $job
+done
+
+acc=0
+error=0
+for i in `seq 1 $max`
+do
+ tmp=`cat $testpath/subgroup_$i/cpuacct.usage`
+ if [ "$tmp" -eq "0" ]; then
+ error=1
+ status=1
+ fi
+ ((acc = acc + tmp))
+done
+
+## check that cpuacct.usage != 0 for every subgroup
+if [ "$error" -eq "1" ]; then
+ tst_resm TFAIL "cpuacct.usage should not be equal to 0"
+else
+ tst_resm TPASS "cpuacct.usage is not equal to 0 for every subgroup"
+fi
+
+## check that ltp_subgroup/cpuacct.usage == sum ltp_subgroup/subgroup*/cpuacct.usage
+ref=`cat $testpath/cpuacct.usage`
+if [ "$ref" != "$acc" ]; then
+ tst_resm TFAIL "ltp_test/cpuacct.usage not equal to ltp_test/subgroup*/cpuacct.usage"
+ status=1
+else
+ tst_resm TPASS "ltp_test/cpuacct.usage equal to ltp_test/subgroup*/cpuacct.usage"
+fi
+
+cleanup;
+tst_exit
diff --git a/testcases/kernel/controllers/cpuacct/cpuacct_setup.sh b/testcases/kernel/controllers/cpuacct/cpuacct_setup.sh
deleted file mode 100755
index 6eab1b4..0000000
--- a/testcases/kernel/controllers/cpuacct/cpuacct_setup.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/bash
-# usage ./cpuacct_setup.sh
-
-################################################################################
-# Copyright (c) International Business Machines Corp., 2009 #
-# #
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #
-# #
-################################################################################
-################################################################################
-# Name Of File: setup.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 <rajduddu@in.ibm.com> #
-# #
-# History: #
-# #
-# DATE NAME EMAIL DESC #
-# #
-# 14/07/09 Rajasekhar D <rajduddu@in.ibm.com> Created this test #
-# #
-################################################################################
-
-# umount cpuacct if it has been mounted.
-umount_cpuacct_mounted()
-{
- dir=`cat /proc/mounts | grep cpuacct | awk '{print $2}'`
- if [ -n "$dir" ]; then
- umount "$dir" 2> /dev/null
- fi
-}
-
-# The cleanup function
-cleanup()
-{
- echo "Cleanup called"
- rm -rf txt*
- rmdir /dev/cpuacct/group*/group* 2> /dev/null
- rmdir /dev/cpuacct/group* 2> /dev/null
- umount /dev/cpuacct/ 2> /dev/null
- umount_cpuacct_mounted
- rmdir /dev/cpuacct 2> /dev/null
- rm -rf tmp2 2> /dev/null
-}
-
-task_kill()
-{
- for i in `ps -e | grep cpuacct_task | awk '{print $1}'`
- do
- kill -SIGUSR1 $i
- done
- sleep 1
- rm -rf txt* 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
- umount_cpuacct_mounted
- mount -t cgroup -ocpuacct none /dev/cpuacct 2> /dev/null
- if [ $? -ne 0 ]
- then
- echo "TFAIL: Could not mount cgroup filesystem"
- echo "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 --git a/testcases/kernel/controllers/cpuacct/cpuacct_task.c b/testcases/kernel/controllers/cpuacct/cpuacct_task.c
new file mode 100644
index 0000000..eab6356
--- /dev/null
+++ b/testcases/kernel/controllers/cpuacct/cpuacct_task.c
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2015 Cedric Hnyda <chnyda@suse.com>
+ *
+ * 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 would 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 the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
+* Description:
+* Attach the current process to argv[1]
+*/
+
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+int main(int argc, char **argv)
+{
+ char cmd[512];
+ long pid = getpid();
+
+ sprintf(cmd, "echo %lu >> %s", pid, argv[1]);
+ system(cmd);
+ struct itimerval it = {.it_value = {.tv_sec = 0, .tv_usec = 10000}};
+
+ setitimer(ITIMER_VIRTUAL, &it, NULL);
+ for (;;);
+ return 0;
+}
diff --git a/testcases/kernel/controllers/cpuacct/cpuacct_task01.c b/testcases/kernel/controllers/cpuacct/cpuacct_task01.c
deleted file mode 100644
index 67736e1..0000000
--- a/testcases/kernel/controllers/cpuacct/cpuacct_task01.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(void)
-{
- FILE *fp;
-
- while (1) {
- fp = fopen("txt.x", "w");
- if (fp == NULL) {
- perror("fopen failed");
- exit(1);
- }
- fclose(fp);
- }
- return 0;
-}
diff --git a/testcases/kernel/controllers/cpuacct/cpuacct_testplan.txt b/testcases/kernel/controllers/cpuacct/cpuacct_testplan.txt
deleted file mode 100644
index ed84867..0000000
--- a/testcases/kernel/controllers/cpuacct/cpuacct_testplan.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-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 --git a/testcases/kernel/controllers/cpuacct/run_cpuacct_test.sh b/testcases/kernel/controllers/cpuacct/run_cpuacct_test.sh
deleted file mode 100755
index b31aa45..0000000
--- a/testcases/kernel/controllers/cpuacct/run_cpuacct_test.sh
+++ /dev/null
@@ -1,340 +0,0 @@
-#!/bin/bash
-# usage ./run_cpuacct_test.sh $TEST_NUM
-#############################################################################
-# Copyright (c) International Business Machines Corp., 2009 #
-# #
-# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 #
-# application) #
-# #
-# Author: Rajasekhar Duddu <rajduddu@in.ibm.com> #
-# #
-# History: #
-# #
-# DATE NAME EMAIL DESC #
-# #
-# 14/07/09 Rajasekhar D <rajduddu@in.ibm.com> Created this test #
-# #
-#############################################################################
-
-
-export TCID="cpuacct_test01";
-export TST_TOTAL=1;
-export TST_COUNT=1;
-
-TEST_NUM=$1;
-SCRIPT_PID=$$;
-RC=0;
-
-tst_kvercmp 2 6 30 2> /dev/null
-if [ $? -eq 0 ]; then
- tst_brkm TCONF ignored "Test should be run with kernel 2.6.30 or newer"
- exit 0
-fi
-
-. cmdlib.sh
-
-tst_require_root
-
-. cpuacct_setup.sh
-
-task_kill 2> /dev/null
-cleanup
-
-mes="CPU Accounting Controller"
-cg_path="/dev/cpuacct";
-num_online_cpus=`tst_ncpus`
-
-#Function to create tasks equal to num_online_cpus.
-nr_tasks()
-{
- cpuacct_task01 &
- 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 $mes:$2 PASSED"
-
- else
- RC=$?
- echo "TFAIL $mes:$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 $mes:$2 PASSED"
- else
- RC=$?
- echo "TFAIL $mes:$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 $mes:$2 PASSED"
- else
- RC=$?
- echo "TFAIL $mes:$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 $mes:$2 PASSED"
- else
- RC=$?
- echo "TFAIL $mes:$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 $mes:$2 PASSED"
- else
- RC=$?
- echo "TFAIL $mes:$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 $mes:$2 PASSED"
- else
- RC=$?
- echo "TFAIL $mes:$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" )
- exists cpuacct_task01
- cpuacct_task01 &
- pid=$!
-
- mkdir $cg_path/group_1 2> /dev/null
- mkdir $cg_path/group_1/group_11/ 2> /dev/null
- if [ $? -ne 0 ]; then
- echo "TFAIL Cannot create cpuacct cgroups Exiting Test"
- task_kill 2> /dev/null
- cleanup
- exit 1
- fi
- echo $pid > $cg_path/group_1/group_11/tasks 2> /dev/null
- if [ $? -ne 0 ]; then
- echo "TFAIL Not able to move a task to the cgroup"
- echo "Exiting Test"
- task_kill 2> /dev/null
- cleanup
- exit 1
- fi
- sleep 5
- task_kill 2> /dev/null
- for i in cpuacct.usage cpuacct.usage_percpu cpuacct.stat
- do
- cat $cg_path/group_1/$i \
- $cg_path/group_1/group_11/$i > tmp2
- check_attr $1 $i
- if [ $RC -ne 0 ]; then
- status=1
- fi
- done
- if [ $status -eq 0 ]; then
- echo
- tst_resm TPASS "$mes test executed successfully"
- task_kill 2> /dev/null
- cleanup
- exit 0
- else
- echo
- tst_resm TFAIL "$mes test execution Failed"
- task_kill 2> /dev/null
- cleanup
- exit 1
- fi
- ;;
-
-"2" )
- mkdir $cg_path/group_1 2> /dev/null
- mkdir $cg_path/group_1/group_11 2> /dev/null
- mkdir $cg_path/group_1/group_12 2> /dev/null
- if [ $? -ne 0 ]; then
- echo "TFAIL Cannot create cpuacct cgroups Exiting Test"
- task_kill 2> /dev/null
- cleanup
- exit 1
- fi
-
- exists cpuacct_task01
- for (( m=0 ; m<=$num_online_cpus ; m++ ))
- do
- nr_tasks
- echo $pid > $cg_path/group_1/group_11/tasks
- if [ $? -ne 0 ]; then
- echo "TFAIL Not able to move task to cgroup"
- echo "Exiting Test"
- task_kill 2> /dev/null
- cleanup
- exit 1
- fi
- nr_tasks
- echo $pid >$cg_path/group_1/group_12/tasks
- if [ $? -ne 0 ]; then
- echo "TFAIL Not able to move task to cgroup"
- echo "Exiting Test"
- task_kill 2> /dev/null
- cleanup
- exit 1
- fi
- sleep 2
- done
- task_kill 2> /dev/null
- for i in cpuacct.usage cpuacct.usage_percpu cpuacct.stat
- do
- cat $cg_path/group_1/$i \
- $cg_path/group_1/group_11/$i \
- $cg_path/group_1/group_12/$i >tmp2
- check_attr $1 $i
- if [ $RC -ne 0 ]; then
- status=1
- fi
- done
- if [ $status -eq 0 ]; then
- echo
- tst_resm TPASS "$mes test executed successfully"
- task_kill 2> /dev/null
- cleanup
- exit 0
- else
- echo
- tst_resm TFAIL "$mes test execution Failed"
- task_kill 2> /dev/null
- cleanup
- exit 1
- fi
- ;;
-* )
- usage
- exit 1
- ;;
-esac
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [LTP] [PATCH V2] controllers/cpuacct: rewrote testcases
2015-11-10 17:03 [LTP] [PATCH V2] controllers/cpuacct: rewrote testcases Cedric Hnyda
@ 2015-11-10 18:45 ` Cyril Hrubis
0 siblings, 0 replies; 2+ messages in thread
From: Cyril Hrubis @ 2015-11-10 18:45 UTC (permalink / raw)
To: ltp
Hi!
> +#!/bin/bash
LTP aims to work on embedded hardware as well (where bash may not be
installed at all), so this should rather be pointing to #!/bin/sh.
> +# Usage
> +# ./cpuacct.sh nbsubgroup nbprocess
> +#
> +# 1) nbsubgroup : number of subgroup to create
> +# 2) nbprocess : number of process to attach to each subgroup
> +#
> +# Description
> +#
> +# 1) Find if cpuacct is mounted, if not mounted, cpuacct will be mounted
> +# 2) Create a subgroup ltp_test in cpuacct
> +# 3) Create nbsubgroup subgroup in ltp_test and attach them nbprocess process
> +# 4) Check that ltp_test/subgroup*/cpuacct.usage != 0 (test1)
> +# 5) Check that sum ltp_test/subgroup*/cpuacct.usage = ltp_test/cpuacct.usage
> +# (test2)
> +# 6) cleanup
No need to comment the setup and cleanup here. Keep just the part that
is not obvious, i.e. points 2 - 5.
> +mounted=1
> +mount_point=""
> +max=$1
> +nbprocess=$2
> +
> +cd $LTPROOT/testcases/bin
What is this needed for?
I do not see that you are working with files in this directory.
(I've missed this in the first review)
> +export TCID="cpuacct_$1_$2"
> +export TESTROOT=`pwd`
What is this used for?
> +export TST_TOTAL=3;
^
Useless semicolon
> +export TST_COUNT=1;
The TST_COUNT is handled by test.sh library, you shouldn't define it
here.
> +status=0
The status is not used now, please remove it.
> +. test.sh
> +
> +verify_result()
> +{
> + result=$1
> + expected=$2
> + message=$3
> + if [ "$result" -ne "$expected" ]; then
> + tst_resm TINFO "expected $expected, got $result"
> + cleanup;
> + tst_brkm TBROK NULL $message
> + fi
> +}
> +
> +mount_cpuacct()
> +{
> + ROD mount -t cgroup -o cpuacct none $mount_point
Now that it's just single line it does not deserve to be in separate
funciton, doesn't it?
> +}
> +
> +umount_cpuacct()
> +{
> + tst_resm TINFO "Umounting cpuacct"
> + umount $mount_point
> + verify_result $? 0 "Error occured while umounting cgroup"
Now this can be done using ROD as well. If you have a look at our
documentation at:
https://github.com/linux-test-project/ltp/wiki/Test-Writing-Guidelines#233-cleanup
You can setup TST_CLEANUP to point to a cleanup function and have it
executed on tst_brkm (which is called by ROD) and on tst_exit.
So all you need to do is to set TST_CLEANUP in the setup() right after
you mount the cpuacct and create the directory and you have guaranteed
that the cleanup will be called if you call library function that causes
test exit.
> +}
> +
> +do_mkdir()
> +{
> + mkdir -p $1
> + verify_result $? 0 "Error occured with mkdir"
> +}
> +
> +do_rmdir()
> +{
> + rmdir $1
> + verify_result $? 0 "Error occured with rmdir"
> +}
These as well. You can just do ROD rmdir foo in the code instead of
defining new functions...
> +setup()
> +{
> + mount_point=`grep -w cpuacct /proc/mounts | cut -f 2 | cut -d " " -f2`
> + tst_resm TINFO "cpuacct: $mount_point"
> + if [ "$mount_point" = "" ]; then
> + mounted=0
> + mount_point=/dev/cgroup
> + fi
> +
> + testpath=$mount_point/ltp_$TCID
> +
> + if [ "$mounted" -eq "0" ]; then
> + do_mkdir $mount_point
> + mount_cpuacct
> + fi
> + do_mkdir $testpath
> +}
> +
> +cleanup()
> +{
> + tst_resm TINFO "removing created directories"
> + rmdir $testpath/subgroup_*;
> + rmdir $testpath;
> + if [ "$mounted" -ne 1 ] ; then
> + umount_cpuacct
> + do_rmdir $mount_point
> + fi
> +}
> +
> +setup;
> +
> +# create subgroups
> +for i in `seq 1 $max`
> +do
> + do_mkdir $testpath/subgroup_$i
> +done
> +
> +# create and attach process to subgroups
> +for i in `seq 1 $max`
> +do
> + for j in `seq 1 $nbprocess`
> + do
The prefered style for bash for loops is:
for foo; do
done
> + cpuacct_task $testpath/subgroup_$i/tasks &
> + done
> +done
> +
> +for job in `jobs -p`
> +do
> + wait $job
> +done
> +
> +acc=0
> +error=0
> +for i in `seq 1 $max`
> +do
> + tmp=`cat $testpath/subgroup_$i/cpuacct.usage`
> + if [ "$tmp" -eq "0" ]; then
> + error=1
> + status=1
Now the status is not used at all, right?
Also the error should rather be named as fail.
And maybe we can do better naming it fails and incrementing for each
zero value and then print how many of them were zero in the FAIL message
below.
> + fi
> + ((acc = acc + tmp))
This is bashism (does not work with portable shell, i.e. on debian dash
shell)
Portable way is acc=$((acc + tmp))
> +done
> +
> +## check that cpuacct.usage != 0 for every subgroup
> +if [ "$error" -eq "1" ]; then
> + tst_resm TFAIL "cpuacct.usage should not be equal to 0"
> +else
> + tst_resm TPASS "cpuacct.usage is not equal to 0 for every subgroup"
> +fi
> +
> +## check that ltp_subgroup/cpuacct.usage == sum ltp_subgroup/subgroup*/cpuacct.usage
> +ref=`cat $testpath/cpuacct.usage`
> +if [ "$ref" != "$acc" ]; then
> + tst_resm TFAIL "ltp_test/cpuacct.usage not equal to ltp_test/subgroup*/cpuacct.usage"
> + status=1
Here status is unused as well.
> +else
> + tst_resm TPASS "ltp_test/cpuacct.usage equal to ltp_test/subgroup*/cpuacct.usage"
> +fi
> +
> +cleanup;
^
There is no need for semicolon here.
Also if you set the TST_CLEANUP there si no need to call it here.
> +tst_exit
> diff --git a/testcases/kernel/controllers/cpuacct/cpuacct_task.c b/testcases/kernel/controllers/cpuacct/cpuacct_task.c
> new file mode 100644
> index 0000000..eab6356
> --- /dev/null
> +++ b/testcases/kernel/controllers/cpuacct/cpuacct_task.c
> @@ -0,0 +1,42 @@
> +/*
> + * Copyright (c) 2015 Cedric Hnyda <chnyda@suse.com>
> + *
> + * 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 would 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 the Free Software Foundation,
> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +/*
> +* Description:
> +* Attach the current process to argv[1]
> +*/
> +
> +#include <stdio.h>
> +#include <sys/time.h>
> +#include <sys/types.h>
> +#include <unistd.h>
> +#include <stdlib.h>
> +
> +int main(int argc, char **argv)
> +{
> + char cmd[512];
> + long pid = getpid();
> +
> + sprintf(cmd, "echo %lu >> %s", pid, argv[1]);
> + system(cmd);
This is kind of ugly way to write to a file from C.
You can either open the file and then print to it as:
FILE *f;
f = fopen(argv[1], "w");
if (f)
... handle error
fprintf(f, "%i\n", getpid());
fclose(f);
Or use FILE_PRINTF(argv[1], "%i\n", getpid()) from the LTP test library.
> + struct itimerval it = {.it_value = {.tv_sec = 0, .tv_usec = 10000}};
> +
> + setitimer(ITIMER_VIRTUAL, &it, NULL);
> + for (;;);
> + return 0;
> +}
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-10 18:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-10 17:03 [LTP] [PATCH V2] controllers/cpuacct: rewrote testcases Cedric Hnyda
2015-11-10 18:45 ` Cyril Hrubis
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.