*
* Copyright (C) 2008 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
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 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.
*/
#include <stdio.h>
struct udev *udev;
int refcount;
unsigned long long int last_seen_udev_seqnum;
- struct list_node queue_list;
- struct list_node failed_list;
+ struct udev_list_node queue_list;
+ struct udev_list_node failed_list;
};
struct udev_queue *udev_queue_new(struct udev *udev)
if (udev == NULL)
return NULL;
- udev_queue = malloc(sizeof(struct udev_queue));
+ udev_queue = calloc(1, sizeof(struct udev_queue));
if (udev_queue == NULL)
return NULL;
- memset(udev_queue, 0x00, sizeof(struct udev_queue));
udev_queue->refcount = 1;
udev_queue->udev = udev;
- list_init(&udev_queue->queue_list);
- list_init(&udev_queue->failed_list);
+ udev_list_init(&udev_queue->queue_list);
+ udev_list_init(&udev_queue->failed_list);
return udev_queue;
}
udev_queue->refcount--;
if (udev_queue->refcount > 0)
return;
- list_cleanup(udev_queue->udev, &udev_queue->queue_list);
- list_cleanup(udev_queue->udev, &udev_queue->failed_list);
+ udev_list_cleanup_entries(udev_queue->udev, &udev_queue->queue_list);
+ udev_list_cleanup_entries(udev_queue->udev, &udev_queue->failed_list);
free(udev_queue);
}
return 0;
buf[len-1] = '\0';
seqnum = strtoull(buf, NULL, 10);
- info(udev_queue->udev, "seqnum=%llu\n", seqnum);
+ dbg(udev_queue->udev, "seqnum=%llu\n", seqnum);
return seqnum;
}
return 0;
buf[len-1] = '\0';
seqnum = strtoull(buf, NULL, 10);
- info(udev_queue->udev, "seqnum=%llu\n", seqnum);
+ dbg(udev_queue->udev, "seqnum=%llu\n", seqnum);
udev_queue->last_seen_udev_seqnum = seqnum;
return seqnum;
}
+int udev_queue_get_udev_is_active(struct udev_queue *udev_queue)
+{
+ char filename[UTIL_PATH_SIZE];
+ struct stat statbuf;
+
+ if (udev_queue == NULL)
+ return 0;
+ util_strlcpy(filename, udev_get_dev_path(udev_queue->udev), sizeof(filename));
+ util_strlcat(filename, "/.udev/uevent_seqnum", sizeof(filename));
+ if (stat(filename, &statbuf) == 0)
+ return 1;
+ return 0;
+}
+
int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue)
{
char queuename[UTIL_PATH_SIZE];
util_strlcpy(queuename, udev_get_dev_path(udev_queue->udev), sizeof(queuename));
util_strlcat(queuename, "/.udev/queue", sizeof(queuename));
if (stat(queuename, &statbuf) == 0) {
- info(udev_queue->udev, "queue is not empty\n");
+ dbg(udev_queue->udev, "queue is not empty\n");
return 0;
}
seqnum_kernel = udev_queue_get_kernel_seqnum(udev_queue);
if (seqnum_kernel <= udev_queue->last_seen_udev_seqnum) {
- info(udev_queue->udev, "queue is empty\n");
+ dbg(udev_queue->udev, "queue is empty\n");
return 1;
}
- udev_queue_get_udev_seqnum(udev_queue);
+ /* update udev seqnum, and check if udev is still running */
+ if (udev_queue_get_udev_seqnum(udev_queue) == 0)
+ if (!udev_queue_get_udev_is_active(udev_queue))
+ return 1;
if (seqnum_kernel <= udev_queue->last_seen_udev_seqnum) {
- info(udev_queue->udev, "queue is empty\n");
+ dbg(udev_queue->udev, "queue is empty\n");
return 1;
}
- info(udev_queue->udev, "queue is empty, but kernel events still pending [%llu]<->[%llu]\n",
+ dbg(udev_queue->udev, "queue is empty, but kernel events still pending [%llu]<->[%llu]\n",
seqnum_kernel, udev_queue->last_seen_udev_seqnum);
return 0;
}
if (udev_queue == NULL)
return -EINVAL;
- /* if we have not seen this seqnum, check if it is/was already queued */
- if (seqnum < udev_queue->last_seen_udev_seqnum) {
- udev_queue_get_udev_seqnum(udev_queue);
- if (seqnum < udev_queue->last_seen_udev_seqnum)
+ /* did it reach the queue? */
+ if (seqnum > udev_queue->last_seen_udev_seqnum)
+ if (seqnum > udev_queue_get_udev_seqnum(udev_queue))
return 0;
- }
+ /* is it still in the queue? */
snprintf(filename, sizeof(filename), "%s/.udev/queue/%llu",
udev_get_dev_path(udev_queue->udev), seqnum);
- if (stat(filename, &statbuf) == 0)
+ if (lstat(filename, &statbuf) == 0)
return 0;
- info(udev_queue->udev, "seqnum: %llu finished\n", seqnum);
+ dbg(udev_queue->udev, "seqnum: %llu finished\n", seqnum);
return 1;
}
if (udev_queue == NULL)
return NULL;
- list_cleanup(udev_queue->udev, &udev_queue->queue_list);
+ udev_list_cleanup_entries(udev_queue->udev, &udev_queue->queue_list);
util_strlcpy(path, udev_get_dev_path(udev_queue->udev), sizeof(path));
util_strlcat(path, "/.udev/queue", sizeof(path));
dir = opendir(path);
if (len < 0 || len >= (ssize_t)(sizeof(syspath)-syslen))
continue;
syspath[syslen + len] = '\0';
- info(udev_queue->udev, "found '%s' [%s]\n", syspath, dent->d_name);
- list_entry_add(udev_queue->udev, &udev_queue->queue_list, syspath, dent->d_name, 0, 0);
+ dbg(udev_queue->udev, "found '%s' [%s]\n", syspath, dent->d_name);
+ udev_list_entry_add(udev_queue->udev, &udev_queue->queue_list, syspath, dent->d_name, 0, 0);
}
closedir(dir);
- return list_get_entry(&udev_queue->queue_list);
+ return udev_list_get_entry(&udev_queue->queue_list);
}
struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev_queue)
if (udev_queue == NULL)
return NULL;
- list_cleanup(udev_queue->udev, &udev_queue->failed_list);
+ udev_list_cleanup_entries(udev_queue->udev, &udev_queue->failed_list);
util_strlcpy(path, udev_get_dev_path(udev_queue->udev), sizeof(path));
util_strlcat(path, "/.udev/failed", sizeof(path));
dir = opendir(path);
if (len < 0 || len >= (ssize_t)(sizeof(syspath)-syslen))
continue;
syspath[syslen + len] = '\0';
- info(udev_queue->udev, "found '%s' [%s]\n", syspath, dent->d_name);
+ dbg(udev_queue->udev, "found '%s' [%s]\n", syspath, dent->d_name);
util_strlcpy(filename, syspath, sizeof(filename));
util_strlcat(filename, "/uevent", sizeof(filename));
if (stat(filename, &statbuf) != 0)
continue;
- list_entry_add(udev_queue->udev, &udev_queue->failed_list, syspath, NULL, 0, 0);
+ udev_list_entry_add(udev_queue->udev, &udev_queue->failed_list, syspath, NULL, 0, 0);
}
closedir(dir);
- return list_get_entry(&udev_queue->failed_list);
+ return udev_list_get_entry(&udev_queue->failed_list);
}
-int queue_export_udev_seqnum(struct udev_queue *udev_queue, unsigned long long int seqnum)
+int udev_queue_export_udev_seqnum(struct udev_queue *udev_queue, unsigned long long int seqnum)
{
- return 0;
+ return -1;
}
-extern int queue_export_device_queued(struct udev_queue *udev_queue, struct udev_device *udev_device)
+extern int udev_queue_export_device_queued(struct udev_queue *udev_queue, struct udev_device *udev_device)
{
- return 0;
+ return -1;
}
-extern int queue_export_device_finished(struct udev_queue *udev_queue, struct udev_device *udev_device)
+extern int udev_queue_export_device_finished(struct udev_queue *udev_queue, struct udev_device *udev_device)
{
- return 0;
+ return -1;
}
-extern int queue_export_device_failed(struct udev_queue *udev_queue, struct udev_device *udev_device)
+extern int udev_queue_export_device_failed(struct udev_queue *udev_queue, struct udev_device *udev_device)
{
- return 0;
+ return -1;
}
~ianmdlvl / elogind.git / blobdiff