Remove unneeded Configuration class from shared.py. NFC (#16543)

I don't think this class was ever used to do anything useful.  This
change bascically just removes the extra class structure, but I have
followup to simplify even more.

This class was introduced in 8dc0e2b
but I'm not sure why since its doesn't actually remove any global
variables, only makes their initialization harder to read.  I think
perhaps that idea was to have less code at the top level, but functions
(rather than classes) work fine for that purpose.

Author: sbc100

embuilder.py

@@ -73,7 +73,7 @@
 
 PORTS = sorted(list(ports.ports_by_name.keys()) + list(PORT_VARIANTS.keys()))
 
-temp_files = shared.configuration.get_temp_files()
+temp_files = shared.get_temp_files()
 logger = logging.getLogger('embuilder')
 legacy_prefixes = {
   'libgl': 'libGL',

emcc.py

@@ -1046,7 +1046,7 @@ def run(args):
   # Strip args[0] (program name)
   args = args[1:]
 
-  misc_temp_files = shared.configuration.get_temp_files()
+  misc_temp_files = shared.get_temp_files()
 
   # Handle some global flags
 
@@ -3392,7 +3392,7 @@ def preprocess_wasm2js_script():
                                symbols_file=symbols_file,
                                symbols_file_js=symbols_file_js)
 
-    shared.configuration.get_temp_files().note(wasm2js)
+    shared.get_temp_files().note(wasm2js)
 
     if settings.WASM == 2:
       safe_copy(wasm2js, wasm2js_template)
@@ -3514,7 +3514,7 @@ def modularize():
   exports["%(EXPORT_NAME)s"] = %(EXPORT_NAME)s;
 ''' % {'EXPORT_NAME': settings.EXPORT_NAME})
 
-  shared.configuration.get_temp_files().note(final_js)
+  shared.get_temp_files().note(final_js)
   save_intermediate('modularized')
 
 
@@ -3534,7 +3534,7 @@ def module_export_name_substitution():
   if settings.MINIMAL_RUNTIME and not settings.MODULARIZE and (shared.target_environment_may_be('node') or shared.target_environment_may_be('shell')):
     src = 'if(typeof Module==="undefined"){var Module={};}\n' + src
   write_file(final_js, src)
-  shared.configuration.get_temp_files().note(final_js)
+  shared.get_temp_files().note(final_js)
   save_intermediate('module_export_name_substitution')
 
 

emscripten.py

@@ -171,7 +171,7 @@ def compile_settings():
   settings['LEGACY_SETTINGS'] = [l[0] for l in settings['LEGACY_SETTINGS']]
 
   # Save settings to a file to work around v8 issue 1579
-  with shared.configuration.get_temp_files().get_file('.json') as settings_file:
+  with shared.get_temp_files().get_file('.json') as settings_file:
     with open(settings_file, 'w') as s:
       json.dump(settings.dict(), s, sort_keys=True, indent=2)
 

tools/building.py

@@ -26,7 +26,7 @@
 from .shared import LLVM_NM, EMCC, EMAR, EMXX, EMRANLIB, WASM_LD, LLVM_AR
 from .shared import LLVM_LINK, LLVM_OBJCOPY
 from .shared import try_delete, run_process, check_call, exit_with_error
-from .shared import configuration, path_from_root
+from .shared import path_from_root
 from .shared import asmjs_mangle, DEBUG
 from .shared import TEMP_DIR
 from .shared import CANONICAL_TEMP_DIR, LLVM_DWARFDUMP, demangle_c_symbol_name
@@ -270,7 +270,7 @@ def link_llvm(linker_inputs, target):
 def lld_flags_for_executable(external_symbols):
   cmd = []
   if external_symbols:
-    undefs = configuration.get_temp_files().get('.undefined').name
+    undefs = shared.get_temp_files().get('.undefined').name
     utils.write_file(undefs, '\n'.join(external_symbols))
     cmd.append('--allow-undefined-file=%s' % undefs)
   else:
@@ -625,7 +625,7 @@ def acorn_optimizer(filename, passes, extra_info=None, return_output=False):
   optimizer = path_from_root('tools/acorn-optimizer.js')
   original_filename = filename
   if extra_info is not None:
-    temp_files = configuration.get_temp_files()
+    temp_files = shared.get_temp_files()
     temp = temp_files.get('.js').name
     shutil.copyfile(filename, temp)
     with open(temp, 'a') as f:
@@ -642,7 +642,7 @@ def acorn_optimizer(filename, passes, extra_info=None, return_output=False):
     cmd += ['verbose']
   if not return_output:
     next = original_filename + '.jso.js'
-    configuration.get_temp_files().note(next)
+    shared.get_temp_files().note(next)
     check_call(cmd, stdout=open(next, 'w'))
     save_intermediate(next, '%s.js' % passes[0])
     return next
@@ -802,7 +802,7 @@ def closure_compiler(filename, pretty, advanced=True, extra_closure_args=None):
   if settings.WASM_FUNCTION_EXPORTS and not settings.DECLARE_ASM_MODULE_EXPORTS:
     # Generate an exports file that records all the exported symbols from the wasm module.
     module_exports_suppressions = '\n'.join(['/**\n * @suppress {duplicate, undefinedVars}\n */\nvar %s;\n' % asmjs_mangle(i) for i in settings.WASM_FUNCTION_EXPORTS])
-    exports_file = configuration.get_temp_files().get('_module_exports.js')
+    exports_file = shared.get_temp_files().get('_module_exports.js')
     exports_file.write(module_exports_suppressions.encode())
     exports_file.close()
 
@@ -866,7 +866,7 @@ def run_closure_cmd(cmd, filename, env, pretty):
 
   # Closure compiler is unable to deal with path names that are not 7-bit ASCII:
   # https://github.com/google/closure-compiler/issues/3784
-  tempfiles = configuration.get_temp_files()
+  tempfiles = shared.get_temp_files()
 
   def move_to_safe_7bit_ascii_filename(filename):
     if isascii(filename):
@@ -987,7 +987,7 @@ def minify_wasm_js(js_file, wasm_file, expensive_optimizations, minify_whitespac
 # run binaryen's wasm-metadce to dce both js and wasm
 def metadce(js_file, wasm_file, minify_whitespace, debug_info):
   logger.debug('running meta-DCE')
-  temp_files = configuration.get_temp_files()
+  temp_files = shared.get_temp_files()
   # first, get the JS part of the graph
   if settings.MAIN_MODULE:
     # For the main module we include all exports as possible roots, not just function exports.
@@ -1176,7 +1176,7 @@ def wasm2js(js_file, wasm_file, opt_level, minify_whitespace, use_closure_compil
       wasm2js_js = wasm2js_js.replace('\n function $', '\nfunction $')
       wasm2js_js = wasm2js_js.replace('\n }', '\n}')
       wasm2js_js += '\n// EMSCRIPTEN_GENERATED_FUNCTIONS\n'
-      temp = configuration.get_temp_files().get('.js').name
+      temp = shared.get_temp_files().get('.js').name
       utils.write_file(temp, wasm2js_js)
       temp = js_optimizer(temp, passes)
       wasm2js_js = utils.read_file(temp)
@@ -1186,7 +1186,7 @@ def wasm2js(js_file, wasm_file, opt_level, minify_whitespace, use_closure_compil
   # TODO: in the non-closure case, we could run a lightweight general-
   #       purpose JS minifier here.
   if use_closure_compiler == 2:
-    temp = configuration.get_temp_files().get('.js').name
+    temp = shared.get_temp_files().get('.js').name
     with open(temp, 'a') as f:
       f.write(wasm2js_js)
     temp = closure_compiler(temp, pretty=not minify_whitespace, advanced=False)

tools/js_optimizer.py

@@ -19,8 +19,7 @@
 from tools.utils import path_from_root
 from tools import building, config, shared, utils
 
-configuration = shared.configuration
-temp_files = configuration.get_temp_files()
+temp_files = shared.get_temp_files()
 
 
 ACORN_OPTIMIZER = path_from_root('tools/acorn-optimizer.js')

tools/minimal_runtime_shell.py

@@ -191,7 +191,7 @@ def generate_minimal_runtime_html(target, options, js_target, target_basename):
   else:
     shell = shell.replace('{{{ DOWNLOAD_JS_AND_WASM_FILES }}}', generate_minimal_runtime_load_statement(target_basename))
 
-  temp_files = shared.configuration.get_temp_files()
+  temp_files = shared.get_temp_files()
   with temp_files.get_file(suffix='.js') as shell_temp:
     utils.write_file(shell_temp, shell)
     shell = shared.read_and_preprocess(shell_temp)

tools/response_file.py

@@ -60,7 +60,7 @@ def escape(arg):
   # Register the created .rsp file to be automatically cleaned up once this
   # process finishes, so that caller does not have to remember to do it.
   from . import shared
-  shared.configuration.get_temp_files().note(response_filename)
+  shared.get_temp_files().note(response_filename)
 
   return response_filename
 

tools/shared.py

@@ -114,7 +114,7 @@ def get_num_cores():
 
 
 def mp_run_process(command_tuple):
-  temp_files = configuration.get_temp_files()
+  temp_files = get_temp_files()
   cmd, env, route_stdout_to_temp_files_suffix, pipe_stdout, check, cwd = command_tuple
   std_out = temp_files.get(route_stdout_to_temp_files_suffix) if route_stdout_to_temp_files_suffix else (subprocess.PIPE if pipe_stdout else None)
   ret = std_out.name if route_stdout_to_temp_files_suffix else None
@@ -163,7 +163,7 @@ def run_multiple_processes(commands, env=os.environ.copy(), route_stdout_to_temp
   with ToolchainProfiler.profile_block('run_multiple_processes'):
     processes = []
     num_parallel_processes = get_num_cores()
-    temp_files = configuration.get_temp_files()
+    temp_files = get_temp_files()
     i = 0
     num_completed = 0
 
@@ -466,9 +466,9 @@ def replace_or_append_suffix(filename, new_suffix):
 # temp directory (TEMP_DIR/emscripten_temp).
 def get_emscripten_temp_dir():
   """Returns a path to EMSCRIPTEN_TEMP_DIR, creating one if it didn't exist."""
-  global configuration, EMSCRIPTEN_TEMP_DIR
+  global EMSCRIPTEN_TEMP_DIR
   if not EMSCRIPTEN_TEMP_DIR:
-    EMSCRIPTEN_TEMP_DIR = tempfile.mkdtemp(prefix='emscripten_temp_', dir=configuration.TEMP_DIR)
+    EMSCRIPTEN_TEMP_DIR = tempfile.mkdtemp(prefix='emscripten_temp_', dir=TEMP_DIR)
 
     if not DEBUG_SAVE:
       def prepare_to_clean_temp(d):
@@ -485,54 +485,47 @@ def get_canonical_temp_dir(temp_dir):
   return os.path.join(temp_dir, 'emscripten_temp')
 
 
-class Configuration:
-  def __init__(self):
-    self.EMSCRIPTEN_TEMP_DIR = None
-
-    self.TEMP_DIR = os.environ.get("EMCC_TEMP_DIR", tempfile.gettempdir())
-    if not os.path.isdir(self.TEMP_DIR):
-      exit_with_error(f'The temporary directory `{self.TEMP_DIR}` does not exist! Please make sure that the path is correct.')
-
-    self.CANONICAL_TEMP_DIR = get_canonical_temp_dir(self.TEMP_DIR)
-
-    if DEBUG:
-      self.EMSCRIPTEN_TEMP_DIR = self.CANONICAL_TEMP_DIR
-      try:
-        safe_ensure_dirs(self.EMSCRIPTEN_TEMP_DIR)
-      except Exception as e:
-        exit_with_error(str(e) + f'Could not create canonical temp dir. Check definition of TEMP_DIR in {config.EM_CONFIG}')
-
-      # Since the canonical temp directory is, by definition, the same
-      # between all processes that run in DEBUG mode we need to use a multi
-      # process lock to prevent more than one process from writing to it.
-      # This is because emcc assumes that it can use non-unique names inside
-      # the temp directory.
-      # Sadly we need to allow child processes to access this directory
-      # though, since emcc can recursively call itself when building
-      # libraries and ports.
-      if 'EM_HAVE_TEMP_DIR_LOCK' not in os.environ:
-        filelock_name = os.path.join(self.EMSCRIPTEN_TEMP_DIR, 'emscripten.lock')
-        lock = filelock.FileLock(filelock_name)
-        os.environ['EM_HAVE_TEMP_DIR_LOCK'] = '1'
-        lock.acquire()
-        atexit.register(lock.release)
-
-  def get_temp_files(self):
-    if DEBUG_SAVE:
-      # In debug mode store all temp files in the emscripten-specific temp dir
-      # and don't worry about cleaning them up.
-      return tempfiles.TempFiles(get_emscripten_temp_dir(), save_debug_files=True)
-    else:
-      # Otherwise use the system tempdir and try to clean up after ourselves.
-      return tempfiles.TempFiles(self.TEMP_DIR, save_debug_files=False)
+def setup_temp_dirs():
+  global EMSCRIPTEN_TEMP_DIR, CANONICAL_TEMP_DIR, TEMP_DIR
+  EMSCRIPTEN_TEMP_DIR = None
+
+  TEMP_DIR = os.environ.get("EMCC_TEMP_DIR", tempfile.gettempdir())
+  if not os.path.isdir(TEMP_DIR):
+    exit_with_error(f'The temporary directory `{TEMP_DIR}` does not exist! Please make sure that the path is correct.')
 
+  CANONICAL_TEMP_DIR = get_canonical_temp_dir(TEMP_DIR)
 
-def apply_configuration():
-  global configuration, EMSCRIPTEN_TEMP_DIR, CANONICAL_TEMP_DIR, TEMP_DIR
-  configuration = Configuration()
-  EMSCRIPTEN_TEMP_DIR = configuration.EMSCRIPTEN_TEMP_DIR
-  CANONICAL_TEMP_DIR = configuration.CANONICAL_TEMP_DIR
-  TEMP_DIR = configuration.TEMP_DIR
+  if DEBUG:
+    EMSCRIPTEN_TEMP_DIR = CANONICAL_TEMP_DIR
+    try:
+      safe_ensure_dirs(EMSCRIPTEN_TEMP_DIR)
+    except Exception as e:
+      exit_with_error(str(e) + f'Could not create canonical temp dir. Check definition of TEMP_DIR in {config.EM_CONFIG}')
+
+    # Since the canonical temp directory is, by definition, the same
+    # between all processes that run in DEBUG mode we need to use a multi
+    # process lock to prevent more than one process from writing to it.
+    # This is because emcc assumes that it can use non-unique names inside
+    # the temp directory.
+    # Sadly we need to allow child processes to access this directory
+    # though, since emcc can recursively call itself when building
+    # libraries and ports.
+    if 'EM_HAVE_TEMP_DIR_LOCK' not in os.environ:
+      filelock_name = os.path.join(EMSCRIPTEN_TEMP_DIR, 'emscripten.lock')
+      lock = filelock.FileLock(filelock_name)
+      os.environ['EM_HAVE_TEMP_DIR_LOCK'] = '1'
+      lock.acquire()
+      atexit.register(lock.release)
+
+
+def get_temp_files():
+  if DEBUG_SAVE:
+    # In debug mode store all temp files in the emscripten-specific temp dir
+    # and don't worry about cleaning them up.
+    return tempfiles.TempFiles(get_emscripten_temp_dir(), save_debug_files=True)
+  else:
+    # Otherwise use the system tempdir and try to clean up after ourselves.
+    return tempfiles.TempFiles(TEMP_DIR, save_debug_files=False)
 
 
 def target_environment_may_be(environment):
@@ -716,7 +709,7 @@ def get_llvm_target():
 EM_NM = bat_suffix(path_from_root('emnm'))
 FILE_PACKAGER = bat_suffix(path_from_root('tools/file_packager'))
 
-apply_configuration()
+setup_temp_dirs()
 
 Cache = cache.Cache(config.CACHE)