shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

Merge pull request #11478 from yuwata/enumerate-match-parent

Browse Source 
sd-device-enumerator: support multiple parents
This commit is contained in:
Lennart Poettering 2019-02-18 18:35:47 +01:00 committed by GitHub
commit 5f06ba8018
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
man/udevadm.xml
View File

@ -189,7 +189,7 @@
</title>
<para>Request device events from the kernel. Primarily used to replay events at system coldplug time.</para>
<para>Takes a device specification as a positional argument. See the description of <command>info</command>
<para>Takes device specifications as positional arguments. See the description of <command>info</command>
above.</para>
<variablelist>
@ -298,7 +298,7 @@
<term><option>--name-match=<replaceable>NAME</replaceable></option></term>
<listitem>
<para>Trigger events for devices with a matching device path. When this option is specified more than once,
the last <replaceable>NAME</replaceable> is used.</para>
then each matching result is ORed, that is, all specified devices are triggered.</para>
</listitem>
</varlistentry>
<varlistentry>
@ -306,7 +306,7 @@
<term><option>--parent-match=<replaceable>SYSPATH</replaceable></option></term>
<listitem>
<para>Trigger events for all children of a given device. When this option is specified more than once,
the last <replaceable>NAME</replaceable> is used.</para>
then each matching result is ORed, that is, all children of each specified device are triggered.</para>
</listitem>
</varlistentry>
<varlistentry>
@ -332,8 +332,8 @@
<xi:include href="standard-options.xml" xpointer="help" />
</variablelist>
<para>In addition, an optional positional argument can be used
to specify device name or sys path. It must start with
<para>In addition, optional positional arguments can be used
to specify device names or sys paths. They must start with
<filename>/dev</filename> or <filename>/sys</filename>
respectively.</para>
</refsect2>

1
src/libsystemd/sd-device/device-enumerator-private.h
View File

@ -7,6 +7,7 @@ int device_enumerator_scan_devices(sd_device_enumerator *enumeartor);
int device_enumerator_scan_subsystems(sd_device_enumerator *enumeartor);
int device_enumerator_add_device(sd_device_enumerator *enumerator, sd_device *device);
int device_enumerator_add_match_is_initialized(sd_device_enumerator *enumerator);
int device_enumerator_add_match_parent_incremental(sd_device_enumerator *enumerator, sd_device *parent);
sd_device *device_enumerator_get_first(sd_device_enumerator *enumerator);
sd_device *device_enumerator_get_next(sd_device_enumerator *enumerator);
sd_device **device_enumerator_get_devices(sd_device_enumerator *enumerator, size_t *ret_n_devices);

67
src/libsystemd/sd-device/device-enumerator.c
View File

