Merge formatting commit '894f9524' into cgroupsv2 and reformat

benchexec/cgroupsv1.py

@@ -521,7 +521,7 @@ def read_io_pressure(self):
 
     def read_usage_per_cpu(self):
         usage = {}
-        for (core, coretime) in enumerate(
+        for core, coretime in enumerate(
             self.get_value(self.CPU, "usage_percpu").split(" ")
         ):
             try:

benchexec/check_cgroups.py

@@ -95,7 +95,6 @@ def check_cgroup_availability_in_thread(options):
 
 
 class _CheckCgroupsThread(threading.Thread):
-
     error = None
 
     def __init__(self, options):

benchexec/localexecution.py

@@ -54,7 +54,6 @@ def get_system_info():
 
 
 def execute_benchmark(benchmark, output_handler):
-
     run_sets_executed = 0
 
     logging.debug("I will use %s threads.", benchmark.num_of_threads)
@@ -139,7 +138,6 @@ def execute_benchmark(benchmark, output_handler):
 
     # iterate over run sets
     for runSet in benchmark.run_sets:
-
         if STOPPED_BY_INTERRUPT:
             break
 

benchexec/model.py

@@ -423,7 +423,7 @@ def handle_limit_value(name, from_key, to_key, cmdline_value, parse_fn):
 
         # get benchmarks
         self.run_sets = []
-        for (i, rundefinitionTag) in enumerate(rootTag.findall("rundefinition")):
+        for i, rundefinitionTag in enumerate(rootTag.findall("rundefinition")):
             self.run_sets.append(
                 RunSet(rundefinitionTag, self, i + 1, globalSourcefilesTags)
             )
@@ -690,7 +690,6 @@ def _read_set_file(filename):
 
         # get sourcefiles from list in file
         for includesFilesFile in sourcefilesTag.findall("includesfile"):
-
             for file in self.expand_filename_pattern(includesFilesFile.text, base_dir):
                 input_files_in_set = list(_read_set_file(file))
                 if not input_files_in_set:
@@ -1200,13 +1199,11 @@ class Requirements(object):
     """
 
     def __init__(self, tags, rlimits, config):
-
         self.cpu_model = None
         self.memory = None
         self.cpu_cores = None
 
         for requireTag in tags:
-
             cpu_model = requireTag.get("cpuModel", None)
             if cpu_model:
                 if self.cpu_model is None:

benchexec/outputhandler.py

@@ -182,7 +182,6 @@ def set_error(self, msg, runSet=None):
             runSet.xml.set("error", msg or "unknown error")
 
     def store_header_in_xml(self, version, memlimit, timelimit, corelimit):
-
         # store benchmarkInfo in XML
         self.xml_header = ElementTree.Element(
             "result",
@@ -506,7 +505,6 @@ def output_after_run(self, run):
         # format numbers, number_of_digits is optional, so it can be None
         for column in run.columns:
             if column.number_of_digits is not None:
-
                 # if the number ends with "s" or another letter, remove it
                 if (not column.value.isdigit()) and column.value[-2:-1].isdigit():
                     column.value = column.value[:-1]

benchexec/resources.py

@@ -352,7 +352,8 @@ def get_memory_banks_per_run(coreAssignment, cgroups):
 def _get_memory_banks_listed_in_dir(path):
     """Get all memory banks the kernel lists in a given directory.
     Such a directory can be /sys/devices/system/node/ (contains all memory banks)
-    or /sys/devices/system/cpu/cpu*/ (contains all memory banks on the same NUMA node as that core)."""
+    or /sys/devices/system/cpu/cpu*/ (contains all memory banks on the same NUMA node as that core).
+    """
     # Such directories contain entries named "node<id>" for each memory bank
     return [int(entry[4:]) for entry in os.listdir(path) if entry.startswith("node")]
 

benchexec/runexecutor.py

@@ -313,7 +313,6 @@ def print_optional_result(key, unit=""):
 
 
 class RunExecutor(containerexecutor.ContainerExecutor):
-
     # --- object initialization ---
 
     def __init__(
@@ -442,7 +441,7 @@ def _setup_cgroups(self, my_cpus, memlimit, memory_nodes, cgroup_values):
         logging.debug("Created cgroups %s.", cgroups)
 
         # First, set user-specified values such that they get overridden by our settings if necessary.
-        for ((subsystem, option), value) in cgroup_values.items():
+        for (subsystem, option), value in cgroup_values.items():
             try:
                 cgroups.set_value(subsystem, option, value)
             except OSError as e:
@@ -727,7 +726,7 @@ def execute_run(
 
         self.cgroups.handle_errors(critical_cgroups)
 
-        for ((subsystem, option), _) in cgroupValues.items():
+        for (subsystem, option), _ in cgroupValues.items():
             if subsystem not in self._cgroup_subsystems:
                 sys.exit(
                     f'Cannot set option "{option}" for subsystem "{subsystem}" '

benchexec/tablegenerator/columns.py

@@ -149,7 +149,6 @@ def __init__(
         relevant_for_diff=None,
         display_title=None,
     ):
-
         # If scaling on the variables is performed, a display unit must be defined, explicitly
         if scale_factor is not None and scale_factor != 1 and unit is None:
             raise util.TableDefinitionError(
@@ -458,7 +457,6 @@ def _get_column_type_heur(column, column_values):
         explicit_scale_defined = True
 
     for value in column_values:
-
         if value is None or value == "":
             continue
 
@@ -608,7 +606,6 @@ def _get_decimal_digits(decimal_number_match, number_of_significant_digits):
         int(decimal_number_match.group(GROUP_INT_PART)) == 0
         and int(decimal_number_match.group(GROUP_DEC_PART)[1:]) != 0
     ):
-
         max_num_of_digits = len(decimal_number_match.group(GROUP_SIG_DEC_PART))
         num_of_digits = min(num_of_digits, max_num_of_digits)
         # number of needed decimal digits = number of zeroes after decimal point + significant digits

benchexec/tablegenerator/statistics.py

@@ -263,7 +263,6 @@ def add_local_summary_statistics(run_set_result, run_set_stats):
             and column.title in run_set_result.summary
             and run_set_result.summary[column.title] != ""
         ):
-
             try:
                 column_stats.local = StatValue(
                     util.to_decimal(run_set_result.summary[column.title])

benchexec/tablegenerator/test_integration/__init__.py

@@ -35,7 +35,6 @@ def result_file(name):
 
 
 class TableGeneratorIntegrationTests(unittest.TestCase):
-
     # Tests compare the generated CSV files and ignore the HTML files
     # because we assume the HTML files change more often on purpose.
 

benchexec/tools/blast.py

@@ -13,7 +13,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool):
-
     REQUIRED_PATHS = ["etv", "bin"]
 
     def blast_exe(self):

benchexec/tools/ceagle.py

@@ -11,7 +11,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool):
-
     REQUIRED_PATHS = ["sv-ceagle", "z3"]
 
     def executable(self):
@@ -28,7 +27,6 @@ def cmdline(self, executable, options, tasks, propertyfile, rlimits):
         return [executable] + options + spec + tasks
 
     def determine_result(self, returncode, returnsignal, output, isTimeout):
-
         stroutput = str(output)
 
         if isTimeout:

benchexec/tools/civl.py

@@ -11,7 +11,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool):
-
     REQUIRED_PATHS = ["civl", "lib", "provers"]
 
     def executable(self):

benchexec/tools/depthk.py

@@ -31,7 +31,6 @@ class Tool(benchexec.tools.template.BaseTool):
     ]
 
     def executable(self):
