X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Ftest-libudev.c;h=854a0a9faac30d2693022a9b7781f2a2f4bb6d75;hp=8afd294a2fb33873ce4ae55dcfcf8eeb30be1992;hb=ee137da3897d154e0c62b03ea7ef3c3359753adc;hpb=4c9dff47f696b1e6c89cc6e0a7ba683067927821

diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c
index 8afd294a2..854a0a9fa 100644
--- a/udev/lib/test-libudev.c
+++ b/udev/lib/test-libudev.c
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
@@ -37,40 +38,62 @@ 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_entry *list_entry;
 
 	printf("*** device: %p ***\n", device);
 	str = udev_device_get_action(device);
-	printf("action:    '%s'\n", str);
+	if (str != NULL)
+		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);
+	if (str != NULL)
+		printf("subsystem: '%s'\n", str);
+
 	str = udev_device_get_driver(device);
-	printf("driver:    '%s'\n", str);
+	if (str != NULL)
+		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);
-	printf("found %i links\n", count);
-	count = udev_device_get_properties(device, print_properties_cb, NULL);
-	printf("found %i properties\n", count);
+	if (str != NULL)
+		printf("devname:   '%s'\n", str);
+
+	devnum = udev_device_get_devnum(device);
+	if (major(devnum) > 0)
+		printf("devnum:    %u:%u\n", major(devnum), minor(devnum));
+
+	count = 0;
+	udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(device)) {
+		printf("link:      '%s'\n", udev_list_entry_get_name(list_entry));
+		count++;
+	}
+	if (count > 0)
+		printf("found %i links\n", count);
+
+	count = 0;
+	udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(device)) {
+		printf("property:  '%s=%s'\n",
+		       udev_list_entry_get_name(list_entry),
+		       udev_list_entry_get_value(list_entry));
+		count++;
+	}
+	if (count > 0)
+		printf("found %i properties\n", count);
+
+	str = udev_device_get_attr_value(device, "dev");
+	if (str != NULL)
+		printf("attr{dev}: '%s'\n", str);
+
 	printf("\n");
 }
 
@@ -81,7 +104,7 @@ static int test_device(struct udev *udev, const char *syspath)
 	printf("looking at device: %s\n", syspath);
 	device = udev_device_new_from_syspath(udev, syspath);
 	if (device == NULL) {
-		printf("no device\n");
+		printf("no device found\n");
 		return -1;
 	}
 	print_device(device);
@@ -99,12 +122,14 @@ static int test_device_parents(struct udev *udev, const char *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);
@@ -129,20 +154,24 @@ static int test_device_devnum(struct udev *udev)
 	return 0;
 }
 
-static int devices_enum_cb(struct udev_device *device, void *data)
+static int test_enumerate_print_list(struct udev_enumerate *enumerate)
 {
-	printf("device:    '%s' (%s) '%s'\n",
-	       udev_device_get_syspath(device),
-	       udev_device_get_subsystem(device),
-	       udev_device_get_sysname(device));
-	return 0;
-}
+	struct udev_list_entry *list_entry;
+	int count = 0;
 
-static int test_enumerate(struct udev *udev, const char *subsystem)
-{
-	int count;
+	udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
+		struct udev_device *device;
 
-	count = udev_enumerate_devices(udev, subsystem, devices_enum_cb, NULL);
+		device = udev_device_new_from_syspath(udev_enumerate_get_udev(enumerate),
+						      udev_list_entry_get_name(list_entry));
+		if (device != NULL) {
+			printf("device: '%s' (%s)\n",
+			       udev_device_get_syspath(device),
+			       udev_device_get_subsystem(device));
+			udev_device_unref(device);
+			count++;
+		}
+	}
 	printf("found %i devices\n\n", count);
 	return count;
 }
@@ -197,18 +226,62 @@ static int test_monitor(struct udev *udev, const char *socket_path)
 	return 0;
 }
 
