Remove CONFIG_ and =. from dot_measure

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

diff --git a/conf.py b/conf.py
index b8204cbef8ed05a90f7ebac33374ccd63f197e12..4c4ed8ffc1819143215d7b492ef8855bb30b84a0 100644 (file)
--- a/conf.py
+++ b/conf.py
@@ -1,6 +1,8 @@
 import os
+import sys
 import re
 import importlib.machinery
+import multiprocessing
 
 ## Global configs
 # kernel_arch
@@ -13,7 +15,7 @@ kernel_arch = 'x86'
 kernel_env = {'SRCARCH': kernel_arch, 'ARCH': kernel_arch, 'KERNELVERSION': kernel_arch}
 # build_command
 # Command executed for kernel build in linux folder.
-build_command = ['make']
+build_command = ['make', '-j', str(multiprocessing.cpu_count())]
 
 # boot_command
 # Command executed for booting. Output of this command is saved to output folder.
@@ -37,18 +39,19 @@ picosat_args = []
 # db_database
 # Database in PostgreSQL to be used for this tools
 db_database = 'linux-conf-perf'
-# db_user
-# Define PostgreSQL user
-db_user = 'user'
-# db_password
-# Define PostrgreSQL user password
-db_password = 'password'
-# db_host
-# Address of PostgreSQL database server
-db_host = 'localhost'
-# db_port
-# Port of PotgreSQL database server
-db_port = 5432
+
+# # db_user
+# # Define PostgreSQL user
+# db_user = 'user'
+# # db_password
+# # Define PostrgreSQL user password
+# db_password = 'password'
+# # db_host
+# # Address of PostgreSQL database server
+# db_host = 'localhost'
+# # db_port
+# # Port of PotgreSQL database server
+# db_port = 5432
 
 # multithread
 # Define if measurement and kernel build should be executed in parallel.
@@ -86,9 +89,8 @@ dot_confmk = '.conf.mk'
 dot_config = 'dot_config'
 
 linux_sources = 'linux/'
-linux_kconfig_head = linux_sources + 'Kconfig'
-linux_dot_config = linux_sources + '.config'
-linux_image = linux_sources + 'arch/' + kernel_arch + '/boot/bzImage'
+linux_build_folder = 'linux/'
+linux_image = linux_build_folder + 'arch/' + kernel_arch + '/boot/bzImage'
 
 build_folder = 'jobfiles/'
 jobfolder_linux_image = build_folder + 'linuxImage'
@@ -100,6 +102,9 @@ measure_file = build_folder + 'measure'
 dot_measure_file = build_folder + 'dot_measure'
 dot_config_back_file = build_folder + 'dot_config_back'
 single_generated_file = build_folder + 'single_generated'
+measurechecked_file = build_folder + 'measurechecked'
+
+buildroot_config_cyclictest = '/dev/null'
 
 result_folder = 'result/'
 log_folder = 'log/'
@@ -114,18 +119,18 @@ allconfig = 'scripts/allconfig/allconfig'
 absroot = os.path.dirname(os.path.realpath(__file__))
 
 #######################################
-# Overlap configuration for specified target
-if os.path.isfile(os.path.join(absroot, '.target')):
-       target = None
-       with open(os.path.join(absroot, '.target'), 'r') as f:
-               target = f.readline().rstrip()
+# Override configuration for specified target
+try:
+       target = open(os.path.join(absroot, '.target'), 'r').readline().rstrip()
        conffile = os.path.join(absroot, 'targets', target, 'conf.py')
-       if os.path.isfile(conffile):
+       try:
                ovconf = importlib.machinery.SourceFileLoader("module.name", conffile).load_module()
                for name in dir(ovconf):
                        if not re.match('__*__', name):
                                vars()[name] = vars(ovconf)[name]
-       else:
-               print("W: No target specifier. Write target to .target file.")
-else:
-       print("W: No target specifier. Write target to .target file.")
+       except:
+               print("E: Invalid target specifier. Write valid target to .target file.")
+               sys.exit(-99)
+except:
+       print("E: No target specifier. Write target to .target file.")
+       sys.exit(-99)