-
         return util.find_executable("depthk-wrapper.sh")
 
     def working_directory(self, executable):
@@ -51,14 +50,12 @@ def name(self):
         return "DepthK"
 
     def cmdline(self, executable, options, tasks, propertyfile, rlimits):
-
         assert len(tasks) == 1, "only one sourcefile supported"
         assert propertyfile, "property file required"
         sourcefile = tasks[0]
         return [executable] + options + ["-c", propertyfile, sourcefile]
 
     def determine_result(self, returncode, returnsignal, output, isTimeout):
-
         if len(output) <= 0:
             return result.RESULT_ERROR
 
@@ -85,7 +82,6 @@ def determine_result(self, returncode, returnsignal, output, isTimeout):
         return status
 
     def get_value_from_output(self, lines, identifier):
-
         for line in lines:
             if identifier == "k" and line.startswith("Bound k:"):
                 matchbound = re.search(r"Bound k:(.*)", line)

benchexec/tools/forester.py

@@ -11,7 +11,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool):
-
     REQUIRED_PATHS = ["include", "libfa.so", "sv_comp_run.py"]
 
     def executable(self):

benchexec/tools/fusebmc.py

@@ -30,7 +30,6 @@ def name(self):
         return "FuSeBMC"
 
     def cmdline(self, executable, options, task, rlimits):
-
         if task.property_file:
             options = options + ["-p", task.property_file]
         else:

benchexec/tools/hiptnt.py

