54528: completion option updates and minor cleanups

3 files changed, 50 insertions, 7 deletions

diff --git a/Completion/Linux/Command/_selinux b/Completion/Linux/Command/_selinux
index da2c4e5ee..1b2c25468 100644
--- a/Completion/Linux/Command/_selinux
+++ b/Completion/Linux/Command/_selinux
@@ -148,6 +148,7 @@ case $service in
       '(-o --output -M --module-package)'{-o+,--output=}'[append output to file]:file:_files'
       '(-D --dontaudit)'{-D,--dontaudit}'[generate policy with dontaudit rules]'
       '(-R --reference)'{-R,--reference}'[use installed macros in generated policy]'
+      '(-C --cil)'{-C,--cil}'[generate CIL output]'
       '!(-R --reference -N --noreference)'{-N,--noreference}
       '(-v --verbose)'{-v,--verbose}'[explain generated output]'
       '(-e --explain)'{-e,--explain}'[fully explain generated output]'
@@ -196,7 +197,7 @@ case $service in
     args+=(
       "${ign}(-)"{-V,--version}'[show policy versions created by this program]'
       '-m[build a policy module instead of a base module]'
-      '-c+[build a policy module targeting a modular policy version]:version (4-21)'
+      '-c+[build a policy module targeting a modular policy version]:version (4-22)'
     )
   ;;
 
diff --git a/Completion/Linux/Command/_strace b/Completion/Linux/Command/_strace
index 37e14b6d6..6f42c4ae0 100644
--- a/Completion/Linux/Command/_strace
+++ b/Completion/Linux/Command/_strace
@@ -24,7 +24,9 @@ _arguments -C -s \
   '(-z -Z --successful-only --failed-only)'{-Z,--failed-only}'[trace only system calls that return an error]' \
   '(-a --columns)'{-a+,--columns=}'[align return values in a specific column]:column number [40]' \
   '(-i --instruction-pointer -c --summary-only)'{-i,--instruction-pointer}'[print instruction pointer at time of syscall]' \
-  '(-c --summary-only -k --stack-traces)'{-k,--stack-traces}'[obtain stack trace between each syscall]' \
+  '(-c --summary-only)*-k[obtain stack trace between each syscall]' \
+  '(-c --summary-only -k)--stack-trace=-[obtain stack trace between each syscall]::symbol' \
+  '(-c --summary-only)--stack-trace-frame-limit=[specify limit on stack trace frames to print]:frames [256]' \
   '(-n --syscall-number)'{-n,--syscall-number}'[print syscall number]' \
   '(-o --output)'{-o+,--output=}'[send trace output to the specified file]:output file:->file-pipe' \
   '(-A --output-append-mode)'{-A,--output-append-mode}'[open the file provided with the -o option in append mode]' \
@@ -51,11 +53,12 @@ _arguments -C -s \
   '(-X --const-print-style)'{-X+,--const-print-style=}'[set the format for printing of named constants and flags]:format:(raw abbrev verbose)' \
   '(-c --summary-only -yy --decode-fds)-y[print paths associated with file descriptor arguments]' \
   '(-c --summary-only -y --decode-fds)-yy[print protocol specific information associated with socket file descriptors]' \
-  '(-c --summary-only -y -yy)--decode-fds=-[print information associated with file descriptors]::information [none]:_sequence compadd - none all path socket dev pidfd signalfd' \
+  '(-c --summary-only -y -yy)--decode-fds=-[print information associated with file descriptors]::information [none]:_sequence compadd - none all path socket dev eventfd pidfd signalfd' \
   '(-c --summary-only -Y)--decode-pids=[print information associated with process IDs]:information [none]:_sequence compadd - none comm pidns' \
   '!(-c --summary-only -Y --decode-pids)--pidns-translation' \
   '(-c --summary-only --decode-pids)-Y[print command names for PIDs]' \
-  '(-c --summary-only -C --summary -i --instruction-pointer -k --stack-traces -r --relative-timestamps -ff -t -tt -ttt --absolute-timestamps -T --syscall-times -y -yy --decode-fds)'{-c,--summary-only}'[count time, calls, and errors for each system call and report a summary]' \
+  '--always-show-pid' \
+  '(-c --summary-only -C --summary -i --instruction-pointer -k --stack-trace --stack-trace-frame-limit -r --relative-timestamps -ff -t -tt -ttt --absolute-timestamps -T --syscall-times -y -yy --decode-fds)'{-c,--summary-only}'[count time, calls, and errors for each system call and report a summary]' \
   '(-c --summary-only -C --summary)'{-C,--summary}'[count time, calls, and errors for each system call and report a summary in addition to regular output]' \
   '(-O --summary-syscall-overhead)'{-O+,--summary-syscall-overhead=}'[specify overhead for tracing system calls]:overhead (microseconds)' \
   '(-S --summary-sort-by)'{-S+,--summary-sort-by=}'[sort the output of the histogram (-c option) by the specified criterion]:sort criterion [time]:(time min-time max-time avg-time calls errors name nothing)' \
@@ -66,6 +69,11 @@ _arguments -C -s \
   '(-d --debug)'{-d,--debug}'[show debug output of strace itself on standard error]' \
   '(- 1 *)'{-h,--help}'[display help information]' \
   '--seccomp-bpf[enable seccomp-bpf filtering]' \
