Fix bug described in commit 5ef685

[linux-conf-perf.git] / scripts / boot.py

diff --git a/scripts/boot.py b/scripts/boot.py
index 1f7e0f932961e643e9f8fa2b210ced1c4068f233..c12bb7978c21e090f68eb774244462bfb73971a0 100644 (file)
--- a/scripts/boot.py
+++ b/scripts/boot.py
@@ -2,25 +2,44 @@ import os
 import sys
 import subprocess
 import shutil
+import importlib
+import traceback
 
 import utils
+import initialize
 from conf import conf
-from exceptions import MissingFile
+from conf import sf
+import exceptions
+import database
 
-def gen_nbscript():
+def boot(config, to_database = True):
        try:
-               os.remove(conf.nbscript)
-       except OSError:
-               pass
+               out = utils.callsubprocess('boot', conf.boot_command, conf.boot_output, \
+                               True, timeout = conf.boot_timeout)
+               result = 'nominal'
+       except exceptions.ProcessFailed as e:
+               result = 'failed'
+               out = e.output
+               traceback.print_exc()
+       except exceptions.ProcessTimeout as e:
+               result = 'timeout'
+               out = e.output
+               traceback.print_exc()
 
-       with open(conf.nbscript, 'w') as f:
-               f.write('load ' + conf.linux_image + ' console=ttyS0,115200\n')
-               f.write('load ' + conf.initram + '\n')
-
-def boot():
-       if not os.path.isfile(conf.nbscript):
-               gen_nbscript()
-
-       sprc = subprocess.Popen([conf.novaboot, conf.nbscript] + conf.novaboot_args,
-                       stdout = subprocess.PIPE)
+       value = None
+       try:
+               res = utils.callsubprocess('parse_command', conf.parse_command,
+                               conf.parse_output, True, stdin = out)
+               value = float(res[0])
+       except Exception as e:
+               print("W: parse exception: " + e.__str__())
 
+       if to_database:
+                       dtb = database.database()
+                       txt = ''
+                       for ln in out:
+                               for c in ln:
+                                       if c == b'\0':
+                                               c = ' '
+                               txt += ln + '\n'
+                       dtb.add_measure(txt, result, config.id, value)