Split up rteval.py into a pure measurement module and the command line tool

This cleans up rteval further by making the RtEval class a pure measurement
feature which receives all the needed setup and controls loads and measurment
modules, in addition to the final reporting.

The command line and config parsing is kept inside the command line tool, where
it will set up everything before passing it all to the RtEval calss.

Signed-off-by: David Sommerseth <davids@redhat.com>

6 files changed, 14 insertions, 14 deletions

diff --git a/rteval/modules/__init__.py b/rteval/modules/__init__.py
index 6b656e8..1d927d2 100644
--- a/rteval/modules/__init__.py
+++ b/rteval/modules/__init__.py
@@ -22,8 +22,8 @@
 #   are deemed to be part of the source code.
 #
 
-from Log import Log
-from rtevalConfig import rtevalCfgSection
+from rteval.Log import Log
+from rteval.rtevalConfig import rtevalCfgSection
 import time, libxml2, threading
 
 __all__ = ["rtevalModulePrototype", "ModuleContainer", "RtEvalModules"]
@@ -202,8 +202,8 @@ reference from the first import"""
             return self.__modsloaded[idxname]
         except KeyError:
             self.__logger.log(Log.INFO, "importing module %s" % modname)
-            mod = __import__("%s.%s" % (modroot, modname),
-                             fromlist=modroot)
+            mod = __import__("rteval.%s.%s" % (modroot, modname),
+                             fromlist="rteval.%s" % modroot)
             self.__modsloaded[idxname] = mod
             return mod
 
diff --git a/rteval/modules/loads/__init__.py b/rteval/modules/loads/__init__.py
index 66dad57..f4d4de4 100644
--- a/rteval/modules/loads/__init__.py
+++ b/rteval/modules/loads/__init__.py
@@ -27,9 +27,9 @@ import os
 import time
 import threading
 import libxml2
-from Log import Log
-from rtevalConfig import rtevalCfgSection
-from modules import RtEvalModules, rtevalModulePrototype
+from rteval.Log import Log
+from rteval.rtevalConfig import rtevalCfgSection
+from rteval.modules import RtEvalModules, rtevalModulePrototype
 
 class LoadThread(rtevalModulePrototype):
     def __init__(self, name, config, logger=None):
diff --git a/rteval/modules/loads/hackbench.py b/rteval/modules/loads/hackbench.py
index cf09cfa..e040470 100644
--- a/rteval/modules/loads/hackbench.py
+++ b/rteval/modules/loads/hackbench.py
@@ -27,8 +27,8 @@
 
 import sys, os, time, glob, subprocess, errno
 from signal import SIGTERM, SIGKILL
-from modules.loads import CommandLineLoad
-from Log import Log
+from rteval.modules.loads import CommandLineLoad
+from rteval.Log import Log
 
 
 class Hackbench(CommandLineLoad):
diff --git a/rteval/modules/loads/kcompile.py b/rteval/modules/loads/kcompile.py
index d0fb444..bcb033a 100644
--- a/rteval/modules/loads/kcompile.py
+++ b/rteval/modules/loads/kcompile.py
@@ -24,8 +24,8 @@
 #
 import sys, os, glob, subprocess
 from signal import SIGTERM
-from modules.loads import CommandLineLoad
-from Log import Log
+from rteval.modules.loads import CommandLineLoad
+from rteval.Log import Log
 
 kernel_prefix="linux-2.6"
 
diff --git a/rteval/modules/measurement/__init__.py b/rteval/modules/measurement/__init__.py
index df96dfb..a12eba2 100644
--- a/rteval/modules/measurement/__init__.py
+++ b/rteval/modules/measurement/__init__.py
@@ -23,7 +23,7 @@
 #
 
 import libxml2
-from modules import RtEvalModules, ModuleContainer
+from rteval.modules import RtEvalModules, ModuleContainer
 
 
 class MeasurementProfile(RtEvalModules):
diff --git a/rteval/modules/measurement/cyclictest.py b/rteval/modules/measurement/cyclictest.py
index a04b52d..4be0238 100644
--- a/rteval/modules/measurement/cyclictest.py
+++ b/rteval/modules/measurement/cyclictest.py
@@ -26,8 +26,8 @@
 #
 
 import os, sys, subprocess, signal, libxml2
-from Log import Log
-from modules import rtevalModulePrototype
+from rteval.Log import Log
+from rteval.modules import rtevalModulePrototype
 
 
 class RunData(object):