X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-libudev.c;h=293c151d425e066030c3fe02c65cfd4274b1ce90;hp=481ce65dbf57b4e1b4d164695d5795f125340cc9;hb=2822da4fb7f891e5320f02f1d00f64b72221ced4;hpb=33502ffe2eb7b56cdd018a4fb6830d7828519fad diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c index 481ce65db..293c151d4 100644 --- a/src/test/test-libudev.c +++ b/src/test/test-libudev.c @@ -1,13 +1,22 @@ -/* - * test-libudev - * - * Copyright (C) 2008 Kay Sievers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - */ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ +/*** + This file is part of systemd. + + Copyright 2008-2012 Kay Sievers + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ #include #include @@ -16,25 +25,16 @@ #include #include #include -#include #include #include #include "libudev.h" +#include "udev-util.h" #include "util.h" #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -static void log_fn(struct udev *udev, - int priority, const char *file, int line, const char *fn, - const char *format, va_list args) -{ - printf("test-libudev: %s %s:%d ", fn, file, line); - vprintf(format, args); -} - -static void print_device(struct udev_device *device) -{ +static void print_device(struct udev_device *device) { const char *str; dev_t devnum; int count; @@ -107,9 +107,8 @@ static void print_device(struct udev_device *device) printf("\n"); } -static int test_device(struct udev *udev, const char *syspath) -{ - struct udev_device *device; +static int test_device(struct udev *udev, const char *syspath) { + _cleanup_udev_device_unref_ struct udev_device *device; printf("looking at device: %s\n", syspath); device = udev_device_new_from_syspath(udev, syspath); @@ -118,13 +117,12 @@ static int test_device(struct udev *udev, const char *syspath) return -1; } print_device(device); - udev_device_unref(device); + return 0; } -static int test_device_parents(struct udev *udev, const char *syspath) -{ - struct udev_device *device; +static int test_device_parents(struct udev *udev, const char *syspath) { + _cleanup_udev_device_unref_ struct udev_device *device; struct udev_device *device_parent; printf("looking at device: %s\n", syspath); @@ -145,13 +143,11 @@ static int test_device_parents(struct udev *udev, const char *syspath) 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) -{ +static int test_device_devnum(struct udev *udev) { dev_t devnum = makedev(1, 3); struct udev_device *device; @@ -164,8 +160,7 @@ static int test_device_devnum(struct udev *udev) return 0; } -static int test_device_subsys_name(struct udev *udev) -{ +static int test_device_subsys_name(struct udev *udev) { struct udev_device *device; printf("looking up device: 'block':'sda'\n"); @@ -198,8 +193,7 @@ static int test_device_subsys_name(struct udev *udev) return 0; } -static int test_enumerate_print_list(struct udev_enumerate *enumerate) -{ +static int test_enumerate_print_list(struct udev_enumerate *enumerate) { struct udev_list_entry *list_entry; int count = 0; @@ -220,8 +214,7 @@ static int test_enumerate_print_list(struct udev_enumerate *enumerate) return count; } -static int test_monitor(struct udev *udev) -{ +static int test_monitor(struct udev *udev) { struct udev_monitor *udev_monitor = NULL; int fd_ep; int fd_udev = -1; @@ -252,7 +245,7 @@ static int test_monitor(struct udev *udev) goto out; } - memset(&ep_udev, 0, sizeof(struct epoll_event)); + memzero(&ep_udev, sizeof(struct epoll_event)); ep_udev.events = EPOLLIN; ep_udev.data.fd = fd_udev; if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_udev, &ep_udev) < 0) { @@ -260,7 +253,7 @@ static int test_monitor(struct udev *udev) goto out; } - memset(&ep_stdin, 0, sizeof(struct epoll_event)); + memzero(&ep_stdin, sizeof(struct epoll_event)); ep_stdin.events = EPOLLIN; ep_stdin.data.fd = STDIN_FILENO; if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, STDIN_FILENO, &ep_stdin) < 0) { @@ -300,47 +293,21 @@ out: return 0; } -static int test_queue(struct udev *udev) -{ +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"); - 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; } -static int test_enumerate(struct udev *udev, const char *subsystem) -{ +static int test_enumerate(struct udev *udev, const char *subsystem) { struct udev_enumerate *udev_enumerate; printf("enumerate '%s'\n", subsystem == NULL ? "" : subsystem); @@ -421,8 +388,21 @@ static int test_enumerate(struct udev *udev, const char *subsystem) return 0; } -int main(int argc, char *argv[]) -{ +static void test_hwdb(struct udev *udev, const char *modalias) { + struct udev_hwdb *hwdb; + struct udev_list_entry *entry; + + hwdb = udev_hwdb_new(udev); + + udev_list_entry_foreach(entry, udev_hwdb_get_properties_list_entry(hwdb, modalias, 0)) + printf("'%s'='%s'\n", udev_list_entry_get_name(entry), udev_list_entry_get_value(entry)); + printf("\n"); + + hwdb = udev_hwdb_unref(hwdb); + assert_se(hwdb == NULL); +} + +int main(int argc, char *argv[]) { struct udev *udev = NULL; static const struct option options[] = { { "syspath", required_argument, NULL, 'p' }, @@ -435,6 +415,7 @@ int main(int argc, char *argv[]) const char *syspath = "/devices/virtual/mem/null"; const char *subsystem = NULL; char path[1024]; + int c; udev = udev_new(); printf("context: %p\n", udev); @@ -442,37 +423,38 @@ int main(int argc, char *argv[]) printf("no context\n"); return 1; } - udev_set_log_fn(udev, log_fn); - printf("set log: %p\n", log_fn); - for (;;) { - int option; + while ((c = getopt_long(argc, argv, "p:s:dhV", options, NULL)) >= 0) + switch (c) { - option = getopt_long(argc, argv, "+p:s:dhV", options, NULL); - if (option == -1) - break; - - switch (option) { case 'p': syspath = optarg; break; + case 's': subsystem = optarg; break; + case 'd': - if (udev_get_log_priority(udev) < LOG_INFO) - udev_set_log_priority(udev, LOG_INFO); + if (log_get_max_level() < LOG_INFO) + log_set_max_level(LOG_INFO); break; + case 'h': printf("--debug --syspath= --subsystem= --help\n"); goto out; + case 'V': printf("%s\n", VERSION); goto out; - default: + + case '?': goto out; + + default: + assert_not_reached("Unhandled option code."); } - } + /* add sys path if needed */ if (!startswith(syspath, "/sys")) { @@ -489,6 +471,8 @@ int main(int argc, char *argv[]) test_queue(udev); + test_hwdb(udev, "usb:v0D50p0011*"); + test_monitor(udev); out: udev_unref(udev);