chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libudev: list - properly sort linked list not only the index
[elogind.git]
/
libudev
/
libudev-queue.c
diff --git
a/libudev/libudev-queue.c
b/libudev/libudev-queue.c
index be6409d02a4d82e462f0400d2f5d30aead2fa9d7..744696df2b85499242051145e6542471069e4989 100644
(file)
--- a/
libudev/libudev-queue.c
+++ b/
libudev/libudev-queue.c
@@
-42,8
+42,8
@@
struct udev_queue {
struct udev *udev;
int refcount;
struct udev_queue {
struct udev *udev;
int refcount;
- struct udev_list
_node
queue_list;
- struct udev_list
_node
failed_list;
+ struct udev_list queue_list;
+ struct udev_list failed_list;
};
/**
};
/**
@@
-55,7
+55,7
@@
struct udev_queue {
*
* Returns: the udev queue context, or #NULL on error.
**/
*
* Returns: the udev queue context, or #NULL on error.
**/
-struct udev_queue *udev_queue_new(struct udev *udev)
+
UDEV_EXPORT
struct udev_queue *udev_queue_new(struct udev *udev)
{
struct udev_queue *udev_queue;
{
struct udev_queue *udev_queue;
@@
-67,8
+67,8
@@
struct udev_queue *udev_queue_new(struct udev *udev)
return NULL;
udev_queue->refcount = 1;
udev_queue->udev = udev;
return NULL;
udev_queue->refcount = 1;
udev_queue->udev = udev;
- udev_list_init(
&udev_queue->queue_list
);
- udev_list_init(
&udev_queue->failed_list
);
+ udev_list_init(
udev, &udev_queue->queue_list, false
);
+ udev_list_init(
udev, &udev_queue->failed_list, false
);
return udev_queue;
}
return udev_queue;
}
@@
-80,7
+80,7
@@
struct udev_queue *udev_queue_new(struct udev *udev)
*
* Returns: the same udev queue context.
**/
*
* Returns: the same udev queue context.
**/
-struct udev_queue *udev_queue_ref(struct udev_queue *udev_queue)
+
UDEV_EXPORT
struct udev_queue *udev_queue_ref(struct udev_queue *udev_queue)
{
if (udev_queue == NULL)
return NULL;
{
if (udev_queue == NULL)
return NULL;
@@
-95,15
+95,15
@@
struct udev_queue *udev_queue_ref(struct udev_queue *udev_queue)
* Drop a reference of a udev queue context. If the refcount reaches zero,
* the resources of the queue context will be released.
**/
* Drop a reference of a udev queue context. If the refcount reaches zero,
* the resources of the queue context will be released.
**/
-void udev_queue_unref(struct udev_queue *udev_queue)
+
UDEV_EXPORT
void udev_queue_unref(struct udev_queue *udev_queue)
{
if (udev_queue == NULL)
return;
udev_queue->refcount--;
if (udev_queue->refcount > 0)
return;
{
if (udev_queue == NULL)
return;
udev_queue->refcount--;
if (udev_queue->refcount > 0)
return;
- udev_list_cleanup
_entries(udev_queue->udev,
&udev_queue->queue_list);
- udev_list_cleanup
_entries(udev_queue->udev,
&udev_queue->failed_list);
+ udev_list_cleanup
(
&udev_queue->queue_list);
+ udev_list_cleanup
(
&udev_queue->failed_list);
free(udev_queue);
}
free(udev_queue);
}
@@
-115,7
+115,7
@@
void udev_queue_unref(struct udev_queue *udev_queue)
*
* Returns: the udev library context.
**/
*
* Returns: the udev library context.
**/
-struct udev *udev_queue_get_udev(struct udev_queue *udev_queue)
+
UDEV_EXPORT
struct udev *udev_queue_get_udev(struct udev_queue *udev_queue)
{
if (udev_queue == NULL)
return NULL;
{
if (udev_queue == NULL)
return NULL;
@@
-149,7
+149,7
@@
unsigned long long int udev_get_kernel_seqnum(struct udev *udev)
*
* Returns: the current kernel event sequence number.
**/
*
* Returns: the current kernel event sequence number.
**/
-unsigned long long int udev_queue_get_kernel_seqnum(struct udev_queue *udev_queue)
+
UDEV_EXPORT
unsigned long long int udev_queue_get_kernel_seqnum(struct udev_queue *udev_queue)
{
unsigned long long int seqnum;
{
unsigned long long int seqnum;
@@
-234,7
+234,7
@@
static FILE *open_queue_file(struct udev_queue *udev_queue, unsigned long long i
*
* Returns: the last known udev event sequence number.
**/
*
* Returns: the last known udev event sequence number.
**/
-unsigned long long int udev_queue_get_udev_seqnum(struct udev_queue *udev_queue)
+
UDEV_EXPORT
unsigned long long int udev_queue_get_udev_seqnum(struct udev_queue *udev_queue)
{
unsigned long long int seqnum_udev;
FILE *queue_file;
{
unsigned long long int seqnum_udev;
FILE *queue_file;
@@
-266,7
+266,7
@@
unsigned long long int udev_queue_get_udev_seqnum(struct udev_queue *udev_queue)
*
* Returns: a flag indicating if udev is active.
**/
*
* Returns: a flag indicating if udev is active.
**/
-int udev_queue_get_udev_is_active(struct udev_queue *udev_queue)
+
UDEV_EXPORT
int udev_queue_get_udev_is_active(struct udev_queue *udev_queue)
{
unsigned long long int seqnum_start;
FILE *queue_file;
{
unsigned long long int seqnum_start;
FILE *queue_file;
@@
-285,7
+285,7
@@
int udev_queue_get_udev_is_active(struct udev_queue *udev_queue)
*
* Returns: a flag indicating if udev is currently handling events.
**/
*
* Returns: a flag indicating if udev is currently handling events.
**/
-int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue)
+
UDEV_EXPORT
int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue)
{
unsigned long long int seqnum_kernel;
unsigned long long int seqnum_udev = 0;
{
unsigned long long int seqnum_kernel;
unsigned long long int seqnum_udev = 0;
@@
-345,7
+345,7
@@
out:
*
* Returns: a flag indicating if any of the sequence numbers in the given range is currently active.
**/
*
* Returns: a flag indicating if any of the sequence numbers in the given range is currently active.
**/
-int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *udev_queue,
+
UDEV_EXPORT
int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *udev_queue,
unsigned long long int start, unsigned long long int end)
{
unsigned long long int seqnum;
unsigned long long int start, unsigned long long int end)
{
unsigned long long int seqnum;
@@
-407,7
+407,7
@@
int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *udev_queue,
*
* Returns: a flag indicating if the given sequence number is currently active.
**/
*
* Returns: a flag indicating if the given sequence number is currently active.
**/
-int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, unsigned long long int seqnum)
+
UDEV_EXPORT
int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, unsigned long long int seqnum)
{
if (!udev_queue_get_seqnum_sequence_is_finished(udev_queue, seqnum, seqnum))
return 0;
{
if (!udev_queue_get_seqnum_sequence_is_finished(udev_queue, seqnum, seqnum))
return 0;
@@
-422,14
+422,14
@@
int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, unsigned lo
*
* Returns: the first entry of the list of queued events.
**/
*
* Returns: the first entry of the list of queued events.
**/
-struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev_queue)
+
UDEV_EXPORT
struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev_queue)
{
unsigned long long int seqnum;
FILE *queue_file;
if (udev_queue == NULL)
return NULL;
{
unsigned long long int seqnum;
FILE *queue_file;
if (udev_queue == NULL)
return NULL;
- udev_list_cleanup
_entries(udev_queue->udev,
&udev_queue->queue_list);
+ udev_list_cleanup
(
&udev_queue->queue_list);
queue_file = open_queue_file(udev_queue, &seqnum);
if (queue_file == NULL)
queue_file = open_queue_file(udev_queue, &seqnum);
if (queue_file == NULL)
@@
-454,7
+454,7
@@
struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev
break;
if (len > 0) {
break;
if (len > 0) {
- udev_list_entry_add(
udev_queue->udev, &udev_queue->queue_list, syspath, seqnum_str, 0
);
+ udev_list_entry_add(
&udev_queue->queue_list, syspath, seqnum_str
);
} else {
udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_queue->queue_list)) {
if (strcmp(seqnum_str, udev_list_entry_get_value(list_entry)) == 0) {
} else {
udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_queue->queue_list)) {
if (strcmp(seqnum_str, udev_list_entry_get_value(list_entry)) == 0) {
@@
-475,7
+475,7
@@
struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev
*
* Returns: the first entry of the list of recorded failed events.
**/
*
* Returns: the first entry of the list of recorded failed events.
**/
-struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev_queue)
+
UDEV_EXPORT
struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev_queue)
{
char path[UTIL_PATH_SIZE];
DIR *dir;
{
char path[UTIL_PATH_SIZE];
DIR *dir;
@@
-483,7
+483,7
@@
struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev
if (udev_queue == NULL)
return NULL;
if (udev_queue == NULL)
return NULL;
- udev_list_cleanup
_entries(udev_queue->udev,
&udev_queue->failed_list);
+ udev_list_cleanup
(
&udev_queue->failed_list);
util_strscpyl(path, sizeof(path), udev_get_run_path(udev_queue->udev), "/failed", NULL);
dir = opendir(path);
if (dir == NULL)
util_strscpyl(path, sizeof(path), udev_get_run_path(udev_queue->udev), "/failed", NULL);
dir = opendir(path);
if (dir == NULL)
@@
-508,7
+508,7
@@
struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev
util_strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL);
if (stat(filename, &statbuf) != 0)
continue;
util_strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL);
if (stat(filename, &statbuf) != 0)
continue;
- udev_list_entry_add(
udev_queue->udev, &udev_queue->failed_list, syspath, NULL, 0
);
+ udev_list_entry_add(
&udev_queue->failed_list, syspath, NULL
);
}
closedir(dir);
return udev_list_get_entry(&udev_queue->failed_list);
}
closedir(dir);
return udev_list_get_entry(&udev_queue->failed_list);