@@ -11,7 +11,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool):
-
     REQUIRED_PATHS = [
         "fixcalc",
         "hip",

benchexec/tools/lctd.py

@@ -11,7 +11,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool):
-
     REQUIRED_PATHS = [
         "bin",
         "include",

benchexec/tools/seahorn.py

@@ -17,7 +17,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool):
-
     REQUIRED_PATHS = ["bin", "include", "lib", "share"]
 
     def executable(self):

benchexec/tools/skink.py

@@ -12,7 +12,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool):
-
     REQUIRED_PATHS = [
         "bin",
         "lib",

benchexec/tools/smack.py

@@ -12,7 +12,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool2):
-
     REQUIRED_PATHS = [
         "bin",
         "lib",

benchexec/tools/smtlib2.py

@@ -16,7 +16,6 @@ class Smtlib2Tool(benchexec.tools.template.BaseTool):
     """
 
     def determine_result(self, returncode, returnsignal, output, isTimeout):
-
         if returnsignal == 0 and returncode == 0:
             status = None
             for line in output:

benchexec/tools/ultimate.py

@@ -70,7 +70,7 @@ def executable(self, tool_locator):
         exe = tool_locator.find_executable("Ultimate.py")
         dir_name = os.path.dirname(exe)
         logging.debug("Looking in %s for Ultimate and plugins/", dir_name)
-        for (_, dir_names, file_names) in os.walk(dir_name):
+        for _, dir_names, file_names in os.walk(dir_name):
             if "Ultimate" in file_names and "plugins" in dir_names:
                 return exe
             break

benchexec/tools/viap.py

@@ -11,7 +11,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool):
-
     REQUIRED_PATHS = [
         "viap_tool.py",
         "viap_svcomp.py",

benchexec/tools/wasp-c.py

@@ -26,7 +26,6 @@ def name(self):
         return "WASP-C"
 
     def cmdline(self, executable, options, task, rlimits):
-
         if task.property_file:
             options = options + ["--property", task.property_file]
         else:

benchexec/tools/yogar-cbmc-parallel.py

@@ -11,7 +11,6 @@
 
 
 class Tool(yogar_cbmc.Tool):
-
     REQUIRED_PATHS = ["yogar-cbmc"]
 
     def executable(self):

benchexec/tools/yogar-cbmc.py

@@ -25,7 +25,6 @@ def cmdline(self, executable, options, tasks, propertyfile, rlimits):
         return [executable] + options + tasks
 
     def determine_result(self, returncode, returnsignal, output, isTimeout):
-
         status = result.RESULT_UNKNOWN
         stroutput = str(output)
 

benchexec/util.py

@@ -295,7 +295,7 @@ def substitute_vars(template, replacements):
     @param replacements: a dict or a list of pairs of keys and values
     """
     result = template
-    for (key, value) in replacements:
+    for key, value in replacements:
         result = result.replace("${" + key + "}", value)
     if "${" in result:
         logging.warning("A variable was not replaced in '%s'.", result)

contrib/aws/awsexecutor.py

@@ -416,7 +416,6 @@ def getBenchmarkData(benchmark):
 
 
 def getToolData(benchmark):
-
     working_dir = benchmark.working_directory()
     if not os.path.isdir(working_dir):
         raise BenchExecException(
@@ -445,7 +444,6 @@ def bytes_to_mb(mb):
 
 
 def handleCloudResults(benchmark, output_handler, start_time, end_time):
-
     output_dir = benchmark.log_folder
     if not os.path.isdir(output_dir) or not os.listdir(output_dir):
         # output_dir does not exist or is empty

contrib/p4/p4-test-tool.py

@@ -9,7 +9,6 @@
 
 
 class Tool(benchexec.tools.template.BaseTool2):
-
     # Needed for benchexec to run, but irrelevant for p4 extension
     def executable(self, tool):
         return "/"

contrib/p4/p4execution.py

@@ -215,7 +215,6 @@ def execute_benchmark(self, benchmark, output_handler):
 
             # Check for table output file
             if os.path.exists(switch_command_output):
-
                 copyfile(switch_command_output, switch_command_output_new)
             else:
                 logging.info("No tables was loaded for switch: %s, {switch.name}")
@@ -304,7 +303,6 @@ def execute_benchmark(self, benchmark, output_handler):
         self.close()
 
     def _execute_benchmark(self, run, command):
-
         return self.ptf_tester.exec_run(command, tty=True)
 
     def setup_network(self):
@@ -506,7 +504,6 @@ def get_system_info(self):
         return systeminfo.SystemInfo()
 
     def read_folder_paths(self, benchmark):
-
         switch_folder = ""
         ptf_folder = ""
         network_config = ""