aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2012-12-19 15:56:36 +0100
committerDavid Sommerseth <davids@redhat.com>2012-12-19 15:56:36 +0100
commit3db08cc6dcfb3ef44d3a64024de0db408f9dcf0e (patch)
tree2c7effeafb8f6f38d29e179f982c8e152b17d52c
parentf9e8cce6b39c0fb966562613da4292c7e952d7a7 (diff)
downloadrteval-3db08cc6dcfb3ef44d3a64024de0db408f9dcf0e.tar.gz
Put all default values for modules into the modules itself
Removed all the module defaults from rteval-cmd and updated the modules' default values to the same values. Now module defaults are only managed inside the module. Signed-off-by: David Sommerseth <davids@redhat.com>
-rwxr-xr-xrteval-cmd13
-rw-r--r--rteval/modules/loads/hackbench.py1
-rw-r--r--rteval/modules/loads/kcompile.py3
-rw-r--r--rteval/modules/measurement/cyclictest.py2
4 files changed, 4 insertions, 15 deletions
diff --git a/rteval-cmd b/rteval-cmd
index b0053e2..9708e10 100755
--- a/rteval-cmd
+++ b/rteval-cmd
@@ -202,19 +202,6 @@ if __name__ == '__main__':
'kcompile' : 'module',
'hackbench' : 'module',
},
- 'kcompile' : {
- 'source' : 'linux-2.6.21.tar.bz2',
- 'jobspercore': '2',
- },
- 'hackbench' : {
- 'source' : 'hackbench.tar.bz2',
- 'jobspercore': '5',
- },
- 'cyclictest' : {
- 'interval' : '100',
- 'buckets' : '2000',
- 'distance' : '25',
- },
'measurement' : {
'cyclictest' : 'module',
}
diff --git a/rteval/modules/loads/hackbench.py b/rteval/modules/loads/hackbench.py
index 1cdd53c..6cb0524 100644
--- a/rteval/modules/loads/hackbench.py
+++ b/rteval/modules/loads/hackbench.py
@@ -129,6 +129,7 @@ class Hackbench(CommandLineLoad):
def ModuleParameters():
return {"jobspercore": {"descr": "Number of working threads per CPU core",
+ "default": 5,
"metavar": "NUM"}
}
diff --git a/rteval/modules/loads/kcompile.py b/rteval/modules/loads/kcompile.py
index 1f8a66a..a38e12f 100644
--- a/rteval/modules/loads/kcompile.py
+++ b/rteval/modules/loads/kcompile.py
@@ -177,10 +177,11 @@ class Kcompile(CommandLineLoad):
def ModuleParameters():
- return {"tarball": {"descr": "Source tar ball",
+ return {"source": {"descr": "Source tar ball",
"default": "linux-2.6.21.tar.bz2",
"metavar": "TARBALL"},
"jobspercore": {"descr": "Number of working threads per core",
+ "default": 2,
"metavar": "NUM"}
}
diff --git a/rteval/modules/measurement/cyclictest.py b/rteval/modules/measurement/cyclictest.py
index 59a6dcd..863cf38 100644
--- a/rteval/modules/measurement/cyclictest.py
+++ b/rteval/modules/measurement/cyclictest.py
@@ -311,7 +311,7 @@ def ModuleParameters():
"default": 2000,
"metavar": "NUM"},
"distance": {"descr": "The distance of the thread intervals in microseconds",
- "default": 0,
+ "default": 25,
"metavar": "DIST_US"},
"priority": {"descr": "Run cyclictest with the given priority",
"default": 95,