1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00

Merge pull request #20460 from yuwata/udevadm-test-builtin-introduce-action

udevadm: introduce --action option for test-builtin
This commit is contained in:
Yu Watanabe 2021-08-18 15:59:40 +09:00 committed by GitHub
commit 21ee8eda50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 102 additions and 45 deletions

View File

@ -619,6 +619,18 @@
for device <replaceable>DEVPATH</replaceable>, and print debug
output.</para>
<variablelist>
<varlistentry>
<term><option>-a</option></term>
<term><option>--action=<replaceable>ACTION</replaceable></option></term>
<listitem>
<para>Type of event to be simulated. Possible actions are <literal>add</literal>,
<literal>remove</literal>, <literal>change</literal>, <literal>move</literal>,
<literal>online</literal>, <literal>offline</literal>, <literal>bind</literal>,
and <literal>unbind</literal>. Also, the special value <literal>help</literal> can be used
to list the possible actions. The default value is <literal>add</literal>.</para>
</listitem>
</varlistentry>
<xi:include href="standard-options.xml" xpointer="help" />
</variablelist>
</refsect2>

View File

@ -61,6 +61,7 @@ _udevadm() {
[MONITOR_STANDALONE]='-k --kernel -u --udev -p --property'
[MONITOR_ARG]='-s --subsystem-match -t --tag-match'
[TEST]='-a --action -N --resolve-names'
[TEST_BUILTIN]='-a --action'
)
local verbs=(info trigger settle control monitor test-builtin test)
@ -215,6 +216,16 @@ _udevadm() {
;;
'test-builtin')
if __contains_word "$prev" ${OPTS[TEST_BUILTIN]}; then
case $prev in
-a|--action)
comps=$( udevadm test-builtin --action help )
;;
esac
COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
return 0
fi
for ((i=0; i < COMP_CWORD; i++)); do
if __contains_word "${COMP_WORDS[i]}" "${builtins[@]}"; then
builtin=${COMP_WORDS[i]}
@ -225,7 +236,7 @@ _udevadm() {
if [[ -z $builtin ]]; then
comps="${builtins[@]}"
elif [[ $cur = -* ]]; then
comps="${OPTS[COMMON]}"
comps="${OPTS[COMMON]} ${OPTS[TEST_BUILTIN]}"
else
comps=$( __get_all_sysdevs )
local IFS=$'\n'

View File

@ -23,7 +23,7 @@ _udevadm_trigger(){
'--dry-run[Do not actually trigger the event.]' \
'--quiet[Suppress error logging in triggering events.]' \
'--type=[Trigger a specific type of devices.]:types:(devices subsystems failed)' \
'--action=[Type of event to be triggered.]:actions:(add change remove)' \
'--action=[Type of event to be triggered.]:actions:(add change remove move online offline bind unbind)' \
'--subsystem-match=[Trigger events for devices which belong to a matching subsystem.]' \
'--subsystem-nomatch=[Do not trigger events for devices which belong to a matching subsystem.]' \
'--attr-match=attribute=[Trigger events for devices with a matching sysfs attribute.]' \
@ -74,7 +74,7 @@ _udevadm_monitor(){
(( $+functions[_udevadm_test] )) ||
_udevadm_test(){
_arguments \
'--action=[The action string.]:actions:(add change remove)' \
'--action=[The action string.]:actions:(add change remove move online offline bind unbind)' \
'--subsystem=[The subsystem string.]' \
'--help[Print help text.]' \
'*::devpath:_files -P /sys/ -W /sys'
@ -84,14 +84,17 @@ _udevadm_test(){
_udevadm_test-builtin(){
if (( CURRENT == 2 )); then
_arguments \
'--action=[The action string.]:actions:(add change remove move online offline bind unbind)' \
'--help[Print help text]' \
'*::builtins:(blkid btrfs hwdb input_id net_id net_setup_link kmod path_id usb_id uaccess)'
elif (( CURRENT == 3 )); then
_arguments \
'--action=[The action string.]:actions:(add change remove move online offline bind unbind)' \
'--help[Print help text]' \
'*::syspath:_files -P /sys -W /sys'
else
_arguments \
'--action=[The action string.]:actions:(add change remove move online offline bind unbind)' \
'--help[Print help text]'
fi
}

View File

@ -11,6 +11,7 @@
#include "udevadm.h"
#include "udevadm-util.h"
static sd_device_action_t arg_action = SD_DEVICE_ADD;
static const char *arg_command = NULL;
static const char *arg_syspath = NULL;
@ -19,6 +20,7 @@ static int help(void) {
"Test a built-in command.\n\n"
" -h --help Print this message\n"
" -V --version Print version of the program\n\n"
" -a --action=ACTION|help Set action string\n"
"Commands:\n",
program_invocation_short_name);
@ -29,15 +31,23 @@ static int help(void) {
static int parse_argv(int argc, char *argv[]) {
static const struct option options[] = {
{ "action", required_argument, NULL, 'a' },
{ "version", no_argument, NULL, 'V' },
{ "help", no_argument, NULL, 'h' },
{}
};
int c;
int r, c;
while ((c = getopt_long(argc, argv, "Vh", options, NULL)) >= 0)
while ((c = getopt_long(argc, argv, "a:Vh", options, NULL)) >= 0)
switch (c) {
case 'a':
r = parse_device_action(optarg, &arg_action);
if (r < 0)
return log_error_errno(r, "Invalid action '%s'", optarg);
if (r == 0)
return 0;
break;
case 'V':
return print_version();
case 'h':
@ -81,7 +91,7 @@ int builtin_main(int argc, char *argv[], void *userdata) {
goto finish;
}
r = find_device(arg_syspath, "/sys", &dev);
r = find_device_with_action(arg_syspath, arg_action, &dev);
if (r < 0) {
log_error_errno(r, "Failed to open device '%s': %m", arg_syspath);
goto finish;

View File

@ -21,11 +21,12 @@
#include "strxcpyx.h"
#include "udev-builtin.h"
#include "udev-event.h"
#include "udevadm-util.h"
#include "udevadm.h"
static const char *arg_action = "add";
static sd_device_action_t arg_action = SD_DEVICE_ADD;
static ResolveNameTiming arg_resolve_name_timing = RESOLVE_NAME_EARLY;
static char arg_syspath[UDEV_PATH_SIZE] = {};
static const char *arg_syspath = NULL;
static int help(void) {
@ -49,25 +50,17 @@ static int parse_argv(int argc, char *argv[]) {
{}
};
int c;
int r, c;
while ((c = getopt_long(argc, argv, "a:N:Vh", options, NULL)) >= 0)
switch (c) {
case 'a': {
sd_device_action_t a;
if (streq(optarg, "help")) {
dump_device_action_table();
case 'a':
r = parse_device_action(optarg, &arg_action);
if (r < 0)
return log_error_errno(r, "Invalid action '%s'", optarg);
if (r == 0)
return 0;
}
a = device_action_from_string(optarg);
if (a < 0)
return log_error_errno(a, "Invalid action '%s'", optarg);
arg_action = device_action_to_string(a);
break;
}
case 'N':
arg_resolve_name_timing = resolve_name_timing_from_string(optarg);
if (arg_resolve_name_timing < 0)
@ -84,15 +77,9 @@ static int parse_argv(int argc, char *argv[]) {
assert_not_reached();
}
if (!argv[optind])
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"syspath parameter missing.");
/* add /sys if needed */
if (!path_startswith(argv[optind], "/sys"))
strscpyl(arg_syspath, sizeof(arg_syspath), "/sys", argv[optind], NULL);
else
strscpy(arg_syspath, sizeof(arg_syspath), argv[optind]);
arg_syspath = argv[optind];
if (!arg_syspath)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "syspath parameter missing.");
return 1;
}
@ -127,7 +114,7 @@ int test_main(int argc, char *argv[], void *userdata) {
goto out;
}
r = device_new_from_synthetic_event(&dev, arg_syspath, arg_action);
r = find_device_with_action(arg_syspath, arg_action, &dev);
if (r < 0) {
log_error_errno(r, "Failed to open device '%s': %m", arg_syspath);
goto out;

View File

@ -312,17 +312,13 @@ int trigger_main(int argc, char *argv[], void *userdata) {
else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown type --type=%s", optarg);
break;
case 'c': {
if (streq(optarg, "help")) {
dump_device_action_table();
case 'c':
r = parse_device_action(optarg, &action);
if (r < 0)
return log_error_errno(r, "Unknown action '%s'", optarg);
if (r == 0)
return 0;
}
action = device_action_from_string(optarg);
if (action < 0)
return log_error_errno(action, "Unknown action '%s'", optarg);
break;
}
case 's':
r = sd_device_enumerator_add_match_subsystem(e, optarg, true);
if (r < 0)

View File

@ -93,3 +93,39 @@ int find_device(const char *id, const char *prefix, sd_device **ret) {
return find_device_from_path(id, ret);
}
int find_device_with_action(const char *id, sd_device_action_t action, sd_device **ret) {
_cleanup_free_ char *path = NULL;
assert(id);
assert(ret);
assert(action >= 0 && action < _SD_DEVICE_ACTION_MAX);
if (!path_startswith(id, "/sys")) {
path = path_join("/sys", id);
if (!path)
return -ENOMEM;
id = path;
}
return device_new_from_synthetic_event(ret, id, device_action_to_string(action));
}
int parse_device_action(const char *str, sd_device_action_t *action) {
sd_device_action_t a;
assert(str);
assert(action);
if (streq(str, "help")) {
dump_device_action_table();
return 0;
}
a = device_action_from_string(str);
if (a < 0)
return a;
*action = a;
return 1;
}

View File

@ -4,3 +4,5 @@
#include "sd-device.h"
int find_device(const char *id, const char *prefix, sd_device **ret);
int find_device_with_action(const char *id, sd_device_action_t action, sd_device **ret);
int parse_device_action(const char *str, sd_device_action_t *action);