chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Also merge into the top-level Makefile.am the simpler extras.
[elogind.git]
/
udev
/
udevadm-monitor.c
diff --git
a/udev/udevadm-monitor.c
b/udev/udevadm-monitor.c
index d8ec066467e9fbb001d3587b7580e80bc08b1e67..90388db58e38c3113d67f4c5f0552e886a1656d6 100644
(file)
--- a/
udev/udevadm-monitor.c
+++ b/
udev/udevadm-monitor.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2004-200
8
Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-200
9
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
*
* 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
@@
-35,13
+35,13
@@
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;
}
-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;
{
struct timeval tv;
struct timezone tz;
@@
-53,7
+53,7
@@
static void print_device(struct udev_device *device, const char *source, int env
udev_device_get_action(device),
udev_device_get_devpath(device),
udev_device_get_subsystem(device));
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))
struct udev_list_entry *list_entry;
udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(device))
@@
-68,30
+68,35
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
{
struct sigaction act;
int option;
{
struct sigaction act;
int option;
- int
env
= 0;
+ int
prop
= 0;
int print_kernel = 0;
int print_udev = 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;
int rc = 0;
static const struct option options[] = {
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' },
{ "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, "e
ku
h", options, NULL);
+ option = getopt_long(argc, argv, "e
pkus:
h", options, NULL);
if (option == -1)
break;
switch (option) {
if (option == -1)
break;
switch (option) {
+ case 'p':
case 'e':
case 'e':
-
env
= 1;
+
prop
= 1;
break;
case 'k':
print_kernel = 1;
break;
case 'k':
print_kernel = 1;
@@
-99,11
+104,26
@@
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_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 'h':
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"
+ 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> filter events\n"
" --help\n\n");
default:
goto out;
" --help\n\n");
default:
goto out;
@@
-117,7
+137,7
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
/* 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);
@@
-125,25
+145,49
@@
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) {
+ struct udev_list_entry *entry;
+
udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
if (udev_monitor == NULL) {
udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
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;
}
printf("UDEV - the event which udev sends out after rule processing\n");
}
if (print_kernel) {
rc = 2;
goto out;
}
printf("UDEV - the event which udev sends out after rule processing\n");
}
if (print_kernel) {
+ struct udev_list_entry *entry;
+
kernel_monitor = udev_monitor_new_from_netlink(udev, "kernel");
if (kernel_monitor == NULL) {
kernel_monitor = udev_monitor_new_from_netlink(udev, "kernel");
if (kernel_monitor == NULL) {
- fprintf(stderr, "
unable to subscribe to kernel events
\n");
+ 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;
}
@@
-160,7
+204,7
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
if (udev_monitor != NULL)
FD_SET(udev_monitor_get_fd(udev_monitor), &readfds);
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)
&readfds, NULL, NULL, NULL);
if (fdcount < 0) {
if (errno != EINTR)
@@
-174,7
+218,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, "KERNEL",
env
);
+ print_device(device, "KERNEL",
prop
);
udev_device_unref(device);
}
udev_device_unref(device);
}
@@
-184,7
+228,7
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
device = udev_monitor_receive_device(udev_monitor);
if (device == NULL)
continue;
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_device_unref(device);
}
}
@@
-192,5
+236,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;
}