Update the log timer to use context manager

Author: ahoppen

utils/swift_build_support/swift_build_support/build_script_invocation.py

@@ -13,7 +13,6 @@
 import os
 import pipes
 import platform
-import time
 
 from build_swift.build_swift import argparse
 from build_swift.build_swift.constants import BUILD_SCRIPT_IMPL_PATH
@@ -36,7 +35,7 @@
 from swift_build_support.swift_build_support.utils \
     import exit_rejecting_arguments
 from swift_build_support.swift_build_support.utils import fatal_error
-from swift_build_support.swift_build_support.utils import log_time
+from swift_build_support.swift_build_support.utils import log_time_in_scope
 
 
 class BuildScriptInvocation(object):
@@ -781,13 +780,11 @@ def _execute_merged_host_lipo_core_action(self):
         self._execute_action("merged-hosts-lipo-core")
 
     def _execute_action(self, action_name):
-        log_time('start', action_name)
-        t_start = time.time()
-        shell.call_without_sleeping(
-            [BUILD_SCRIPT_IMPL_PATH] + self.impl_args +
-            ["--only-execute", action_name],
-            env=self.impl_env, echo=self.args.verbose_build)
-        log_time('end', action_name, time.time() - t_start)
+        with log_time_in_scope(action_name):
+            shell.call_without_sleeping(
+                [BUILD_SCRIPT_IMPL_PATH] + self.impl_args +
+                ["--only-execute", action_name],
+                env=self.impl_env, echo=self.args.verbose_build)
 
     def execute_product_build_steps(self, product_class, host_target):
         product_source = product_class.product_source_name()
@@ -806,24 +803,18 @@ def execute_product_build_steps(self, product_class, host_target):
         if product.should_clean(host_target):
             log_message = "Cleaning %s" % product_name
             print("--- {} ---".format(log_message))
-            t_start = time.time()
-            log_time('start', log_message)
-            product.clean(host_target)
-            log_time('end', log_message, time.time() - t_start)
+            with log_time_in_scope(log_message):
+                product.clean(host_target)
         if product.should_build(host_target):
             log_message = "Building %s" % product_name
             print("--- {} ---".format(log_message))
-            t_start = time.time()
-            log_time('start', log_message, '0')
-            product.build(host_target)
-            log_time('end', log_message, time.time() - t_start)
+            with log_time_in_scope(log_message):
+                product.build(host_target)
         if product.should_test(host_target):
             log_message = "Running tests for %s" % product_name
             print("--- {} ---".format(log_message))
-            t_start = time.time()
-            log_time('start', log_message)
-            product.test(host_target)
-            log_time('end', log_message, time.time() - t_start)
+            with log_time_in_scope(log_message):
+                product.test(host_target)
             print("--- Finished tests for %s ---" % product_name)
         # Install the product if it should be installed specifically, or
         # if it should be built and `install_all` is set to True.
@@ -835,7 +826,5 @@ def execute_product_build_steps(self, product_class, host_target):
            not product.is_ignore_install_all_product()):
             log_message = "Installing %s" % product_name
             print("--- {} ---".format(log_message))
-            t_start = time.time()
-            log_time('start', log_message)
-            product.install(host_target)
-            log_time('end', log_message, time.time() - t_start)
+            with log_time_in_scope(log_message):
+                product.install(host_target)

utils/swift_build_support/swift_build_support/utils.py

@@ -10,9 +10,11 @@
 #
 # ===---------------------------------------------------------------------===#
 
+import contextlib
 import json
 import os
 import sys
+import time
 
 
 from build_swift.build_swift.constants import SWIFT_BUILD_ROOT
@@ -57,6 +59,16 @@ def log_time(event, command, duration=0):
     f.close()
 
 
+@contextlib.contextmanager
+def log_time_in_scope(action_name):
+    log_time('start', action_name)
+    t_start = time.time()
+    try:
+        yield
+    finally:
+        log_time('end', action_name, time.time() - t_start)
+
+
 def log_analyzer():
     """
     Analyze .build_script_log and provide a summary of the time execution.