@ -36,7 +36,7 @@ struct sd_device_enumerator {
Hashmap *match_property;
Set *match_sysname;
Set *match_tag;
sd_device *match_parent;
Set *match_parent;
bool match_allow_uninitialized;
};
@ -75,7 +75,7 @@ static sd_device_enumerator *device_enumerator_free(sd_device_enumerator *enumer
hashmap_free_free_free(enumerator->match_property);
set_free_free(enumerator->match_sysname);
set_free_free(enumerator->match_tag);
sd_device_unref(enumerator->match_parent);
set_free_free(enumerator->match_parent);
return mfree(enumerator);
}
@ -217,18 +217,42 @@ _public_ int sd_device_enumerator_add_match_tag(sd_device_enumerator *enumerator
return 0;
}
_public_ int sd_device_enumerator_add_match_parent(sd_device_enumerator *enumerator, sd_device *parent) {
static void device_enumerator_clear_match_parent(sd_device_enumerator *enumerator) {
if (!enumerator)
return;
set_clear_free(enumerator->match_parent);
}
int device_enumerator_add_match_parent_incremental(sd_device_enumerator *enumerator, sd_device *parent) {
const char *path;
int r;
assert_return(enumerator, -EINVAL);
assert_return(parent, -EINVAL);
sd_device_unref(enumerator->match_parent);
enumerator->match_parent = sd_device_ref(parent);
r = sd_device_get_syspath(parent, &path);
if (r < 0)
return r;
r = set_ensure_allocated(&enumerator->match_parent, NULL);
if (r < 0)
return r;
r = set_put_strdup(enumerator->match_parent, path);
if (r < 0)
return r;
enumerator->scan_uptodate = false;
return 0;
}
_public_ int sd_device_enumerator_add_match_parent(sd_device_enumerator *enumerator, sd_device *parent) {
device_enumerator_clear_match_parent(enumerator);
return device_enumerator_add_match_parent_incremental(enumerator, parent);
}
_public_ int sd_device_enumerator_allow_uninitialized(sd_device_enumerator *enumerator) {
assert_return(enumerator, -EINVAL);
@ -399,22 +423,24 @@ static bool match_tag(sd_device_enumerator *enumerator, sd_device *device) {
}
static bool match_parent(sd_device_enumerator *enumerator, sd_device *device) {
const char *devpath, *devpath_dev;
const char *syspath_parent, *syspath;
Iterator i;
int r;
assert(enumerator);
assert(device);
if (!enumerator->match_parent)
if (set_isempty(enumerator->match_parent))
return true;
r = sd_device_get_devpath(enumerator->match_parent, &devpath);
r = sd_device_get_syspath(device, &syspath);
assert(r >= 0);
r = sd_device_get_devpath(device, &devpath_dev);
assert(r >= 0);
SET_FOREACH(syspath_parent, enumerator->match_parent, i)
if (path_startswith(syspath, syspath_parent))
return true;
return startswith(devpath_dev, devpath);
return false;
}
static bool match_sysname(sd_device_enumerator *enumerator, const char *sysname) {
@ -745,18 +771,17 @@ static int parent_crawl_children(sd_device_enumerator *enumerator, const char *p
static int enumerator_scan_devices_children(sd_device_enumerator *enumerator) {
const char *path;
int r = 0, k;
Iterator i;
r = sd_device_get_syspath(enumerator->match_parent, &path);
if (r < 0)
return r;
SET_FOREACH(path, enumerator->match_parent, i) {
k = parent_add_child(enumerator, path);
if (k < 0)
r = k;
k = parent_add_child(enumerator, path);
if (k < 0)
r = k;
k = parent_crawl_children(enumerator, path, DEVICE_ENUMERATE_MAX_DEPTH);
if (k < 0)
r = k;
k = parent_crawl_children(enumerator, path, DEVICE_ENUMERATE_MAX_DEPTH);
if (k < 0)
r = k;
}
return r;
}

3
src/libudev/libudev-enumerate.c
View File

@ -277,9 +277,6 @@ _public_ int udev_enumerate_add_match_tag(struct udev_enumerate *udev_enumerate,
* Return the devices on the subtree of one given device. The parent
* itself is included in the list.
*
* A reference for the device is held until the udev_enumerate context
* is cleaned up.
*
* Returns: 0 on success, otherwise a negative error value.
*/
_public_ int udev_enumerate_add_match_parent(struct udev_enumerate *udev_enumerate, struct udev_device *parent) {

6
src/udev/udevadm-trigger.c
View File

@ -256,7 +256,7 @@ int trigger_main(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to open the device '%s': %m", optarg);
r = sd_device_enumerator_add_match_parent(e, dev);
r = device_enumerator_add_match_parent_incremental(e, dev);
if (r < 0)
return log_error_errno(r, "Failed to add parent match '%s': %m", optarg);
break;
@ -272,7 +272,7 @@ int trigger_main(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to open the device '%s': %m", optarg);
r = sd_device_enumerator_add_match_parent(e, dev);
r = device_enumerator_add_match_parent_incremental(e, dev);
if (r < 0)
return log_error_errno(r, "Failed to add parent match '%s': %m", optarg);
break;
@ -324,7 +324,7 @@ int trigger_main(int argc, char *argv[], void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to open the device '%s': %m", argv[optind]);
r = sd_device_enumerator_add_match_parent(e, dev);
r = device_enumerator_add_match_parent_incremental(e, dev);
if (r < 0)
return log_error_errno(r, "Failed to add parent match '%s': %m", argv[optind]);
}