chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove asmlinkage
[elogind.git]
/
udev
/
udevadm-monitor.c
diff --git
a/udev/udevadm-monitor.c
b/udev/udevadm-monitor.c
index 14a6edc84465fc7c32b295a4c33342fc0b21f76c..3f4cb5772da316d7b9f5a2cefd67fb8279ac7a4d 100644
(file)
--- a/
udev/udevadm-monitor.c
+++ b/
udev/udevadm-monitor.c
@@
-35,7
+35,7
@@
static int udev_exit;
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;
{
if (signum == SIGINT || signum == SIGTERM)
udev_exit = 1;
@@
-71,6
+71,7
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
int env = 0;
int print_kernel = 0;
int print_udev = 0;
int env = 0;
int print_kernel = 0;
int print_udev = 0;
+ struct udev_list_node subsystem_match_list;
struct udev_monitor *udev_monitor = NULL;
struct udev_monitor *kernel_monitor = NULL;
fd_set readfds;
struct udev_monitor *udev_monitor = NULL;
struct udev_monitor *kernel_monitor = NULL;
fd_set readfds;
@@
-80,12
+81,14
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
{ "environment", no_argument, NULL, 'e' },
{ "kernel", no_argument, NULL, 'k' },
{ "udev", no_argument, NULL, 'u' },
{ "environment", no_argument, NULL, 'e' },
{ "kernel", no_argument, NULL, 'k' },
{ "udev", no_argument, NULL, 'u' },
+ { "subsystem-match", required_argument, NULL, 's' },
{ "help", no_argument, NULL, 'h' },
{}
};
{ "help", no_argument, NULL, 'h' },
{}
};
+ udev_list_init(&subsystem_match_list);
while (1) {
while (1) {
- option = getopt_long(argc, argv, "ekuh", options, NULL);
+ option = getopt_long(argc, argv, "eku
s:
h", options, NULL);
if (option == -1)
break;
if (option == -1)
break;
@@
-99,12
+102,27
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
case 'u':
print_udev = 1;
break;
case 'u':
print_udev = 1;
break;
+ case 's':
+ {
+ char subsys[UTIL_NAME_SIZE];
+ char *devtype;
+
+ util_strlcpy(subsys, optarg, sizeof(subsys));
+ devtype = strchr(subsys, ':');
+ if (devtype != NULL) {
+ devtype[0] = '\0';
+ devtype++;
+ }
+ udev_list_entry_add(udev, &subsystem_match_list, subsys, devtype, 0, 0);
+ break;
+ }
case 'h':
printf("Usage: udevadm monitor [--environment] [--kernel] [--udev] [--help]\n"
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"
- " --help print this help text\n\n");
+ " --env print the whole event environment\n"
+ " --kernel print kernel uevents\n"
+ " --udev print udev events\n"
+ " --subsystem-match=<subsystem> filter events\n"
+ " --help\n\n");
default:
goto out;
}
default:
goto out;
}
@@
-115,14
+133,9
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
print_udev =1;
}
print_udev =1;
}
- if (getuid() != 0 && print_kernel) {
- fprintf(stderr, "root privileges needed to subscribe to kernel events\n");
- goto out;
- }
-
/* set signal handlers */
memset(&act, 0x00, sizeof(struct sigaction));
/* 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);
sigemptyset(&act.sa_mask);
act.sa_flags = SA_RESTART;
sigaction(SIGINT, &act, NULL);
@@
-130,28
+143,53
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
printf("monitor will print the received events for:\n");
if (print_udev) {
printf("monitor will print the received events for:\n");
if (print_udev) {
- udev_monitor = udev_monitor_new_from_socket(udev, "@/org/kernel/udev/monitor");
+ struct udev_list_entry *entry;
+
+ udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
if (udev_monitor == NULL) {
if (udev_monitor == NULL) {
+ fprintf(stderr, "error: unable to create netlink socket\n");
rc = 1;
goto out;
}
rc = 1;
goto out;
}
+
+ udev_list_entry_foreach(entry, udev_list_get_entry(&subsystem_match_list)) {
+ const char *subsys = udev_list_entry_get_name(entry);
+ const char *devtype = udev_list_entry_get_value(entry);
+
+ if (udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, subsys, devtype) < 0)
+ fprintf(stderr, "error: unable to apply subsystem filter '%s'\n", subsys);
+ }
+
if (udev_monitor_enable_receiving(udev_monitor) < 0) {
if (udev_monitor_enable_receiving(udev_monitor) < 0) {
+ fprintf(stderr, "error: unable to subscribe to udev events\n");
rc = 2;
goto out;
}
rc = 2;
goto out;
}
- printf("UDEV the event which udev sends out after rule processing\n");
+ printf("UDEV
-
the event which udev sends out after rule processing\n");
}
if (print_kernel) {
}
if (print_kernel) {
- kernel_monitor = udev_monitor_new_from_netlink(udev);
+ struct udev_list_entry *entry;
+
+ kernel_monitor = udev_monitor_new_from_netlink(udev, "kernel");
if (kernel_monitor == NULL) {
if (kernel_monitor == NULL) {
+ fprintf(stderr, "error: unable to create netlink socket\n");
rc = 3;
goto out;
}
rc = 3;
goto out;
}
+
+ udev_list_entry_foreach(entry, udev_list_get_entry(&subsystem_match_list)) {
+ const char *subsys = udev_list_entry_get_name(entry);
+
+ if (udev_monitor_filter_add_match_subsystem_devtype(kernel_monitor, subsys, NULL) < 0)
+ fprintf(stderr, "error: unable to apply subsystem filter '%s'\n", subsys);
+ }
+
if (udev_monitor_enable_receiving(kernel_monitor) < 0) {
if (udev_monitor_enable_receiving(kernel_monitor) < 0) {
+ fprintf(stderr, "error: unable to subscribe to kernel events\n");
rc = 4;
goto out;
}
rc = 4;
goto out;
}
- printf("
UEVENT
the kernel uevent\n");
+ printf("
KERNEL -
the kernel uevent\n");
}
printf("\n");
}
printf("\n");
@@
-178,7
+216,7
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
device = udev_monitor_receive_device(kernel_monitor);
if (device == NULL)
continue;
device = udev_monitor_receive_device(kernel_monitor);
if (device == NULL)
continue;
- print_device(device, "
UEVENT
", env);
+ print_device(device, "
KERNEL
", env);
udev_device_unref(device);
}
udev_device_unref(device);
}
@@
-196,5
+234,6
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
out:
udev_monitor_unref(udev_monitor);
udev_monitor_unref(kernel_monitor);
out:
udev_monitor_unref(udev_monitor);
udev_monitor_unref(kernel_monitor);
+ udev_list_cleanup_entries(udev, &subsystem_match_list);
return rc;
}
return rc;
}