+static int test_queue(struct udev *udev)
+{
+	struct udev_queue *udev_queue;
+	unsigned long long int seqnum;
+	struct udev_list_entry *list_entry;
+
+	udev_queue = udev_queue_new(udev);
+	if (udev_queue == NULL)
+		return -1;
+	seqnum = udev_queue_get_kernel_seqnum(udev_queue);
+	printf("seqnum kernel: %llu\n", seqnum);
+	seqnum = udev_queue_get_udev_seqnum(udev_queue);
+	printf("seqnum udev  : %llu\n", seqnum);
+
+	if (udev_queue_get_queue_is_empty(udev_queue))
+		printf("queue is empty\n");
+	printf("get queue list\n");
+	udev_list_entry_foreach(list_entry, udev_queue_get_queued_list_entry(udev_queue))
+		printf("queued: '%s' [%s]\n", udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry));
+	printf("\n");
+	printf("get queue list again\n");
+	udev_list_entry_foreach(list_entry, udev_queue_get_queued_list_entry(udev_queue))
+		printf("queued: '%s' [%s]\n", udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry));
+	printf("\n");
+	printf("get failed list\n");
+	udev_list_entry_foreach(list_entry, udev_queue_get_failed_list_entry(udev_queue))
+		printf("failed: '%s'\n", udev_list_entry_get_name(list_entry));
+	printf("\n");
+
+	list_entry = udev_queue_get_queued_list_entry(udev_queue);
+	if (list_entry != NULL) {
+		printf("event [%llu] is queued\n", seqnum);
+		seqnum = strtoull(udev_list_entry_get_value(list_entry), NULL, 10);
+		if (udev_queue_get_seqnum_is_finished(udev_queue, seqnum))
+			printf("event [%llu] is not finished\n", seqnum);
+		else
+			printf("event [%llu] is finished\n", seqnum);
+	}
+	printf("\n");
+	udev_queue_unref(udev_queue);
+	return 0;
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
 	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' },
+		{ "syspath", required_argument, NULL, 'p' },
+		{ "subsystem", required_argument, NULL, 's' },
+		{ "socket", required_argument, NULL, 'S' },
+		{ "debug", no_argument, NULL, 'd' },
+		{ "help", no_argument, NULL, 'h' },
+		{ "version", no_argument, NULL, 'V' },
 		{}
 	};
+	struct udev_enumerate *udev_enumerate;
 	const char *syspath = "/devices/virtual/mem/null";
 	const char *subsystem = NULL;
 	const char *socket = "@/org/kernel/udev/monitor";
@@ -270,7 +343,55 @@ int main(int argc, char *argv[], char *envp[])
 	test_device(udev, syspath);
 	test_device_devnum(udev);
 	test_device_parents(udev, syspath);
-	test_enumerate(udev, subsystem);
+
+	printf("enumerate '%s'\n", subsystem == NULL ? "<all>" : subsystem);
+	udev_enumerate = udev_enumerate_new(udev);
+	if (udev_enumerate == NULL)
+		return -1;
+	udev_enumerate_add_match_subsystem(udev_enumerate, subsystem);
+	udev_enumerate_scan_devices(udev_enumerate);
+	test_enumerate_print_list(udev_enumerate);
+	udev_enumerate_unref(udev_enumerate);
+
+	printf("enumerate 'block'\n");
+	udev_enumerate = udev_enumerate_new(udev);
+	if (udev_enumerate == NULL)
+		return -1;
+	udev_enumerate_add_match_subsystem(udev_enumerate,"block");
+	udev_enumerate_scan_devices(udev_enumerate);
+	test_enumerate_print_list(udev_enumerate);
+	udev_enumerate_unref(udev_enumerate);
+
+	printf("enumerate 'not block'\n");
+	udev_enumerate = udev_enumerate_new(udev);
+	if (udev_enumerate == NULL)
+		return -1;
+	udev_enumerate_add_nomatch_subsystem(udev_enumerate, "block");
+	udev_enumerate_scan_devices(udev_enumerate);
+	test_enumerate_print_list(udev_enumerate);
+	udev_enumerate_unref(udev_enumerate);
+
+	printf("enumerate 'pci, mem, vc'\n");
+	udev_enumerate = udev_enumerate_new(udev);
+	if (udev_enumerate == NULL)
+		return -1;
+	udev_enumerate_add_match_subsystem(udev_enumerate, "pci");
+	udev_enumerate_add_match_subsystem(udev_enumerate, "mem");
+	udev_enumerate_add_match_subsystem(udev_enumerate, "vc");
+	udev_enumerate_scan_devices(udev_enumerate);
+	test_enumerate_print_list(udev_enumerate);
+	udev_enumerate_unref(udev_enumerate);
+
+	printf("enumerate 'subsystem'\n");
+	udev_enumerate = udev_enumerate_new(udev);
+	if (udev_enumerate == NULL)
+		return -1;
+	udev_enumerate_scan_subsystems(udev_enumerate);
+	test_enumerate_print_list(udev_enumerate);
+	udev_enumerate_unref(udev_enumerate);
+
+	test_queue(udev);
+
 	test_monitor(udev, socket);
 out:
 	udev_unref(udev);