From ccbfaa6901418363c2b79947b1ad1da33beeced3 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Thu, 10 Oct 2024 15:33:22 +0200 Subject: bootstrap traversing: for explicit trees, create closed directories ... by recursively copying and resolving sybolic links. In this way, references within a tree (e.g., #include "../Something.hpp") do not confuse the compiler, as opposed to directory symlinks. Neverthess, by doing this copying only for tree constructors, we still keep the overhead acceptable. --- bin/parallel-bootstrap-traverser.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bin/parallel-bootstrap-traverser.py') diff --git a/bin/parallel-bootstrap-traverser.py b/bin/parallel-bootstrap-traverser.py index 86f50e6b..a6c64643 100755 --- a/bin/parallel-bootstrap-traverser.py +++ b/bin/parallel-bootstrap-traverser.py @@ -17,6 +17,7 @@ import hashlib import json import multiprocessing import os +import shutil import subprocess import sys import threading @@ -254,6 +255,7 @@ def build_tree(desc: Json, *, config: Json, root: str, graph: Json, if state != AtomicListMap.Entry.INSERTED: # tree ready, run callback callback(tree_dir) return + tree_dir_tmp = tree_dir + ".tmp" tree_desc: Json = graph["trees"][tree_id] num_entries = AtomicInt(len(tree_desc.items())) @@ -261,7 +263,8 @@ def build_tree(desc: Json, *, config: Json, root: str, graph: Json, def run_callbacks() -> None: if num_entries.fetch_dec() <= 1: # correctly handle the empty tree - os.makedirs(tree_dir, exist_ok=True) + os.makedirs(tree_dir_tmp, exist_ok=True) + shutil.copytree(tree_dir_tmp, tree_dir) vals = g_CALLBACKS_PER_ID.fetch_clear(f"TREE/{tree_id}") if vals: for cb in vals: # mark ready @@ -274,7 +277,7 @@ def build_tree(desc: Json, *, config: Json, root: str, graph: Json, def create_link(location: str) -> Callable[..., None]: def do_link(path: str) -> None: - link(path, os.path.join(tree_dir, location)) + link(path, os.path.join(tree_dir_tmp, location)) run_callbacks() return do_link -- cgit v1.2.3