X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Ftest-libudev.c;h=421d0511a122e2d2361b974dee773847bbc301e5;hb=04f5d75f0cfaf82e1bbdec5e398e95b3d6f3f16d;hp=d0095f15fc5828cc9cab1a1971b671be93eb678f;hpb=11d543c1ee886ef30c3ef66d7176149d0b126fa5;p=elogind.git
diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c
index d0095f15f..421d0511a 100644
--- a/udev/lib/test-libudev.c
+++ b/udev/lib/test-libudev.c
@@ -17,13 +17,14 @@
* along with this program. If not, see .
*/
-#include "config.h"
-
#include
#include
#include
#include
#include
+#include
+#include
+#include
#include
#include "libudev.h"
@@ -36,45 +37,59 @@ static void log_fn(struct udev *udev,
vprintf(format, args);
}
-static int print_devlinks_cb(struct udev_device *udev_device, const char *value, void *data)
-{
- printf("link: '%s'\n", value);
- return 0;
-}
-
-static int print_properties_cb(struct udev_device *udev_device, const char *key, const char *value, void *data)
-{
- printf("property: '%s=%s'\n", key, value);
- return 0;
-}
-
static void print_device(struct udev_device *device)
{
const char *str;
+ dev_t devnum;
int count;
+ struct udev_list *list;
printf("*** device: %p ***\n", device);
+ str = udev_device_get_action(device);
+ printf("action: '%s'\n", str);
+ str = udev_device_get_syspath(device);
+ printf("syspath: '%s'\n", str);
str = udev_device_get_devpath(device);
printf("devpath: '%s'\n", str);
str = udev_device_get_subsystem(device);
printf("subsystem: '%s'\n", str);
- str = udev_device_get_syspath(device);
- printf("syspath: '%s'\n", str);
- str = udev_device_get_devname(device);
+ str = udev_device_get_driver(device);
+ printf("driver: '%s'\n", str);
+ str = udev_device_get_devnode(device);
printf("devname: '%s'\n", str);
- count = udev_device_get_devlinks(device, print_devlinks_cb, NULL);
+ devnum = udev_device_get_devnum(device);
+ printf("devnum: %u:%u\n", major(devnum), minor(devnum));
+
+ count = 0;
+ list = udev_device_get_devlinks_list(device);
+ while (list != NULL) {
+ printf("link: '%s'\n", udev_list_get_name(list));
+ count++;
+ list = udev_list_get_next(list);
+ }
printf("found %i links\n", count);
- count = udev_device_get_properties(device, print_properties_cb, NULL);
+
+ count = 0;
+ list = udev_device_get_properties_list(device);
+ while (list != NULL) {
+ printf("property: '%s=%s'\n", udev_list_get_name(list), udev_list_get_value(list));
+ count++;
+ list = udev_list_get_next(list);
+ }
printf("found %i properties\n", count);
+
+ str = udev_device_get_attr_value(device, "dev");
+ printf("attr{dev}: '%s'\n", str);
+
printf("\n");
}
-static int test_device(struct udev *udev, const char *devpath)
+static int test_device(struct udev *udev, const char *syspath)
{
struct udev_device *device;
- printf("looking at device: %s\n", devpath);
- device = udev_device_new_from_devpath(udev, devpath);
+ printf("looking at device: %s\n", syspath);
+ device = udev_device_new_from_syspath(udev, syspath);
if (device == NULL) {
printf("no device\n");
return -1;
@@ -84,19 +99,73 @@ static int test_device(struct udev *udev, const char *devpath)
return 0;
}
-static int devices_enum_cb(struct udev *udev,
- const char *devpath, const char *subsystem, const char *name,
- void *data)
+static int test_device_parents(struct udev *udev, const char *syspath)
+{
+ struct udev_device *device;
+ struct udev_device *device_parent;
+
+ printf("looking at device: %s\n", syspath);
+ device = udev_device_new_from_syspath(udev, syspath);
+ if (device == NULL)
+ return -1;
+
+ printf("looking at parents\n");
+ device_parent = device;
+ do {
+ print_device(device_parent);
+ device_parent = udev_device_get_parent(device_parent);
+ } while (device_parent != NULL);
+
+ printf("looking at parents again\n");
+ device_parent = device;
+ do {
+ print_device(device_parent);
+ device_parent = udev_device_get_parent(device_parent);
+ } while (device_parent != NULL);
+ udev_device_unref(device);
+
+ return 0;
+}
+
+static int test_device_devnum(struct udev *udev)
{
- printf("device: '%s' (%s) '%s'\n", devpath, subsystem, name);
+ dev_t devnum = makedev(1, 3);
+ struct udev_device *device;
+
+ printf("looking up device: %u:%u\n", major(devnum), minor(devnum));
+ device = udev_device_new_from_devnum(udev, 'c', devnum);
+ if (device == NULL)
+ return -1;
+ print_device(device);
+ udev_device_unref(device);
return 0;
}
static int test_enumerate(struct udev *udev, const char *subsystem)
{
- int count;
+ struct udev_enumerate *enumerate;
+ struct udev_list *list;
+ int count = 0;
- count = udev_devices_enumerate(udev, subsystem, devices_enum_cb, NULL);
+ enumerate = udev_enumerate_new_from_subsystems(udev, NULL);
+ if (enumerate == NULL)
+ return -1;
+ list = udev_enumerate_get_devices_list(enumerate);
+ while (list != NULL) {
+ struct udev_device *device;
+
+ device = udev_device_new_from_syspath(udev, udev_list_get_name(list));
+ if (device != NULL) {
+ printf("device: '%s' (%s) '%s'\n",
+ udev_device_get_syspath(device),
+ udev_device_get_subsystem(device),
+ udev_device_get_sysname(device));
+ udev_device_unref(device);
+ count++;
+ }
+ list = udev_list_get_next(list);
+ }
+ udev_enumerate_unref(enumerate);
printf("found %i devices\n\n", count);
return count;
}
@@ -112,6 +181,10 @@ static int test_monitor(struct udev *udev, const char *socket_path)
printf("no socket\n");
return -1;
}
+ if (udev_monitor_enable_receiving(udev_monitor) < 0) {
+ printf("bind failed\n");
+ return -1;
+ }
fd = udev_monitor_get_fd(udev_monitor);
FD_ZERO(&readfds);
@@ -128,7 +201,7 @@ static int test_monitor(struct udev *udev, const char *socket_path)
printf("select fd count: %i\n", fdcount);
if (FD_ISSET(fd, &readfds)) {
- device = udev_monitor_get_device(udev_monitor);
+ device = udev_monitor_receive_device(udev_monitor);
if (device == NULL) {
printf("no device from socket\n");
continue;
@@ -149,20 +222,22 @@ static int test_monitor(struct udev *udev, const char *socket_path)
int main(int argc, char *argv[], char *envp[])
{
- struct udev *udev;
- const char *devpath = "/devices/virtual/mem/null";
+ struct udev *udev = NULL;
+ static const struct option options[] = {
+ { "syspath", 1, NULL, 'p' },
+ { "subsystem", 1, NULL, 's' },
+ { "socket", 1, NULL, 'S' },
+ { "debug", 0, NULL, 'd' },
+ { "help", 0, NULL, 'h' },
+ { "version", 0, NULL, 'V' },
+ {}
+ };
+ const char *syspath = "/devices/virtual/mem/null";
const char *subsystem = NULL;
const char *socket = "@/org/kernel/udev/monitor";
+ char path[1024];
const char *str;
- if (argv[1] != NULL) {
- devpath = argv[1];
- if (argv[2] != NULL)
- subsystem = argv[2];
- if (argv[3] != NULL)
- socket = argv[3];
- }
-
udev = udev_new();
printf("context: %p\n", udev);
if (udev == NULL) {
@@ -172,15 +247,55 @@ int main(int argc, char *argv[], char *envp[])
udev_set_log_fn(udev, log_fn);
printf("set log: %p\n", log_fn);
+ while (1) {
+ int option;
+
+ option = getopt_long(argc, argv, "+dhV", options, NULL);
+ if (option == -1)
+ break;
+
+ switch (option) {
+ case 'p':
+ syspath = optarg;
+ break;
+ case 's':
+ subsystem = optarg;
+ break;
+ case 'S':
+ socket = optarg;
+ break;
+ case 'd':
+ if (udev_get_log_priority(udev) < LOG_INFO)
+ udev_set_log_priority(udev, LOG_INFO);
+ break;
+ case 'h':
+ printf("--debug --syspath= --subsystem= --socket= --help\n");
+ goto out;
+ case 'V':
+ printf("%s\n", VERSION);
+ goto out;
+ default:
+ goto out;
+ }
+ }
+
str = udev_get_sys_path(udev);
printf("sys_path: '%s'\n", str);
str = udev_get_dev_path(udev);
printf("dev_path: '%s'\n", str);
- test_device(udev, devpath);
+ /* add sys path if needed */
+ if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) {
+ snprintf(path, sizeof(path), "%s%s", udev_get_sys_path(udev), syspath);
+ syspath = path;
+ }
+
+ test_device(udev, syspath);
+ test_device_devnum(udev);
+ test_device_parents(udev, syspath);
test_enumerate(udev, subsystem);
test_monitor(udev, socket);
-
+out:
udev_unref(udev);
return 0;
}