+  '--secontext=[print SELinux contexts]: : _values -s, format
+    "(none mismatch full)all[equivalent to full,mismatch]"
+    "(all none)full[print the full context instead of the type only]"
+    "(all none)mismatch[print expected context when actual is not matching]"
+    "(all none mismatch full)none[equivalent to not specifying the option at all]"' \
   '--tips=-[show strace tips, tricks, and tweaks before exit]:tip [id\:random,format\:compact]' \
   '(- 1 *)'{-V,--version}'[display version information]' \
   '(-):command name: _command_names -e' \
@@ -87,7 +95,8 @@ case $state in
       'status[trace system calls with given return status]:status:->status' \
       'quiet[suppress various information messages]:message [none]:_sequence compadd - none attach exit path-resolution personality thread-execve superseded' \
       'kvm[print the exit reason of kvm vcpu]: :(vcpu)' \
-      'decode-fds[print information associated with file descriptors]:information [none]:_sequence compadd - none all path socket dev pidfd signalfd' \
+      'decode-fds[print information associated with file descriptors]:information [none]:_sequence compadd - none all path socket dev eventfd pidfd signalfd' \
+      'secontext' \
       'decode-pids[print information associated with process IDs]:information [none]:_sequence compadd - none comm pidns' && ret=0
     if [[ $state = status ]]; then
       _values -s , 'return status [all]' \
diff --git a/Completion/Linux/Command/_valgrind b/Completion/Linux/Command/_valgrind
index 6bf0e4450..47fced1fd 100644
--- a/Completion/Linux/Command/_valgrind
+++ b/Completion/Linux/Command/_valgrind
@@ -2,7 +2,7 @@
 
 local curcontext="$curcontext" state line
 local -a cmd common_{own_malloc,read_varinfo,report_errors,partial}
-local -a args args_{addrcheck,drd,memcheck,cachegrind,helgrind,lackey,massif,none,exp_{bbv,dhat,sgcheck}}
+local -a args args_{{addr,mem}check,drd,{cache,call,hel}grind,lackey,massif,none,exp_{bbv,dhat,sgcheck}}
 
 cmd=(
   '1: : _command_names -e'
@@ -127,6 +127,38 @@ args_cachegrind=(
   '--cachegrind-out-file=-[specify output file name]:file name [cachegrind.out.%%p]:_files'
 )
 
+args_callgrind=(
+  '--callgrind-out-file=-[specify output file name]:file name [callgrind.out.%%p]:_files'
+  '--dump-line=-[perform event counting at source line granularity]:enable [yes]:(yes no)'
+  '--dump-instr=-[perform event counting at instruction granularity]:enable [no]:(yes no)'
+  '--compress-strings=-[identify file and function names by numbers]:enable [yes]:(yes no)'
+  '--compress-pos=-[compress positions in profile dump]:enable [yes]:(yes no)'
+  '--compress-dumps=-[concatenate all dumps into same file]:enable [no]:(yes no)'
+  '--dump-every-bb=-[specify dump period in basic blocks]:blocks [0, never]'
+  '*--dump-before=-[dump when entering specified function]:function'
+  '*--zero-before=-[zero all costs when entering specified function]:function'
+  '*--dump-after=-[dump when leaving specified function]:function'
+  '--instr-atstart=-[do instrumentation at callgrind start]:enable [yes]:(yes no)'
+  '--collect-atstart=-[collect at process/thread start]:enable [yes]:(yes no)'
+  '*--toggle-collect=-[toggle collection on enter/leave specified function]:function'
+  '--collect-jumps=-[collect jumps]:enable [no]:(yes no)'
+  '--collect-bus=-[collect global bus events]:enable [no]:(yes no)'
+  '--collect-systime=-[collect system call time info]:enable [no]:(no yes msec usec nsec)'
+  '--separate-threads=-[separate data per thread]:enable [no]:(yes no)'
+  '--separate-callers=-[separate functions by call chain length]:length [0]'
+  '--separate-recs=-[separate function recursions up to level]:level [2]'
+  '--skip-plt=-[ignore calls to/from PLT sections]:enable [yes]:(yes no)'
+  '--skip-direct-rec=-[ignore direct recursio]:enable [yes]:(yes no)'
+  '*--fn-skip=-[ignore calls to/from specified function]:function'
+  '--branch-sim=-[collect branch prediction stats]:enable [no]:(yes no)'
+  '--cache-sim=-[collect cache stats]:enable [no]:(yes no)'
+  '--simulate-wb=-[count write-back events]:enable [no]:(yes no)'
+  '--simulate-hwpref=-[simulate hardware prefetch]:enable [no]:(yes no)'
+  '--cacheuse=-[collect cache block use]:enable [no]:(yes no)'
+  '--I1=-[set I1 cache manually]:size,assoc,line_size'
+  '--D1=-[set D1 cache manually]:size,assoc,line_size'
+)
+
 args_helgrind=(
   $common_own_malloc
   $common_read_varinfo
@@ -217,7 +249,8 @@ _arguments -C ${(P)args} $cmd \
   '--vgdb=-[activate gdbserver]:enable [yes]:(yes no full)' \
   '--vgdb-error=-[invoke gdbserver after specified number of errors]:errors [999999999]:errors' \
   '--vgdb-stop-at=-[invoke gdbserver for given events]:event:_sequence compadd - startup exit abexit valgrindabexit all none' \
-  '--track-fds=-[track open file descriptors]:enable [no]:(yes no all)' \
+  '--track-fds=-[track open file descriptors]:enable [no]:(yes no all bad)' \
+  '--modify-fds=-[modify newly open file descriptors]:enable:(yes no high)' \
   '--time-stamp=-[add timestamps to log messages]:enable:(yes no)' \
   '--log-fd=-[log messages to specified file descriptor]:file descriptor:_file_descriptors' \
   '--log-file=-[log messages to specified file with pid appended]:file:_files' \