Skip to contentSkip to conversation

Horrible hack to make C++ link to liburcu

DISCUSSION Mathieu Desnoyers 1 participant 2 messages Mar 5, 2016 – Mar 8, 2016 2 messages not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive
Quoted 8 lines · ----- On Mar 4, 2016, at 3:32 PM, Paul E. McKenney [email protected]…

Hello!

Still working with the C++ standards committee to add RCU to C++, and of course one step on that path is to make C++ programs build against liburcu. The following hack-patch makes this work by disabling C++ access to wfcqueue and by making C++ see the rcu_head ->next field as a void *.

This supports prototyping, but what would be the real fix?

One fix would be:

urcu/wfcqueue.h +1 -1
index 83ec219..c0bb289 100644
@@ -43,7 +43,7 @@ extern "C" {
  * McKenney.
  */
 
-#define CDS_WFCQ_WOULDBLOCK    ((void *) -1UL)
+#define CDS_WFCQ_WOULDBLOCK    ((struct cds_wfcq_node *) -1UL)
 
 enum cds_wfcq_ret {
        CDS_WFCQ_RET_WOULDBLOCK =       -1,

In addition, g++ does not support the __transparent_union__ gcc attribute (it just ignores it). So we might want to rethink our use of this attribute within wfcqueue.h. We current use it for

/*
* Do not put head and tail on the same cache-line if concurrent
* enqueue/dequeue are expected from many CPUs. This eliminates
* false-sharing between enqueue and dequeue.
*/

struct __cds_wfcq_head {
        struct cds_wfcq_node node;
};
struct cds_wfcq_head {
        struct cds_wfcq_node node;
        pthread_mutex_t lock;
};

/*
* The transparent union allows calling functions that work on both
* struct cds_wfcq_head and struct __cds_wfcq_head on any of those two
* types.
*/

typedef union {
        struct __cds_wfcq_head *_h;
        struct cds_wfcq_head *h;
} __attribute__((__transparent_union__)) cds_wfcq_head_ptr_t;

Thoughts ?

Thanks,

Mathieu

Quoted 30 lines

Thanx, Paul

------------------------------------------------------------------------

urcu-call-rcu.h +6 -0
index 339ebacc3f7c..d37c49e9d958 100644
@@ -32,7 +32,9 @@
 #include <stdlib.h>
 #include <pthread.h>
 
+#ifndef __cplusplus
 #include <urcu/wfcqueue.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,7 +59,11 @@ struct call_rcu_data;
 */
 
 struct rcu_head {
+#ifdef __cplusplus
+	void *next;
+#else
 	struct cds_wfcq_node next;
+#endif
 	void (*func)(struct rcu_head *head);
 };
Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
#3 lore raw
In reply to a message not in the archive
Quoted 11 lines · ----- On Mar 5, 2016, at 10:10 AM, Mathieu Desnoyers…

----- On Mar 4, 2016, at 3:32 PM, Paul E. McKenney [email protected]

Quoted 8 lines · wrote:

Hello!

Still working with the C++ standards committee to add RCU to C++, and of course one step on that path is to make C++ programs build against liburcu. The following hack-patch makes this work by disabling C++ access to wfcqueue and by making C++ see the rcu_head ->next field as a void *.

This supports prototyping, but what would be the real fix?

Hi Paul,

Of course you can remove the _LGPL_SOURCE define. It will work, but without inlining. I have two fixes that should make inlining work in C++, even when using wfcqueue.h. Those are currently in

https://github.com/compudj/userspace-rcu-dev/tree/urcu-cpp

(top 2 commits)

Feedback is welcome,

Thanks!

Mathieu

Quoted 92 lines

One fix would be:

urcu/wfcqueue.h +1 -1
index 83ec219..c0bb289 100644
@@ -43,7 +43,7 @@ extern "C" {
 * McKenney.
 */
 
-#define CDS_WFCQ_WOULDBLOCK    ((void *) -1UL)
+#define CDS_WFCQ_WOULDBLOCK    ((struct cds_wfcq_node *) -1UL)
 
 enum cds_wfcq_ret {
       CDS_WFCQ_RET_WOULDBLOCK =       -1,

In addition, g++ does not support the __transparent_union__ gcc attribute (it just ignores it). So we might want to rethink our use of this attribute within wfcqueue.h. We current use it for

/*
* Do not put head and tail on the same cache-line if concurrent
* enqueue/dequeue are expected from many CPUs. This eliminates
* false-sharing between enqueue and dequeue.
*/

struct __cds_wfcq_head {
       struct cds_wfcq_node node;
};
struct cds_wfcq_head {
       struct cds_wfcq_node node;
       pthread_mutex_t lock;
};

/*
* The transparent union allows calling functions that work on both
* struct cds_wfcq_head and struct __cds_wfcq_head on any of those two
* types.
*/

typedef union {
       struct __cds_wfcq_head *_h;
       struct cds_wfcq_head *h;
} __attribute__((__transparent_union__)) cds_wfcq_head_ptr_t;

Thoughts ?

Thanks,

Mathieu

Quoted 20 lines

Thanx, Paul

------------------------------------------------------------------------

urcu-call-rcu.h +2 -0
index 339ebacc3f7c..d37c49e9d958 100644
@@ -32,7 +32,9 @@
 #include <stdlib.h>
 #include <pthread.h>
 
+#ifndef __cplusplus
 #include <urcu/wfcqueue.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

urcu-call-rcu.h struct call_rcu_data; · line 68

Quoted 10 lines
urcu-call-rcu.h +4 -0
@@ -57,7 +59,11 @@ struct call_rcu_data;
 */
 
 struct rcu_head {
+#ifdef __cplusplus
+	void *next;
+#else
 	struct cds_wfcq_node next;
+#endif
 	void (*func)(struct rcu_head *head);
 };

--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com