Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

file based filter #99

Open
wants to merge 45 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
c13cf11
file based filter
xinzhengzhang Dec 23, 2022
0ea3fd6
Unify --file parsing logic
cpsauer Dec 24, 2022
4244747
file based filter: deal with header lib
xinzhengzhang Mar 18, 2023
0befc09
End loop if header is found & Add max attempts limit
xinzhengzhang Mar 3, 2023
92e83c1
Improve my language for --file docstring
cpsauer Mar 18, 2023
bf0405e
rm dupe itertools import
cpsauer Mar 18, 2023
9d7f9ab
use variable above
xinzhengzhang Mar 27, 2023
9903410
check file if resolved in a smaller scope
xinzhengzhang Mar 27, 2023
d7e1e31
Improve --file editor wrapper message
cpsauer Apr 24, 2023
d6f60cb
Fix no output error message and spacing.
cpsauer Apr 24, 2023
2b69f05
Fix small old typo
cpsauer May 2, 2023
242d601
Prevent template substitution in comment
cpsauer May 2, 2023
e17428f
ws
cpsauer May 2, 2023
5be98b1
Further improve --file editor wrapper message
cpsauer May 2, 2023
2e980ab
Alphabetize threading import
cpsauer May 2, 2023
8d5f2fe
Document interaction of --file and exclude_* template arguments
cpsauer May 2, 2023
e288d49
Entangled cleanups around thread structure
cpsauer May 2, 2023
4a251e5
Reduce unnecessary work with in header finding with --file flag
cpsauer May 2, 2023
0d86038
improve comments in _get_command
cpsauer May 2, 2023
da95ea6
Mark problems, fix typos, fix depleted iterator bug
cpsauer May 2, 2023
2a10207
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 2, 2023
f4fa941
Fix aquery inputs() statement not working for headers
cpsauer May 3, 2023
2e10a53
Add a few more WIP notes
cpsauer May 3, 2023
0851bca
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 3, 2023
0f120b6
Fix typo
cpsauer May 3, 2023
9d23866
Add note about allpaths issue
cpsauer May 3, 2023
2d09c75
Refine and note discussion points in _filter_through_headers
cpsauer May 4, 2023
0722615
Improve TODOs
cpsauer May 4, 2023
14e707e
Enrich todos and notes after another read through of the bazel [ac]qu…
cpsauer May 4, 2023
bd7bde1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 4, 2023
89f583a
refresh.template.py: Estimate the number of actions that can be run b…
xinzhengzhang May 5, 2023
ef33509
refresh.template.py: quoting target_statement
xinzhengzhang May 5, 2023
f8b046e
refersh.template.py: running a preliminary query to get specified fi…
xinzhengzhang May 5, 2023
9ce1716
refresh.template.py: simplify/unify logic around target_statement_can…
xinzhengzhang May 5, 2023
40b9131
refresh.template.py: changed the _convert_compile_commands to return …
xinzhengzhang May 5, 2023
6a6777a
normalize file path if the --file is a subpath of the cwd
xinzhengzhang May 5, 2023
0453be4
refresh.template.py: for --file, don't continue traversing targets af…
xinzhengzhang May 5, 2023
97644fd
Revert "refresh.template.py: for --file, don't continue traversing ta…
xinzhengzhang May 6, 2023
e8a986b
Revert "normalize file path if the --file is a subpath of the cwd"
xinzhengzhang May 6, 2023
e67c0bd
Revert "refresh.template.py: changed the _convert_compile_commands to…
xinzhengzhang May 6, 2023
b785c3e
Revert "refresh.template.py: simplify/unify logic around target_state…
xinzhengzhang May 6, 2023
a152055
Revert "refersh.template.py: running a preliminary query to get spec…
xinzhengzhang May 6, 2023
1d8f62e
Revert "refresh.template.py: quoting target_statement"
xinzhengzhang May 6, 2023
33b2310
Revert "refresh.template.py: Estimate the number of actions that can …
xinzhengzhang May 6, 2023
84822ba
Add link to deduped aspects cquery/aquery aspects issue
cpsauer May 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
End loop if header is found & Add max attempts limit
  • Loading branch information
xinzhengzhang committed Mar 18, 2023
commit 0befc0907e28860649ca485806573d4c5ccf8139
37 changes: 29 additions & 8 deletions refresh.template.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
import time
import types
import typing # MIN_PY=3.9: Switch e.g. typing.List[str] -> list[str]
import threading
import itertools


@enum.unique
Expand Down Expand Up @@ -182,6 +184,7 @@ def _get_cached_adjusted_modified_time(path: str):
# Roughly 1 year into the future. This is safely below bazel's 10 year margin, but large enough that no sane normal file should be past this.
BAZEL_INTERNAL_SOURCE_CUTOFF = time.time() + 60*60*24*365

BAZEL_INTERNAL_MAX_HEADER_SEARCH_COUNT = 500

def _get_headers_gcc(compile_args: typing.List[str], source_path: str, action_key: str):
"""Gets the headers used by a particular compile command that uses gcc arguments formatting (including clang.)
Expand Down Expand Up @@ -766,22 +769,28 @@ def _all_platform_patch(compile_args: typing.List[str]):
return compile_args


def _get_cpp_command_for_files(compile_action):
def _get_cpp_command_for_files(args):
"""Reformat compile_action into a compile command clangd can understand.

Undo Bazel-isms and figures out which files clangd should apply the command to.
"""
(compile_action, event, should_stop_lambda) = args
if event.is_set():
return set(), set(), []

# Patch command by platform
compile_action.arguments = _all_platform_patch(compile_action.arguments)
compile_action.arguments = _apple_platform_patch(compile_action.arguments)
# Android and Linux and grailbio LLVM toolchains: Fine as is; no special patching needed.

source_files, header_files = _get_files(compile_action)

if not event.is_set() and should_stop_lambda(source_files, header_files):
event.set()
return source_files, header_files, compile_action.arguments


def _convert_compile_commands(aquery_output):
def _convert_compile_commands(aquery_output, should_stop_lambda):
"""Converts from Bazel's aquery format to de-Bazeled compile_commands.json entries.

Input: jsonproto output from aquery, pre-filtered to (Objective-)C(++) compile actions for a given build.
Expand All @@ -805,8 +814,8 @@ def _convert_compile_commands(aquery_output):
with concurrent.futures.ThreadPoolExecutor(
max_workers=min(32, (os.cpu_count() or 1) + 4) # Backport. Default in MIN_PY=3.8. See "using very large resources implicitly on many-core machines" in https://docs.python.org/3/library/concurrent.futures.html#concurrent.futures.ThreadPoolExecutor
) as threadpool:
outputs = threadpool.map(_get_cpp_command_for_files, aquery_output.actions)

event = threading.Event()
outputs = threadpool.map(_get_cpp_command_for_files, map(lambda action: (action, event, should_stop_lambda), aquery_output.actions))
# Yield as compile_commands.json entries
header_files_already_written = set()
for source_files, header_files, compile_command_args in outputs:
Expand All @@ -833,7 +842,19 @@ def _convert_compile_commands(aquery_output):

def _get_commands(target: str, flags: str):
"""Return compile_commands.json entries for a given target and flags, gracefully tolerating errors."""
def _get_commands(target_statment):
lock = threading.RLock()
counter = itertools.count()
def _should_stop(headers, file_path):
if file_path:
with lock:
tried_count = next(counter)
if tried_count >= BAZEL_INTERNAL_MAX_HEADER_SEARCH_COUNT:
log_warning(f""">>> Bazel lists no applicable compile commands for {file_path} in {target} under {tried_count} Attempt.""")
return True
return any(header.endswith(file_path) for header in headers)
return False

def _get_commands(target_statment, file_path):
aquery_args = [
'bazel',
'aquery',
Expand Down Expand Up @@ -899,7 +920,7 @@ def _get_commands(target_statment):
Continuing gracefully...""")
return []

return _convert_compile_commands(parsed_aquery_output)
return _convert_compile_commands(parsed_aquery_output, lambda _, headers: _should_stop(headers, file_path))

# Log clear completion messages
log_info(f">>> Analyzing commands used in {target}")
Expand Down Expand Up @@ -949,7 +970,7 @@ def _get_commands(target_statment):
])

for target_statment in target_statment_canidates:
compile_commands.extend( _get_commands(target_statment))
compile_commands.extend( _get_commands(target_statment, file_path))
if any(command['file'].endswith(file_path) for command in reversed(compile_commands)):
found = True
break
Expand All @@ -960,7 +981,7 @@ def _get_commands(target_statment):
if {exclude_external_sources}:
# For efficiency, have bazel filter out external targets (and therefore actions) before they even get turned into actions or serialized and sent to us. Note: this is a different mechanism than is used for excluding just external headers.
target_statment = f"filter('^(//|@//)',{target_statment})"
compile_commands.extend(_get_commands(target_statment))
compile_commands.extend(_get_commands(target_statment, None))
if len(compile_commands) == 0:
log_warning(f""">>> Bazel lists no applicable compile commands for {target}
If this is a header-only library, please instead specify a test or binary target that compiles it (search "header-only" in README.md).
Expand Down