fix: handle EINTR correctly in get_cpu_mask_from_sysfs

[urcu.git] / include / urcu / wfstack.h

diff --git a/include/urcu/wfstack.h b/include/urcu/wfstack.h
index 1058fba9baa4dc0fa89b1250e68f5c2814e486e2..38e5b6b2dcb3099dec87f8a6b3fb4f5750e93fb1 100644 (file)
--- a/include/urcu/wfstack.h
+++ b/include/urcu/wfstack.h
@@ -1,26 +1,12 @@
+// SPDX-FileCopyrightText: 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #ifndef _URCU_WFSTACK_H
 #define _URCU_WFSTACK_H
 
 /*
- * urcu/wfstack.h
- *
  * Userspace RCU library - Stack with wait-free push, blocking traversal.
- *
- * Copyright 2010-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * 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.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <pthread.h>
@@ -57,7 +43,7 @@ extern "C" {
  * synchronization.
  */
 
-#define CDS_WFS_WOULDBLOCK     ((void *) -1UL)
+#define CDS_WFS_WOULDBLOCK     ((struct cds_wfs_node *) -1UL)
 
 enum cds_wfs_state {
        CDS_WFS_STATE_LAST =            (1U << 0),
@@ -92,14 +78,27 @@ struct cds_wfs_stack {
 };
 
 /*
- * The transparent union allows calling functions that work on both
+ * In C, the transparent union allows calling functions that work on both
  * struct cds_wfs_stack and struct __cds_wfs_stack on any of those two
  * types.
+ *
+ * In C++, implement static inline wrappers using function overloading
+ * to obtain an API similar to C.
+ *
+ * Avoid complaints from clang++ not knowing the transparent union
+ * attribute.
  */
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-attributes"
+#endif
 typedef union {
        struct __cds_wfs_stack *_s;
        struct cds_wfs_stack *s;
 } __attribute__((__transparent_union__)) cds_wfs_stack_ptr_t;
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
 #ifdef _LGPL_SOURCE
 
@@ -318,10 +317,6 @@ extern struct cds_wfs_head *__cds_wfs_pop_all(cds_wfs_stack_ptr_t u_stack);
 
 #endif /* !_LGPL_SOURCE */
 
-#ifdef __cplusplus
-}
-#endif
-
 /*
  * cds_wfs_for_each_blocking: Iterate over all nodes returned by
  * __cds_wfs_pop_all().
@@ -353,4 +348,68 @@ extern struct cds_wfs_head *__cds_wfs_pop_all(cds_wfs_stack_ptr_t u_stack);
                node != NULL;                                              \
                node = n, n = (node ? cds_wfs_next_blocking(node) : NULL))
 
+#ifdef __cplusplus
+}
+
+/*
+ * In C++, implement static inline wrappers using function overloading
+ * to obtain an API similar to C.
+ */
+
+static inline cds_wfs_stack_ptr_t cds_wfs_stack_cast(struct __cds_wfs_stack *s)
+{
+       cds_wfs_stack_ptr_t ret = {
+               ._s = s,
+       };
+       return ret;
+}
+
+static inline cds_wfs_stack_ptr_t cds_wfs_stack_cast(struct cds_wfs_stack *s)
+{
+       cds_wfs_stack_ptr_t ret = {
+               .s = s,
+       };
+       return ret;
+}
+
+template<typename T> static inline bool cds_wfs_empty(T s)
+{
+       return cds_wfs_empty(cds_wfs_stack_cast(s));
+}
+
+template<typename T> static inline int cds_wfs_push(T s, struct cds_wfs_node *node)
+{
+       return cds_wfs_push(cds_wfs_stack_cast(s), node);
+}
+
+template<typename T> static inline struct cds_wfs_node *__cds_wfs_pop_blocking(T s)
+{
+       return __cds_wfs_pop_blocking(cds_wfs_stack_cast(s));
+}
+
+template<typename T> static inline struct cds_wfs_node *
+       __cds_wfs_pop_with_state_blocking(T s, int *state)
+{
+       return __cds_wfs_pop_with_state_blocking(cds_wfs_stack_cast(s), state);
+}
+
+template<typename T> static inline struct cds_wfs_node *__cds_wfs_pop_nonblocking(T s)
+
+{
+       return __cds_wfs_pop_nonblocking(cds_wfs_stack_cast(s));
+}
+
+template<typename T> static inline struct cds_wfs_node *
+       __cds_wfs_pop_with_state_nonblocking(T s, int *state)
+{
+       return __cds_wfs_pop_with_state_nonblocking(cds_wfs_stack_cast(s), state);
+}
+
+template<typename T> static inline struct cds_wfs_head *__cds_wfs_pop_all(T s)
+{
+       return __cds_wfs_pop_all(cds_wfs_stack_cast(s));
+}
+
+#endif
+
 #endif /* _URCU_WFSTACK_H */