zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include grep executable in prefix length

Browse Source 
Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>
This commit is contained in:
Todd Gamblin 2025-05-19 23:30:45 -07:00
parent 0b0cf998b4
commit 3ad328e877
No known key found for this signature in database
GPG Key ID: C16729F1AACF66C6
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/spack/spack/cmd/__init__.py
View File

@ -726,8 +726,8 @@ def group_arguments(
Arguments: Arguments:
args: list of arguments to split into groups args: list of arguments to split into groups
max_group_size: max number of elements in any group (default 500) max_group_size: max number of elements in any group (default 500)
prefix_length: length of any additional arguments to be passed before the groups from args; prefix_length: length of any additional arguments (including spaces) to be passed before
defaults to 0 characters. the groups from args; default is 0 characters
max_group_length: max length of characters that if a group of args is joined by " " max_group_length: max length of characters that if a group of args is joined by " "
On unix, ths defaults to SC_ARG_MAX from sysconf. On Windows the default is On unix, ths defaults to SC_ARG_MAX from sysconf. On Windows the default is
the max usable for CreateProcess (32,768 chars) the max usable for CreateProcess (32,768 chars)
@ -735,18 +735,22 @@ def group_arguments(
""" """
if max_group_length is None: if max_group_length is None:
max_group_length = 32768 # default to the Windows limit max_group_length = 32768 # default to the Windows limit
if hasattr(os, "sysconf"): if hasattr(os, "sysconf"): # sysconf is only on unix
# sysconf is only on unix and returns -1 if an option isn't present try:
sysconf_max = os.sysconf("SC_ARG_MAX") sysconf_max = os.sysconf("SC_ARG_MAX")
if sysconf_max != -1: if sysconf_max != -1: # returns -1 if an option isn't present
max_group_length = sysconf_max max_group_length = sysconf_max
except (ValueError, OSError):
pass # keep windows default if SC_ARG_MAX isn't in sysconf_names
group: List[str] = [] group: List[str] = []
grouplen, space = prefix_length, 0 grouplen, space = prefix_length, 0
for i, arg in enumerate(args): for arg in args:
arglen = len(arg) arglen = len(arg)
if arglen > max_group_length: if arglen > max_group_length:
raise ValueError(f"Argument is longer than the maximum command line size: '{arg}'") raise ValueError(f"Argument is longer than max command line size: '{arg}'")
if arglen + prefix_length > max_group_length:
raise ValueError(f"Argument with prefix is longer than max command line size: '{arg}'")
next_grouplen = grouplen + arglen + space next_grouplen = grouplen + arglen + space
if len(group) == max_group_size or next_grouplen > max_group_length: if len(group) == max_group_size or next_grouplen > max_group_length:

5
lib/spack/spack/cmd/pkg.py
View File

@ -185,8 +185,11 @@ def pkg_grep(args, unknown_args):
if not all_paths: if not all_paths:
return 0 # no packages to search return 0 # no packages to search
# these args start every command invocation (grep arg1 arg2 ...)
all_prefix_args = grep.exe + args.grep_args + unknown_args
prefix_length = sum(len(arg) for arg in all_prefix_args) + len(all_prefix_args)
# set up iterator and save the first group to ensure we don't end up with a group of size 1 # set up iterator and save the first group to ensure we don't end up with a group of size 1
prefix_length = len(" ".join(args.grep_args + unknown_args))
groups = spack.cmd.group_arguments(all_paths, prefix_length=prefix_length) groups = spack.cmd.group_arguments(all_paths, prefix_length=prefix_length)
# You can force GNU grep to show filenames on every line with -H, but not POSIX grep. # You can force GNU grep to show filenames on every line with -H, but not POSIX grep.