X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Flibudev-queue.c;h=72408d016606438917475cbf4c076d8b4d09acab;hb=74afee9c18fe74035387e4e17ca60c6b51ee9af3;hp=48184ddaa61fe0d33eddf6c61ca1356beadba1ad;hpb=fc863deadaf07da24f3593fca6c6e09b62cd772c;p=elogind.git diff --git a/src/udev/libudev-queue.c b/src/udev/libudev-queue.c index 48184ddaa..72408d016 100644 --- a/src/udev/libudev-queue.c +++ b/src/udev/libudev-queue.c @@ -54,7 +54,7 @@ struct udev_queue { * * Returns: the udev queue context, or #NULL on error. **/ -UDEV_EXPORT struct udev_queue *udev_queue_new(struct udev *udev) +_public_ struct udev_queue *udev_queue_new(struct udev *udev) { struct udev_queue *udev_queue; @@ -78,7 +78,7 @@ UDEV_EXPORT struct udev_queue *udev_queue_new(struct udev *udev) * * Returns: the same udev queue context. **/ -UDEV_EXPORT struct udev_queue *udev_queue_ref(struct udev_queue *udev_queue) +_public_ struct udev_queue *udev_queue_ref(struct udev_queue *udev_queue) { if (udev_queue == NULL) return NULL; @@ -93,7 +93,7 @@ UDEV_EXPORT 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. **/ -UDEV_EXPORT void udev_queue_unref(struct udev_queue *udev_queue) +_public_ void udev_queue_unref(struct udev_queue *udev_queue) { if (udev_queue == NULL) return; @@ -112,7 +112,7 @@ UDEV_EXPORT void udev_queue_unref(struct udev_queue *udev_queue) * * Returns: the udev library context. **/ -UDEV_EXPORT struct udev *udev_queue_get_udev(struct udev_queue *udev_queue) +_public_ struct udev *udev_queue_get_udev(struct udev_queue *udev_queue) { if (udev_queue == NULL) return NULL; @@ -146,7 +146,7 @@ unsigned long long int udev_get_kernel_seqnum(struct udev *udev) * * Returns: the current kernel event sequence number. **/ -UDEV_EXPORT unsigned long long int udev_queue_get_kernel_seqnum(struct udev_queue *udev_queue) +_public_ unsigned long long int udev_queue_get_kernel_seqnum(struct udev_queue *udev_queue) { unsigned long long int seqnum; @@ -154,7 +154,6 @@ UDEV_EXPORT unsigned long long int udev_queue_get_kernel_seqnum(struct udev_queu return -EINVAL; seqnum = udev_get_kernel_seqnum(udev_queue->udev); - dbg(udev_queue->udev, "seqnum=%llu\n", seqnum); return seqnum; } @@ -231,7 +230,7 @@ static FILE *open_queue_file(struct udev_queue *udev_queue, unsigned long long i * * Returns: the last known udev event sequence number. **/ -UDEV_EXPORT unsigned long long int udev_queue_get_udev_seqnum(struct udev_queue *udev_queue) +_public_ unsigned long long int udev_queue_get_udev_seqnum(struct udev_queue *udev_queue) { unsigned long long int seqnum_udev; FILE *queue_file; @@ -263,7 +262,7 @@ UDEV_EXPORT unsigned long long int udev_queue_get_udev_seqnum(struct udev_queue * * Returns: a flag indicating if udev is active. **/ -UDEV_EXPORT int udev_queue_get_udev_is_active(struct udev_queue *udev_queue) +_public_ int udev_queue_get_udev_is_active(struct udev_queue *udev_queue) { unsigned long long int seqnum_start; FILE *queue_file; @@ -282,7 +281,7 @@ UDEV_EXPORT int udev_queue_get_udev_is_active(struct udev_queue *udev_queue) * * Returns: a flag indicating if udev is currently handling events. **/ -UDEV_EXPORT int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue) +_public_ 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; @@ -314,19 +313,13 @@ UDEV_EXPORT int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue) } } - if (queued > 0) { - dbg(udev_queue->udev, "queue is not empty\n"); + if (queued > 0) goto out; - } seqnum_kernel = udev_queue_get_kernel_seqnum(udev_queue); - if (seqnum_udev < seqnum_kernel) { - dbg(udev_queue->udev, "queue is empty but kernel events still pending [%llu]<->[%llu]\n", - seqnum_kernel, seqnum_udev); + if (seqnum_udev < seqnum_kernel) goto out; - } - dbg(udev_queue->udev, "queue is empty\n"); is_empty = 1; out: @@ -342,7 +335,7 @@ out: * * Returns: a flag indicating if any of the sequence numbers in the given range is currently active. **/ -UDEV_EXPORT int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *udev_queue, +_public_ 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; @@ -404,12 +397,11 @@ UDEV_EXPORT int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *ud * * Returns: a flag indicating if the given sequence number is currently active. **/ -UDEV_EXPORT int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, unsigned long long int seqnum) +_public_ 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; - dbg(udev_queue->udev, "seqnum: %llu finished\n", seqnum); return 1; } @@ -419,7 +411,7 @@ UDEV_EXPORT int udev_queue_get_seqnum_is_finished(struct udev_queue *udev_queue, * * Returns: the first entry of the list of queued events. **/ -UDEV_EXPORT struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev_queue) +_public_ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev_queue) { unsigned long long int seqnum; FILE *queue_file; @@ -467,7 +459,7 @@ UDEV_EXPORT struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev } 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) +_public_ struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev_queue) { errno = ENOSYS; return NULL;