make catprofile, lockmeter inherit
Remove __init__ from each profiler
git-svn-id: http://test.kernel.org/svn/autotest/trunk@139 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/profilers/catprofile/catprofile.py b/profilers/catprofile/catprofile.py
index f55acc3..511dd97 100755
--- a/profilers/catprofile/catprofile.py
+++ b/profilers/catprofile/catprofile.py
@@ -1,14 +1,10 @@
# sets up a subprocess to cat a file on a specified interval
# really, really ought to autoswitch on a list of files or individual file
-import time
+import profiler,time
-class catprofile:
+class catprofile(profiler.profiler):
version = 1
- def __init__(self, job):
- self.job = job
-
-
def setup(self, filenames, output_filename, interval = 5):
self.filenames = filenames
# THIS IS WRONG. output should go under a test
diff --git a/profilers/lockmeter/lockmeter.py b/profilers/lockmeter/lockmeter.py
index 35a9668..21e5c68 100755
--- a/profilers/lockmeter/lockmeter.py
+++ b/profilers/lockmeter/lockmeter.py
@@ -1,14 +1,11 @@
# NOTE: if you get compile errors from config.h, referring you to a FAQ,
# you might need to do 'cat < /dev/null > /usr/include/linux/config.h'.
# But read the FAQ first.
+import profiler
-class lockmeter:
+class lockmeter(profiler.profiler):
version = 1
- def __init__(self, job):
- self.job = job
-
-
# ftp://oss.sgi.com/projects/lockmeter/download/lockstat-1.4.11.tar.gz
# patched with lockstat.diff
# ftp://oss.sgi.com/projects/lockmeter/download/v2.6/patch.2.6.14-lockmeter-1.gz
diff --git a/profilers/oprofile/oprofile.py b/profilers/oprofile/oprofile.py
index c4a5c16..2a4173c 100755
--- a/profilers/oprofile/oprofile.py
+++ b/profilers/oprofile/oprofile.py
@@ -5,9 +5,6 @@
class oprofile(profiler.profiler):
version = 1
- def __init__(self, job):
- self.job = job
-
# http://prdownloads.sourceforge.net/oprofile/oprofile-0.9.1.tar.gz
def setup(self, tarball = 'oprofile-0.9.1.tar.bz2'):
self.tarball = unmap_url(self.bindir, tarball, self.tmpdir)
diff --git a/profilers/readprofile/readprofile.py b/profilers/readprofile/readprofile.py
index d6a0c69..127a387 100755
--- a/profilers/readprofile/readprofile.py
+++ b/profilers/readprofile/readprofile.py
@@ -4,10 +4,6 @@
class readprofile(profiler.profiler):
version = 1
- def __init__(self, job):
- self.job = job
-
-
# http://www.kernel.org/pub/linux/utils/util-linux/util-linux-2.12r.tar.bz2
def setup(self, tarball = 'util-linux-2.12r.tar.bz2'):
try: