shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

udevadm: settle - use libudev queue

Browse Source
This commit is contained in:
Kay Sievers 2008-10-01 09:42:03 +02:00
parent 64ccdf8269
commit 8249e04e3e
4 changed files with 28 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -4,7 +4,7 @@ More libudev work. Most of udevadm's functionality comes from libudev
now.
udevadm trigger has a new option --type, which allows to trigger events
for "devices", for "subsystems" and "failed" devices. The old option
for "devices", for "subsystems", or "failed" devices. The old option
--retry-failed" still works, but is no longer mentioned in the man page.
udev 128

7
TODO
View File

@ -1,7 +1,5 @@
o test --type=failed
o add libudev queue - interface for /dev/.udev/queue/ state
use queue interface for "settle"
use queue interface for --type=failed
o use queue interface for --type=failed
o check "enumerate" on SYSFS_DEPRECATED
#129
o use libudev device in udev_rules.c
@ -15,4 +13,5 @@
the default rules
o "udevadm control" commands will only accept the --<command> syntax
o symlink names to udevadm will no longer be resolved to old command names
o remove "udevinfo -V"
o get distros to agree on a default set of rules

1
udev/Makefile.am
View File

@ -34,6 +34,7 @@ common_files = \
lib/libudev-device.c \
lib/libudev-monitor.c \
lib/libudev-enumerate.c \
lib/libudev-queue.c \
lib/libudev-ctrl.c
if USE_SELINUX

121
udev/udevadm-settle.c
View File

@ -33,61 +33,24 @@
#define DEFAULT_TIMEOUT 180
#define LOOP_PER_SECOND 20
static void print_queue(struct udev *udev, const char *dir)
{
LIST_HEAD(files);
struct name_entry *item;
if (add_matching_files(udev, &files, dir, NULL) < 0)
return;
printf("\n\nAfter the udevadm settle timeout, the events queue contains:\n\n");
list_for_each_entry(item, &files, node) {
char target[UTIL_NAME_SIZE];
size_t len;
const char *filename = strrchr(item->name, '/');
if (filename == NULL)
continue;
filename++;
if (*filename == '\0')
continue;
len = readlink(item->name, target, sizeof(target));
if (len < 0)
continue;
target[len] = '\0';
printf("%s: %s\n", filename, target);
}
printf("\n\n");
}
int udevadm_settle(struct udev *udev, int argc, char *argv[])
{
char queuename[UTIL_PATH_SIZE];
char filename[UTIL_PATH_SIZE];
unsigned long long seq_kernel;
unsigned long long seq_udev;
char seqnum[32];
int fd;
ssize_t len;
int timeout = DEFAULT_TIMEOUT;
int loop;
static const struct option options[] = {
{ "timeout", 1, NULL, 't' },
{ "help", 0, NULL, 'h' },
{}
};
int option;
int rc = 1;
int seconds;
int timeout = DEFAULT_TIMEOUT;
struct udev_queue *udev_queue;
int loop;
int rc = 0;
dbg(udev, "version %s\n", VERSION);
while (1) {
int option;
int seconds;
option = getopt_long(argc, argv, "t:h", options, NULL);
if (option == -1)
break;
@ -107,65 +70,27 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
}
}
util_strlcpy(queuename, udev_get_dev_path(udev), sizeof(queuename));
util_strlcat(queuename, "/.udev/queue", sizeof(queuename));
udev_queue = udev_queue_new(udev);
if (udev_queue == NULL)
goto exit;
loop = timeout * LOOP_PER_SECOND;
while (loop--) {
/* wait for events in queue to finish */
while (loop--) {
struct stat statbuf;
if (stat(queuename, &statbuf) < 0) {
info(udev, "queue is empty\n");
break;
}
usleep(1000 * 1000 / LOOP_PER_SECOND);
}
if (loop <= 0) {
info(udev, "timeout waiting for queue\n");
print_queue(udev, queuename);
goto exit;
}
/* read current udev seqnum */
util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
util_strlcat(filename, "/.udev/uevent_seqnum", sizeof(filename));
fd = open(filename, O_RDONLY);
if (fd < 0)
goto exit;
len = read(fd, seqnum, sizeof(seqnum)-1);
close(fd);
if (len <= 0)
goto exit;
seqnum[len] = '\0';
seq_udev = strtoull(seqnum, NULL, 10);
info(udev, "udev seqnum = %llu\n", seq_udev);
/* read current kernel seqnum */
util_strlcpy(filename, udev_get_sys_path(udev), sizeof(filename));
util_strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
fd = open(filename, O_RDONLY);
if (fd < 0)
goto exit;
len = read(fd, seqnum, sizeof(seqnum)-1);
close(fd);
if (len <= 0)
goto exit;
seqnum[len] = '\0';
seq_kernel = strtoull(seqnum, NULL, 10);
info(udev, "kernel seqnum = %llu\n", seq_kernel);
/* make sure all kernel events have arrived in the queue */
if (seq_udev >= seq_kernel) {
info(udev, "queue is empty and no pending events left\n");
rc = 0;
goto exit;
}
if (udev_queue_get_queue_is_empty(udev_queue))
break;
usleep(1000 * 1000 / LOOP_PER_SECOND);
info(udev, "queue is empty, but events still pending\n");
}
if (loop <= 0) {
struct udev_list_entry *list_entry;
info(udev, "timeout waiting for udev queue\n");
printf("\ndevadm settle timeout of %i seconds reached, the event queue contains:\n", timeout);
udev_list_entry_foreach(list_entry, udev_queue_get_queued_list_entry(udev_queue))
printf(" '%s' [%s]\n",
udev_list_entry_get_name(list_entry),
udev_list_entry_get_value(list_entry));
rc = 1;
}
exit:
udev_queue_unref(udev_queue);
return rc;
}