/*
- * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2010 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
static int udev_exit;
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
{
if (signum == SIGINT || signum == SIGTERM)
udev_exit = 1;
}
-static void print_device(struct udev_device *device, const char *source, int env)
+static void print_device(struct udev_device *device, const char *source, int prop)
{
struct timeval tv;
struct timezone tz;
udev_device_get_action(device),
udev_device_get_devpath(device),
udev_device_get_subsystem(device));
- if (env) {
+ if (prop) {
struct udev_list_entry *list_entry;
udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(device))
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
{
struct sigaction act;
+ sigset_t mask;
int option;
- int env = 0;
+ int prop = 0;
int print_kernel = 0;
int print_udev = 0;
struct udev_list_node subsystem_match_list;
+ struct udev_list_node tag_match_list;
struct udev_monitor *udev_monitor = NULL;
struct udev_monitor *kernel_monitor = NULL;
fd_set readfds;
int rc = 0;
static const struct option options[] = {
+ { "property", no_argument, NULL, 'p' },
{ "environment", no_argument, NULL, 'e' },
{ "kernel", no_argument, NULL, 'k' },
{ "udev", no_argument, NULL, 'u' },
{ "subsystem-match", required_argument, NULL, 's' },
+ { "tag-match", required_argument, NULL, 't' },
{ "help", no_argument, NULL, 'h' },
{}
};
udev_list_init(&subsystem_match_list);
- while (1) {
- option = getopt_long(argc, argv, "ekus:h", options, NULL);
+ udev_list_init(&tag_match_list);
+ for (;;) {
+ option = getopt_long(argc, argv, "pekus:t:h", options, NULL);
if (option == -1)
break;
switch (option) {
+ case 'p':
case 'e':
- env = 1;
+ prop = 1;
break;
case 'k':
print_kernel = 1;
char subsys[UTIL_NAME_SIZE];
char *devtype;
- util_strlcpy(subsys, optarg, sizeof(subsys));
- devtype = strchr(subsys, ':');
+ util_strscpy(subsys, sizeof(subsys), optarg);
+ devtype = strchr(subsys, '/');
if (devtype != NULL) {
devtype[0] = '\0';
devtype++;
udev_list_entry_add(udev, &subsystem_match_list, subsys, devtype, 0, 0);
break;
}
+ case 't':
+ udev_list_entry_add(udev, &tag_match_list, optarg, NULL, 0, 0);
+ break;
case 'h':
- printf("Usage: udevadm monitor [--environment] [--kernel] [--udev] [--help]\n"
- " --env print the whole event environment\n"
- " --kernel print kernel uevents\n"
- " --udev print udev events\n"
- " --subsystem-match=<subsystem> filter events\n"
+ printf("Usage: udevadm monitor [--property] [--kernel] [--udev] [--help]\n"
+ " --property print the event properties\n"
+ " --kernel print kernel uevents\n"
+ " --udev print udev events\n"
+ " --subsystem-match=<subsystem[/devtype]> filter events by subsystem\n"
+ " --tag-match=<tag> filter events by tag\n"
" --help\n\n");
default:
goto out;
/* set signal handlers */
memset(&act, 0x00, sizeof(struct sigaction));
- act.sa_handler = (void (*)(int)) sig_handler;
+ act.sa_handler = sig_handler;
sigemptyset(&act.sa_mask);
act.sa_flags = SA_RESTART;
sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, NULL);
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGINT);
+ sigaddset(&mask, SIGTERM);
+ sigprocmask(SIG_UNBLOCK, &mask, NULL);
printf("monitor will print the received events for:\n");
if (print_udev) {
rc = 1;
goto out;
}
+ udev_monitor_set_receive_buffer_size(udev_monitor, 128*1024*1024);
udev_list_entry_foreach(entry, udev_list_get_entry(&subsystem_match_list)) {
const char *subsys = udev_list_entry_get_name(entry);
fprintf(stderr, "error: unable to apply subsystem filter '%s'\n", subsys);
}
+ udev_list_entry_foreach(entry, udev_list_get_entry(&tag_match_list)) {
+ const char *tag = udev_list_entry_get_name(entry);
+
+ if (udev_monitor_filter_add_match_tag(udev_monitor, tag) < 0)
+ fprintf(stderr, "error: unable to apply tag filter '%s'\n", tag);
+ }
+
if (udev_monitor_enable_receiving(udev_monitor) < 0) {
fprintf(stderr, "error: unable to subscribe to udev events\n");
rc = 2;
rc = 3;
goto out;
}
+ udev_monitor_set_receive_buffer_size(kernel_monitor, 128*1024*1024);
udev_list_entry_foreach(entry, udev_list_get_entry(&subsystem_match_list)) {
const char *subsys = udev_list_entry_get_name(entry);
if (udev_monitor != NULL)
FD_SET(udev_monitor_get_fd(udev_monitor), &readfds);
- fdcount = select(UDEV_MAX(udev_monitor_get_fd(kernel_monitor), udev_monitor_get_fd(udev_monitor))+1,
+ fdcount = select(MAX(udev_monitor_get_fd(kernel_monitor), udev_monitor_get_fd(udev_monitor))+1,
&readfds, NULL, NULL, NULL);
if (fdcount < 0) {
if (errno != EINTR)
device = udev_monitor_receive_device(kernel_monitor);
if (device == NULL)
continue;
- print_device(device, "KERNEL", env);
+ print_device(device, "KERNEL", prop);
udev_device_unref(device);
}
device = udev_monitor_receive_device(udev_monitor);
if (device == NULL)
continue;
- print_device(device, "UDEV", env);
+ print_device(device, "UDEV", prop);
udev_device_unref(device);
}
}
udev_monitor_unref(udev_monitor);
udev_monitor_unref(kernel_monitor);
udev_list_cleanup_entries(udev, &subsystem_match_list);
+ udev_list_cleanup_entries(udev, &tag_match_list);
return rc;
}
~ianmdlvl / elogind.git / blobdiff