[PATCH] skip waiting for device if we get a bad event for class creation

[elogind.git] / udevdb.c

diff --git a/udevdb.c b/udevdb.c
index c4dc4f005cbd307deadffcc51095180d058bb12d..23de22751d47802714d479df05ac5d997675580b 100644 (file)
--- a/udevdb.c
+++ b/udevdb.c
@@ -42,32 +42,38 @@
 #include "tdb/tdb.h"
 
 static TDB_CONTEXT *udevdb;
+sig_atomic_t gotalarm;
 
-
-int udevdb_add_dev(const char *path, const struct udevice *dev)
+int udevdb_add_dev(struct udevice *udev)
 {
        TDB_DATA key, data;
        char keystr[SYSFS_PATH_MAX];
 
-       if ((path == NULL) || (dev == NULL))
-               return -ENODEV;
+       if (udev->test_run)
+               return 0;
 
-       memset(keystr, 0, SYSFS_PATH_MAX);
-       strfieldcpy(keystr, path);
+       if (udevdb == NULL)
+               return -1;
+
+       memset(keystr, 0x00, SYSFS_PATH_MAX);
+       strfieldcpy(keystr, udev->devpath);
        key.dptr = keystr;
        key.dsize = strlen(keystr) + 1;
 
-       data.dptr = (void *)dev;
-       data.dsize = UDEVICE_LEN;
-       dbg("store key '%s' for device '%s'", path, dev->name);
+       data.dptr = (void *) udev;
+       data.dsize = UDEVICE_DB_LEN;
+       dbg("store key '%s' for device '%s'", keystr, udev->name);
 
        return tdb_store(udevdb, key, data, TDB_REPLACE); 
 }
 
-int udevdb_get_dev(const char *path, struct udevice *dev)
+int udevdb_get_dev(const char *path, struct udevice *udev)
 {
        TDB_DATA key, data;
 
+       if (udevdb == NULL)
+               return -1;
+
        if (path == NULL)
                return -ENODEV;
 
@@ -78,8 +84,9 @@ int udevdb_get_dev(const char *path, struct udevice *dev)
        if (data.dptr == NULL || data.dsize == 0)
                return -ENODEV;
 
-       memset(dev, 0, sizeof(struct udevice));
-       memcpy(dev, data.dptr, UDEVICE_LEN);
+       memset(udev, 0x00, sizeof(struct udevice));
+       memcpy(udev, data.dptr, UDEVICE_DB_LEN);
+
        return 0;
 }
 
@@ -88,6 +95,9 @@ int udevdb_delete_dev(const char *path)
        TDB_DATA key;
        char keystr[SYSFS_PATH_MAX];
 
+       if (udevdb == NULL)
+               return -1;
+
        if (path == NULL)
                return -EINVAL;
 
@@ -121,6 +131,8 @@ int udevdb_init(int init_flag)
        if (init_flag != UDEVDB_DEFAULT && init_flag != UDEVDB_INTERNAL)
                return -EINVAL;
 
+       tdb_set_lock_alarm(&gotalarm);
+
        udevdb = tdb_open(udev_db_filename, 0, init_flag, O_RDWR | O_CREAT, 0644);
        if (udevdb == NULL) {
                if (init_flag == UDEVDB_INTERNAL)
@@ -145,7 +157,7 @@ int udevdb_open_ro(void)
        return 0;
 }
 
-static int (*user_record_callback) (char *path, struct udevice *dev);
+static int (*user_record_callback) (const char *path, struct udevice *dev);
 
 static int traverse_callback(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
 {
@@ -156,10 +168,13 @@ static int traverse_callback(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void
  * udevdb_call_foreach: dumps whole database by passing record data to user function
  * @user_record_handler: user function called for every record in the database
  */
-int udevdb_call_foreach(int (*user_record_handler) (char *path, struct udevice *dev))
+int udevdb_call_foreach(int (*user_record_handler) (const char *path, struct udevice *dev))
 {
        int retval = 0;
 
+       if (udevdb == NULL)
+               return -1;
+
        if (user_record_handler == NULL) {
                dbg("invalid user record handling function");
                return -EINVAL;
@@ -177,27 +192,27 @@ static char *find_path;
 static const char *find_name;
 static int find_found;
 
-static int find_device_by_name(char *path, struct udevice *dev)
+static int find_device_by_name(const char *path, struct udevice *udev)
 {
        char *pos;
        int len;
 
-       if (strncmp(dev->name, find_name, sizeof(dev->name)) == 0) {
-               memcpy(find_dev, dev, sizeof(struct udevice));
+       if (strncmp(udev->name, find_name, sizeof(udev->name)) == 0) {
+               memcpy(find_dev, udev, sizeof(struct udevice));
                strfieldcpymax(find_path, path, NAME_SIZE);
                find_found = 1;
                /* stop search */
                return 1;
        }
        /* look for matching symlink*/
-       foreach_strpart(dev->symlink, " ", pos, len) {
+       foreach_strpart(udev->symlink, " ", pos, len) {
                if (strncmp(pos, find_name, len) != 0)
                        continue;
 
                if (len != strlen(find_name))
                        continue;
 
-               memcpy(find_dev, dev, sizeof(struct udevice));
+               memcpy(find_dev, udev, sizeof(struct udevice));
                strfieldcpymax(find_path, path, NAME_SIZE);
                find_found = 1;
                return 1;