/*
- * urcu.c
+ * urcu-qsbr.c
*
- * Userspace RCU library
+ * Userspace RCU QSBR library
*
* Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
* Copyright (c) 2009 Paul E. McKenney, IBM Corporation.
#include <errno.h>
#include <poll.h>
-#include "urcu-qsbr.h"
+#include "urcu-qsbr-static.h"
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
-//#include "urcu.h"
+#include "urcu-qsbr.h"
pthread_mutex_t urcu_mutex = PTHREAD_MUTEX_INITIALIZER;
struct reader_registry {
pthread_t tid;
long *rcu_reader_qs_gp;
- char *need_mb;
};
#ifdef DEBUG_YIELD
#endif
static struct reader_registry *registry;
-static char __thread need_mb;
static int num_readers, alloc_readers;
-void internal_urcu_lock(void)
+static void internal_urcu_lock(void)
{
int ret;
perror("Error in pthread mutex lock");
exit(-1);
}
- if (need_mb) {
- smp_mb();
- need_mb = 0;
- smp_mb();
- }
poll(NULL,0,10);
}
#endif /* #else #ifndef DISTRUST_SIGNALS_EXTREME */
}
-void internal_urcu_unlock(void)
+static void internal_urcu_unlock(void)
{
int ret;
smp_mb();
}
-void wait_for_quiescent_state(void)
+static void wait_for_quiescent_state(void)
{
struct reader_registry *index;
+ if (rcu_reader_qs_gp & 1)
+ rcu_reader_qs_gp = urcu_gp_ctr + 1;
+
if (!registry)
return;
/*
return oldptr;
}
+void rcu_quiescent_state(void)
+{
+ _rcu_quiescent_state();
+}
+
+void rcu_thread_offline(void)
+{
+ _rcu_thread_offline();
+}
+
+void rcu_thread_online(void)
+{
+ _rcu_thread_online();
+}
+
static void rcu_add_reader(pthread_t id)
{
struct reader_registry *oldarray;
registry[num_readers].tid = id;
/* reference to the TLS of _this_ reader thread. */
registry[num_readers].rcu_reader_qs_gp = &rcu_reader_qs_gp;
- registry[num_readers].need_mb = &need_mb;
num_readers++;
}
internal_urcu_lock();
rcu_add_reader(pthread_self());
internal_urcu_unlock();
+ _rcu_thread_online();
}
void rcu_unregister_thread(void)
{
+ /*
+ * We have to make the thread offline otherwise we end up dealocking
+ * with a waiting writer.
+ */
+ _rcu_thread_offline();
internal_urcu_lock();
rcu_remove_reader(pthread_self());
internal_urcu_unlock();