diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-03-07 15:17:13 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-03-07 15:17:13 -0500 |
commit | a8a7c22a0910ba57000dbacce7c509d1d2eb11b6 (patch) | |
tree | 824c5d6484de8054812f71d95892fe836de88c2f /gen/edf_generators.py | |
parent | cef97086e881400270141cdf7b22ef68948b3597 (diff) |
Moved num_tasks option into base Generator class.
Diffstat (limited to 'gen/edf_generators.py')
-rw-r--r-- | gen/edf_generators.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/gen/edf_generators.py b/gen/edf_generators.py index 6cca933..c7267f7 100644 --- a/gen/edf_generators.py +++ b/gen/edf_generators.py | |||
@@ -1,6 +1,5 @@ | |||
1 | import generator as gen | 1 | import generator as gen |
2 | import random | 2 | import random |
3 | import run.litmus_util as lu | ||
4 | import schedcat.generator.tasks as tasks | 3 | import schedcat.generator.tasks as tasks |
5 | 4 | ||
6 | class EdfGenerator(gen.Generator): | 5 | class EdfGenerator(gen.Generator): |
@@ -12,14 +11,7 @@ class EdfGenerator(gen.Generator): | |||
12 | 11 | ||
13 | def __make_options(self, params): | 12 | def __make_options(self, params): |
14 | '''Return generic EDF options.''' | 13 | '''Return generic EDF options.''' |
15 | if 'cpus' in params: | 14 | return [gen.Generator._dist_option('utils', ['uni-medium'], |
16 | cpus = min(map(int, params['cpus'])) | ||
17 | else: | ||
18 | cpus = lu.num_cpus() | ||
19 | |||
20 | return [gen.GenOption('num_tasks', int, range(cpus, 5*cpus, cpus), | ||
21 | 'Number of tasks per experiment.'), | ||
22 | gen.Generator._dist_option('utils', ['uni-medium'], | ||
23 | gen.NAMED_UTILIZATIONS, | 15 | gen.NAMED_UTILIZATIONS, |
24 | 'Task utilization distributions.'), | 16 | 'Task utilization distributions.'), |
25 | gen.Generator._dist_option('periods', ['harmonic'], | 17 | gen.Generator._dist_option('periods', ['harmonic'], |