Merge in patches for v2.0 from Clark Williams

4 files changed, 18 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 5c7a463..90c1a66 100644
--- a/Makefile
+++ b/Makefile
@@ -40,14 +40,15 @@ BLOAD	:=	$(LOADDIR)/dbench-4.0.tar.gz
 LOADS	:=	$(KLOAD) $(BLOAD)
 
 runit:
-	[ -d ./run ] || mkdir run
-	python rteval/rteval.py -D -L -v --workdir=./run --loaddir=./loadsource --duration=$(D) -f ./rteval/rteval.conf -i ./rteval
+	[ -d $(HERE)/run ] || mkdir run
+	python rteval/rteval.py -D -L -v --workdir=$(HERE)/run --loaddir=$(HERE)/loadsource --duration=$(D) -f $(HERE)/rteval.conf -i $(HERE)/rteval
 
 load:
 	[ -d ./run ] || mkdir run
-	python rteval/rteval.py --onlyload -D -L -v --workdir=./run --loaddir=./loadsource -f ./rteval/rteval.conf -i ./rteval
+	python rteval/rteval.py --onlyload -D -L -v --workdir=./run --loaddir=$(HERE)/loadsource -f $(HERE)/rteval/rteval.conf -i $(HERE)/rteval
+
 sysreport:
-	python rteval/rteval.py -D -v --workdir=./run --loaddir=./loadsource --duration=$(D) -i ./rteval --sysreport
+	python rteval/rteval.py -D -v --workdir=$(HERE)/run --loaddir=$(HERE)/loadsource --duration=$(D) -i $(HERE)/rteval --sysreport
 
 clean:
 	rm -f *~ rteval/*~ rteval/*.py[co] *.tar.bz2 *.tar.gz doc/*~ server/rteval-xmlrpc-*.tar.gz
diff --git a/rteval/modules/measurement/cyclictest.py b/rteval/modules/measurement/cyclictest.py
index 2476d9e..8e4f407 100644
--- a/rteval/modules/measurement/cyclictest.py
+++ b/rteval/modules/measurement/cyclictest.py
@@ -183,6 +183,7 @@ class Cyclictest(rtevalModulePrototype):
         self.__numanodes = int(self.__cfg.setdefault('numanodes', 0))
         self.__priority = int(self.__cfg.setdefault('priority', 95))
         self.__buckets = int(self.__cfg.setdefault('buckets', 2000))
+        self.__distance = int(self.__cfg.setdefault('distance', 25))
         self.__numcores = 0
         self.__cyclicdata = {}
         for line in f:
@@ -228,7 +229,7 @@ class Cyclictest(rtevalModulePrototype):
         self.__cmd = ['cyclictest',
                       self.__interval,
                       '-qm',
-                      '-d0',
+                      '-d%d' % self.__distance,
                       '-h %d' % self.__buckets,
                       "-p%d" % int(self.__priority),
                       self.__getmode(),
diff --git a/rteval/rteval.py b/rteval/rteval.py
index 582c027..1886163 100644
--- a/rteval/rteval.py
+++ b/rteval/rteval.py
@@ -102,6 +102,10 @@ class RtEval(rtevalReport):
             'cyclictest' : {
                 'interval' : '100',
                 'buckets'  : '2000',
+                'distance' : '25',
+                },
+            'measurement' : {
+                'cyclictest' : 'module',
                 }
             }
 
diff --git a/rteval/sysinfo/osinfo.py b/rteval/sysinfo/osinfo.py
index 604e63a..271ada2 100644
--- a/rteval/sysinfo/osinfo.py
+++ b/rteval/sysinfo/osinfo.py
@@ -49,10 +49,14 @@ class OSInfo(object):
 
     def copy_dmesg(self, repdir):
         dpath = "/var/log/dmesg"
-        if not os.path.exists(dpath):
-            print "dmesg file not found at %s" % dpath
+        if os.path.exists(dpath):
+            shutil.copyfile(dpath, os.path.join(repdir, "dmesg"))
             return
-        shutil.copyfile(dpath, os.path.join(repdir, "dmesg"))
+        if os.path.exists('/usr/bin/dmesg'):
+            subprocess.call('/usr/bin/dmesg > %s' % os.path.join(repdir, "dmesg"), shell=True)
+            return
+        print "dmesg file not found at %s and no dmesg exe found!" % dpath
+
 
 
     def run_sysreport(self, repdir):