X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Furcu%2Fwfcqueue.h;h=2119e8d24ce49a431d70e133d5bf766e4eb2cec4;hb=ee990caca068cbc4618c4b10956096c40ab0b330;hp=a539d92f85c2fdb4fc66255fa3e608eac9ba3c36;hpb=0cdbb569aa571e738df8f4280e47ab0aadad576a;p=urcu.git

diff --git a/include/urcu/wfcqueue.h b/include/urcu/wfcqueue.h
index a539d92..2119e8d 100644
--- a/include/urcu/wfcqueue.h
+++ b/include/urcu/wfcqueue.h
@@ -107,8 +107,8 @@ static inline struct cds_wfcq_head *cds_wfcq_head_cast(struct cds_wfcq_head *hea
 #else /* #ifndef __cplusplus */
 
 /*
- * This static inline is used by C++ function overloading. It is also
- * used internally in the static inline implementation of the API.
+ * This static inline is used by internally in the static inline
+ * implementation of the API.
  */
 static inline cds_wfcq_head_ptr_t __cds_wfcq_head_cast(struct __cds_wfcq_head *head)
 {
@@ -117,8 +117,8 @@ static inline cds_wfcq_head_ptr_t __cds_wfcq_head_cast(struct __cds_wfcq_head *h
 }
 
 /*
- * This static inline is used by C++ function overloading. It is also
- * used internally in the static inline implementation of the API.
+ * This static inline is used by internally in the static inline
+ * implementation of the API.
  */
 static inline cds_wfcq_head_ptr_t cds_wfcq_head_cast(struct cds_wfcq_head *head)
 {
@@ -492,252 +492,107 @@ extern struct cds_wfcq_node *__cds_wfcq_next_nonblocking(
  * to obtain an API similar to C.
  */
 
-static inline bool cds_wfcq_empty(struct __cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail)
+static inline cds_wfcq_head_ptr_t cds_wfcq_head_cast_cpp(struct __cds_wfcq_head *head)
 {
-	return cds_wfcq_empty(__cds_wfcq_head_cast(head), tail);
+	cds_wfcq_head_ptr_t ret = { ._h = head };
+	return ret;
 }
 
-static inline bool cds_wfcq_empty(struct cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail)
+static inline cds_wfcq_head_ptr_t cds_wfcq_head_cast_cpp(struct cds_wfcq_head *head)
 {
-	return cds_wfcq_empty(cds_wfcq_head_cast(head), tail);
+	cds_wfcq_head_ptr_t ret = { .h = head };
+	return ret;
 }
 
-static inline bool cds_wfcq_enqueue(struct __cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail,
-		struct cds_wfcq_node *node)
+template<typename T> static inline bool cds_wfcq_empty(T head,
+		struct cds_wfcq_tail *tail)
 {
-	return cds_wfcq_enqueue(__cds_wfcq_head_cast(head), tail, node);
+	return cds_wfcq_empty(cds_wfcq_head_cast_cpp(head), tail);
 }
 
-static inline bool cds_wfcq_enqueue(struct cds_wfcq_head *head,
+template<typename T> static inline bool cds_wfcq_enqueue(T head,
 		struct cds_wfcq_tail *tail,
 		struct cds_wfcq_node *node)
 {
-	return cds_wfcq_enqueue(cds_wfcq_head_cast(head), tail, node);
-}
-
-static inline struct cds_wfcq_node *__cds_wfcq_dequeue_blocking(
-		struct __cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail)
-{
-	return __cds_wfcq_dequeue_blocking(__cds_wfcq_head_cast(head), tail);
-}
-
-static inline struct cds_wfcq_node *__cds_wfcq_dequeue_blocking(
-		struct cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail)
-{
-	return __cds_wfcq_dequeue_blocking(cds_wfcq_head_cast(head), tail);
+	return cds_wfcq_enqueue(cds_wfcq_head_cast_cpp(head), tail, node);
 }
 
-static inline struct cds_wfcq_node *__cds_wfcq_dequeue_with_state_blocking(
-		struct __cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail,
-		int *state)
+template<typename T> static inline struct cds_wfcq_node *__cds_wfcq_dequeue_blocking(
+		T head, struct cds_wfcq_tail *tail)
 {
-	return __cds_wfcq_dequeue_with_state_blocking(__cds_wfcq_head_cast(head),
-			tail, state);
+	return __cds_wfcq_dequeue_blocking(cds_wfcq_head_cast_cpp(head), tail);
 }
 
-static inline struct cds_wfcq_node *__cds_wfcq_dequeue_with_state_blocking(
-		struct cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail,
-		int *state)
+template<typename T> static inline struct cds_wfcq_node *__cds_wfcq_dequeue_with_state_blocking(
+		T head, struct cds_wfcq_tail *tail, int *state)
 {
-	return __cds_wfcq_dequeue_with_state_blocking(cds_wfcq_head_cast(head),
+	return __cds_wfcq_dequeue_with_state_blocking(cds_wfcq_head_cast_cpp(head),
 			tail, state);
 }
 
-static inline struct cds_wfcq_node *__cds_wfcq_dequeue_nonblocking(
-		struct __cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail)
+template<typename T> static inline struct cds_wfcq_node *__cds_wfcq_dequeue_nonblocking(
+		T head, struct cds_wfcq_tail *tail)
 {
-	return __cds_wfcq_dequeue_nonblocking(__cds_wfcq_head_cast(head), tail);
+	return __cds_wfcq_dequeue_nonblocking(cds_wfcq_head_cast_cpp(head), tail);
 }
 
-static inline struct cds_wfcq_node *__cds_wfcq_dequeue_nonblocking(
-		struct cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail)
+template<typename T> static inline struct cds_wfcq_node *__cds_wfcq_dequeue_with_state_nonblocking(
+		T head, struct cds_wfcq_tail *tail, int *state)
 {
-	return __cds_wfcq_dequeue_nonblocking(cds_wfcq_head_cast(head), tail);
-}
-
-static inline struct cds_wfcq_node *__cds_wfcq_dequeue_with_state_nonblocking(
-		struct __cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail,
-		int *state)
-{
-	return __cds_wfcq_dequeue_with_state_nonblocking(__cds_wfcq_head_cast(head),
-			tail, state);
-}
-
-static inline struct cds_wfcq_node *__cds_wfcq_dequeue_with_state_nonblocking(
-		struct cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail,
-		int *state)
-{
-	return __cds_wfcq_dequeue_with_state_nonblocking(cds_wfcq_head_cast(head),
+	return __cds_wfcq_dequeue_with_state_nonblocking(cds_wfcq_head_cast_cpp(head),
 			tail, state);
 }
 
-/* Support the power set of type combinations. */
-static inline enum cds_wfcq_ret __cds_wfcq_splice_blocking(
-		struct __cds_wfcq_head *dest_q_head,
+template<typename T, typename U> static inline enum cds_wfcq_ret __cds_wfcq_splice_blocking(
+		T dest_q_head,
 		struct cds_wfcq_tail *dest_q_tail,
-		struct __cds_wfcq_head *src_q_head,
+		U src_q_head,
 		struct cds_wfcq_tail *src_q_tail)
 {
-	return __cds_wfcq_splice_blocking(__cds_wfcq_head_cast(dest_q_head),
+	return __cds_wfcq_splice_blocking(cds_wfcq_head_cast_cpp(dest_q_head),
 			dest_q_tail,
-			__cds_wfcq_head_cast(src_q_head),
+			cds_wfcq_head_cast_cpp(src_q_head),
 			src_q_tail);
 }
 
-static inline enum cds_wfcq_ret __cds_wfcq_splice_blocking(
-		struct cds_wfcq_head *dest_q_head,
+template<typename T, typename U> static inline enum cds_wfcq_ret __cds_wfcq_splice_nonblocking(
+		T dest_q_head,
 		struct cds_wfcq_tail *dest_q_tail,
-		struct __cds_wfcq_head *src_q_head,
+		U *src_q_head,
 		struct cds_wfcq_tail *src_q_tail)
 {
-	return __cds_wfcq_splice_blocking(cds_wfcq_head_cast(dest_q_head),
+	return __cds_wfcq_splice_nonblocking(cds_wfcq_head_cast_cpp(dest_q_head),
 			dest_q_tail,
-			__cds_wfcq_head_cast(src_q_head),
+			cds_wfcq_head_cast_cpp(src_q_head),
 			src_q_tail);
 }
 
-static inline enum cds_wfcq_ret __cds_wfcq_splice_blocking(
-		struct __cds_wfcq_head *dest_q_head,
-		struct cds_wfcq_tail *dest_q_tail,
-		struct cds_wfcq_head *src_q_head,
-		struct cds_wfcq_tail *src_q_tail)
+template<typename T> static inline struct cds_wfcq_node *__cds_wfcq_first_blocking(
+		T head, struct cds_wfcq_tail *tail)
 {
-	return __cds_wfcq_splice_blocking(__cds_wfcq_head_cast(dest_q_head),
-			dest_q_tail,
-			cds_wfcq_head_cast(src_q_head),
-			src_q_tail);
+	return __cds_wfcq_first_blocking(cds_wfcq_head_cast_cpp(head), tail);
 }
 
-static inline enum cds_wfcq_ret __cds_wfcq_splice_blocking(
-		struct cds_wfcq_head *dest_q_head,
-		struct cds_wfcq_tail *dest_q_tail,
-		struct cds_wfcq_head *src_q_head,
-		struct cds_wfcq_tail *src_q_tail)
+template<typename T> static inline struct cds_wfcq_node *__cds_wfcq_first_nonblocking(
+		T head, struct cds_wfcq_tail *tail)
 {
-	return __cds_wfcq_splice_blocking(cds_wfcq_head_cast(dest_q_head),
-			dest_q_tail,
-			cds_wfcq_head_cast(src_q_head),
-			src_q_tail);
+	return __cds_wfcq_first_nonblocking(cds_wfcq_head_cast_cpp(head), tail);
 }
 
-/* Support the power set of type combinations. */
-static inline enum cds_wfcq_ret __cds_wfcq_splice_nonblocking(
-		struct __cds_wfcq_head *dest_q_head,
-		struct cds_wfcq_tail *dest_q_tail,
-		struct __cds_wfcq_head *src_q_head,
-		struct cds_wfcq_tail *src_q_tail)
-{
-	return __cds_wfcq_splice_nonblocking(__cds_wfcq_head_cast(dest_q_head),
-			dest_q_tail,
-			__cds_wfcq_head_cast(src_q_head),
-			src_q_tail);
-}
-
-static inline enum cds_wfcq_ret __cds_wfcq_splice_nonblocking(
-		struct cds_wfcq_head *dest_q_head,
-		struct cds_wfcq_tail *dest_q_tail,
-		struct __cds_wfcq_head *src_q_head,
-		struct cds_wfcq_tail *src_q_tail)
-{
-	return __cds_wfcq_splice_nonblocking(cds_wfcq_head_cast(dest_q_head),
-			dest_q_tail,
-			__cds_wfcq_head_cast(src_q_head),
-			src_q_tail);
-}
-
-static inline enum cds_wfcq_ret __cds_wfcq_splice_nonblocking(
-		struct __cds_wfcq_head *dest_q_head,
-		struct cds_wfcq_tail *dest_q_tail,
-		struct cds_wfcq_head *src_q_head,
-		struct cds_wfcq_tail *src_q_tail)
-{
-	return __cds_wfcq_splice_nonblocking(__cds_wfcq_head_cast(dest_q_head),
-			dest_q_tail,
-			cds_wfcq_head_cast(src_q_head),
-			src_q_tail);
-}
-
-static inline enum cds_wfcq_ret __cds_wfcq_splice_nonblocking(
-		struct cds_wfcq_head *dest_q_head,
-		struct cds_wfcq_tail *dest_q_tail,
-		struct cds_wfcq_head *src_q_head,
-		struct cds_wfcq_tail *src_q_tail)
-{
-	return __cds_wfcq_splice_nonblocking(cds_wfcq_head_cast(dest_q_head),
-			dest_q_tail,
-			cds_wfcq_head_cast(src_q_head),
-			src_q_tail);
-}
-
-static inline struct cds_wfcq_node *__cds_wfcq_first_blocking(
-		struct __cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail)
-{
-	return __cds_wfcq_first_blocking(__cds_wfcq_head_cast(head), tail);
-}
-
-static inline struct cds_wfcq_node *__cds_wfcq_first_blocking(
-		struct cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail)
-{
-	return __cds_wfcq_first_blocking(cds_wfcq_head_cast(head), tail);
-}
-
-static inline struct cds_wfcq_node *__cds_wfcq_first_nonblocking(
-		struct __cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail)
-{
-	return __cds_wfcq_first_nonblocking(__cds_wfcq_head_cast(head), tail);
-}
-
-static inline struct cds_wfcq_node *__cds_wfcq_first_nonblocking(
-		struct cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail)
-{
-	return __cds_wfcq_first_nonblocking(cds_wfcq_head_cast(head), tail);
-}
-
-static inline struct cds_wfcq_node *__cds_wfcq_next_blocking(
-		struct __cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail,
-		struct cds_wfcq_node *node)
-{
-	return __cds_wfcq_next_blocking(__cds_wfcq_head_cast(head), tail, node);
-}
-
-static inline struct cds_wfcq_node *__cds_wfcq_next_blocking(
-		struct cds_wfcq_head *head,
+template<typename T> static inline struct cds_wfcq_node *__cds_wfcq_next_blocking(
+		T head,
 		struct cds_wfcq_tail *tail,
 		struct cds_wfcq_node *node)
 {
-	return __cds_wfcq_next_blocking(cds_wfcq_head_cast(head), tail, node);
+	return __cds_wfcq_next_blocking(cds_wfcq_head_cast_cpp(head), tail, node);
 }
 
-static inline struct cds_wfcq_node *__cds_wfcq_next_nonblocking(
-		struct __cds_wfcq_head *head,
-		struct cds_wfcq_tail *tail,
-		struct cds_wfcq_node *node)
-{
-	return __cds_wfcq_next_nonblocking(__cds_wfcq_head_cast(head), tail, node);
-}
-
-static inline struct cds_wfcq_node *__cds_wfcq_next_nonblocking(
-		struct cds_wfcq_head *head,
+template<typename T> static inline struct cds_wfcq_node *__cds_wfcq_next_nonblocking(
+		T head,
 		struct cds_wfcq_tail *tail,
 		struct cds_wfcq_node *node)
 {
-	return __cds_wfcq_next_nonblocking(cds_wfcq_head_cast(head), tail, node);
+	return __cds_wfcq_next_nonblocking(cds_wfcq_head_cast_cpp(head), tail, node);
 }
 
 #endif