/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License"). You may not use this file except in compliance with the
- * License. Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
*
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
*
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/*
* @OSF_COPYRIGHT@
#ifndef _KERN_QUEUE_H_
#define _KERN_QUEUE_H_
-#include <kern/lock.h>
+#include <mach/mach_types.h>
#include <kern/macro_help.h>
/*
/*
* enqueue puts "elt" on the "queue".
* dequeue returns the first element in the "queue".
- * remqueue removes the specified "elt" from the specified "queue".
+ * remqueue removes the specified "elt" from its queue.
*/
#define enqueue(queue,elt) enqueue_tail(queue, elt)
#if !defined(__GNUC__)
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
/* Enqueue element to head of queue */
extern void enqueue_head(
queue_t que,
/* Dequeue element */
extern void remqueue(
- queue_t que,
queue_entry_t elt);
/* Enqueue element after a particular elem */
queue_entry_t pred);
/* Dequeue element */
-extern int remque(
+extern void remque(
queue_entry_t elt);
+__END_DECLS
+
+#else /* !__GNUC__ */
+
+#ifdef XNU_KERNEL_PRIVATE
+#define __DEQUEUE_ELT_CLEANUP(elt) do { \
+ (elt)->next = (queue_entry_t) 0; \
+ (elt)->prev = (queue_entry_t) 0; \
+ } while (0)
#else
+#define __DEQUEUE_ELT_CLEANUP(elt) do { } while(0)
+#endif /* !XNU_KERNEL_PRIVATE */
static __inline__ void
enqueue_head(
elt = que->next;
elt->next->prev = que;
que->next = elt->next;
+ __DEQUEUE_ELT_CLEANUP(elt);
}
return (elt);
elt = que->prev;
elt->prev->next = que;
que->prev = elt->prev;
+ __DEQUEUE_ELT_CLEANUP(elt);
}
return (elt);
static __inline__ void
remqueue(
- queue_t que,
queue_entry_t elt)
{
elt->next->prev = elt->prev;
elt->prev->next = elt->next;
+ __DEQUEUE_ELT_CLEANUP(elt);
}
static __inline__ void
pred->next = entry;
}
-static __inline__ integer_t
+static __inline__ void
remque(
register queue_entry_t elt)
{
(elt->next)->prev = elt->prev;
(elt->prev)->next = elt->next;
-
- return((integer_t)elt);
+ __DEQUEUE_ELT_CLEANUP(elt);
}
-#endif /* defined(__GNUC__) */
+#endif /* !__GNUC__ */
/*
* Macro: queue_init
*/
#define queue_enter(head, elt, type, field) \
MACRO_BEGIN \
- register queue_entry_t prev; \
+ register queue_entry_t __prev; \
\
- prev = (head)->prev; \
- if ((head) == prev) { \
+ __prev = (head)->prev; \
+ if ((head) == __prev) { \
(head)->next = (queue_entry_t) (elt); \
} \
else { \
- ((type)prev)->field.next = (queue_entry_t)(elt);\
+ ((type)__prev)->field.next = (queue_entry_t)(elt);\
} \
- (elt)->field.prev = prev; \
+ (elt)->field.prev = __prev; \
(elt)->field.next = head; \
(head)->prev = (queue_entry_t) elt; \
MACRO_END
*/
#define queue_enter_first(head, elt, type, field) \
MACRO_BEGIN \
- register queue_entry_t next; \
+ register queue_entry_t __next; \
\
- next = (head)->next; \
- if ((head) == next) { \
+ __next = (head)->next; \
+ if ((head) == __next) { \
(head)->prev = (queue_entry_t) (elt); \
} \
else { \
- ((type)next)->field.prev = (queue_entry_t)(elt);\
+ ((type)__next)->field.prev = (queue_entry_t)(elt);\
} \
- (elt)->field.next = next; \
+ (elt)->field.next = __next; \
(elt)->field.prev = head; \
(head)->next = (queue_entry_t) elt; \
MACRO_END
*/
#define queue_insert_before(head, elt, cur, type, field) \
MACRO_BEGIN \
- register queue_entry_t prev; \
+ register queue_entry_t __prev; \
\
if ((head) == (queue_entry_t)(cur)) { \
(elt)->field.next = (head); \
(elt)->field.prev = (head); \
(head)->next = (queue_entry_t)(elt); \
} else { /* last element */ \
- prev = (elt)->field.prev = (head)->prev; \
- ((type)prev)->field.next = (queue_entry_t)(elt);\
+ __prev = (elt)->field.prev = (head)->prev; \
+ ((type)__prev)->field.next = (queue_entry_t)(elt);\
} \
(head)->prev = (queue_entry_t)(elt); \
} else { \
(elt)->field.prev = (head); \
(head)->next = (queue_entry_t)(elt); \
} else { /* middle element */ \
- prev = (elt)->field.prev = (cur)->field.prev; \
- ((type)prev)->field.next = (queue_entry_t)(elt);\
+ __prev = (elt)->field.prev = (cur)->field.prev; \
+ ((type)__prev)->field.next = (queue_entry_t)(elt);\
} \
(cur)->field.prev = (queue_entry_t)(elt); \
} \
*/
#define queue_insert_after(head, elt, cur, type, field) \
MACRO_BEGIN \
- register queue_entry_t next; \
+ register queue_entry_t __next; \
\
if ((head) == (queue_entry_t)(cur)) { \
(elt)->field.prev = (head); \
(elt)->field.next = (head); \
(head)->prev = (queue_entry_t)(elt); \
} else { /* first element */ \
- next = (elt)->field.next = (head)->next; \
- ((type)next)->field.prev = (queue_entry_t)(elt);\
+ __next = (elt)->field.next = (head)->next; \
+ ((type)__next)->field.prev = (queue_entry_t)(elt);\
} \
(head)->next = (queue_entry_t)(elt); \
} else { \
(elt)->field.next = (head); \
(head)->prev = (queue_entry_t)(elt); \
} else { /* middle element */ \
- next = (elt)->field.next = (cur)->field.next; \
- ((type)next)->field.prev = (queue_entry_t)(elt);\
+ __next = (elt)->field.next = (cur)->field.next; \
+ ((type)__next)->field.prev = (queue_entry_t)(elt);\
} \
(cur)->field.next = (queue_entry_t)(elt); \
} \
*/
#define queue_remove(head, elt, type, field) \
MACRO_BEGIN \
- register queue_entry_t next, prev; \
+ register queue_entry_t __next, __prev; \
\
- next = (elt)->field.next; \
- prev = (elt)->field.prev; \
+ __next = (elt)->field.next; \
+ __prev = (elt)->field.prev; \
\
- if ((head) == next) \
- (head)->prev = prev; \
+ if ((head) == __next) \
+ (head)->prev = __prev; \
else \
- ((type)next)->field.prev = prev; \
+ ((type)__next)->field.prev = __prev; \
\
- if ((head) == prev) \
- (head)->next = next; \
+ if ((head) == __prev) \
+ (head)->next = __next; \
else \
- ((type)prev)->field.next = next; \
+ ((type)__prev)->field.next = __next; \
+ \
+ (elt)->field.next = NULL; \
+ (elt)->field.prev = NULL; \
MACRO_END
/*
*/
#define queue_remove_first(head, entry, type, field) \
MACRO_BEGIN \
- register queue_entry_t next; \
+ register queue_entry_t __next; \
\
(entry) = (type) ((head)->next); \
- next = (entry)->field.next; \
+ __next = (entry)->field.next; \
\
- if ((head) == next) \
+ if ((head) == __next) \
(head)->prev = (head); \
else \
- ((type)(next))->field.prev = (head); \
- (head)->next = next; \
+ ((type)(__next))->field.prev = (head); \
+ (head)->next = __next; \
+ \
+ (entry)->field.next = NULL; \
+ (entry)->field.prev = NULL; \
MACRO_END
/*
*/
#define queue_remove_last(head, entry, type, field) \
MACRO_BEGIN \
- register queue_entry_t prev; \
+ register queue_entry_t __prev; \
\
(entry) = (type) ((head)->prev); \
- prev = (entry)->field.prev; \
+ __prev = (entry)->field.prev; \
\
- if ((head) == prev) \
+ if ((head) == __prev) \
(head)->next = (head); \
else \
- ((type)(prev))->field.next = (head); \
- (head)->prev = prev; \
+ ((type)(__prev))->field.next = (head); \
+ (head)->prev = __prev; \
+ \
+ (entry)->field.next = NULL; \
+ (entry)->field.prev = NULL; \
MACRO_END
/*
*/
#define queue_new_head(old, new, type, field) \
MACRO_BEGIN \
- if (!queue_empty(new)) { \
+ if (!queue_empty(old)) { \
*(new) = *(old); \
((type)((new)->next))->field.prev = (new); \
((type)((new)->prev))->field.next = (new); \
!queue_end((head), (queue_entry_t)(elt)); \
(elt) = (type) queue_next(&(elt)->field))
-#include <sys/appleapiopts.h>
-
-#ifdef __APPLE_API_PRIVATE
-
#ifdef MACH_KERNEL_PRIVATE
+#include <kern/lock.h>
+
/*----------------------------------------------------------------*/
/*
* Define macros for queues with locks.
*/
struct mpqueue_head {
struct queue_entry head; /* header for queue */
- decl_simple_lock_data(, lock) /* lock for queue */
+ lck_mtx_t lock_data;
+ lck_mtx_ext_t lock_data_ext;
};
typedef struct mpqueue_head mpqueue_head_t;
#define round_mpq(size) (size)
-#define mpqueue_init(q) \
+
+#if defined(__i386__) || defined(__x86_64__)
+
+#define mpqueue_init(q, lck_grp, lck_attr) \
MACRO_BEGIN \
queue_init(&(q)->head); \
- simple_lock_init(&(q)->lock, ETAP_MISC_Q); \
+ lck_mtx_init_ext(&(q)->lock_data, \
+ &(q)->lock_data_ext, \
+ lck_grp, \
+ lck_attr); \
MACRO_END
+#else
+
+#define mpqueue_init(q, lck_grp, lck_attr) \
+MACRO_BEGIN \
+ queue_init(&(q)->head); \
+ lck_spin_init(&(q)->lock_data, \
+ lck_grp, \
+ lck_attr); \
+MACRO_END
+#endif
+
+
#define mpenqueue_tail(q, elt) \
MACRO_BEGIN \
- simple_lock(&(q)->lock); \
+ lck_mtx_lock_spin_always(&(q)->lock_data); \
enqueue_tail(&(q)->head, elt); \
- simple_unlock(&(q)->lock); \
+ lck_mtx_unlock_always(&(q)->lock_data); \
MACRO_END
#define mpdequeue_head(q, elt) \
MACRO_BEGIN \
- simple_lock(&(q)->lock); \
+ lck_mtx_lock_spin_always(&(q)->lock_data); \
if (queue_empty(&(q)->head)) \
*(elt) = 0; \
else \
*(elt) = dequeue_head(&(q)->head); \
- simple_unlock(&(q)->lock); \
+ lck_mtx_unlock_always(&(q)->lock_data); \
MACRO_END
#endif /* MACH_KERNEL_PRIVATE */
-#endif /* __APPLE_API_PRIVATE */
-
#endif /* _KERN_QUEUE_H_ */
projects / apple / xnu.git / blobdiff