> > In Figure 9, "reader_data" shouldn't be used as both a variable name
> > and a structure tag. Furthermore, the text needs to explain what it
> > is.
>
> I will defer to Mathieu on this one, though it would certainly prevent
> using this code in a C++ program.
>
Yes, I've been lazy on the naming here. How about :
struct reader_registry {
pthread_t tid;
long *urcu_active_readers;
};
static struct reader_registry *registry;
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
/* Thread IDs of registered readers */
#define INIT_NUM_THREADS 4
/* Thread IDs of registered readers */
#define INIT_NUM_THREADS 4
+struct reader_registry {
pthread_t tid;
long *urcu_active_readers;
};
pthread_t tid;
long *urcu_active_readers;
};
unsigned int __thread rand_yield;
#endif
unsigned int __thread rand_yield;
#endif
-static struct reader_data *reader_data;
+static struct reader_registry *registry;
static int num_readers, alloc_readers;
#ifndef DEBUG_FULL_MB
static int sig_done;
static int num_readers, alloc_readers;
#ifndef DEBUG_FULL_MB
static int sig_done;
static void force_mb_single_thread(pthread_t tid)
{
static void force_mb_single_thread(pthread_t tid)
{
sig_done = 0;
/*
* pthread_kill has a smp_mb(). But beware, we assume it performs
sig_done = 0;
/*
* pthread_kill has a smp_mb(). But beware, we assume it performs
static void force_mb_all_threads(void)
{
static void force_mb_all_threads(void)
{
- struct reader_data *index;
+ struct reader_registry *index;
/*
* Ask for each threads to execute a smp_mb() so we can consider the
* compiler barriers around rcu read lock as real memory barriers.
*/
/*
* Ask for each threads to execute a smp_mb() so we can consider the
* compiler barriers around rcu read lock as real memory barriers.
*/
* smp_mb(); write sig_done before sending the signals
*/
smp_mc(); /* write sig_done before sending the signals */
* smp_mb(); write sig_done before sending the signals
*/
smp_mc(); /* write sig_done before sending the signals */
- for (index = reader_data; index < reader_data + num_readers; index++)
+ for (index = registry; index < registry + num_readers; index++)
pthread_kill(index->tid, SIGURCU);
/*
* Wait for sighandler (and thus mb()) to execute on every thread.
pthread_kill(index->tid, SIGURCU);
/*
* Wait for sighandler (and thus mb()) to execute on every thread.
void wait_for_quiescent_state(void)
{
void wait_for_quiescent_state(void)
{
- struct reader_data *index;
+ struct reader_registry *index;
return;
/*
* Wait for each thread urcu_active_readers count to become 0.
*/
return;
/*
* Wait for each thread urcu_active_readers count to become 0.
*/
- for (index = reader_data; index < reader_data + num_readers; index++) {
+ for (index = registry; index < registry + num_readers; index++) {
int wait_loops = 0;
/*
* BUSY-LOOP. Force the reader thread to commit its
int wait_loops = 0;
/*
* BUSY-LOOP. Force the reader thread to commit its
void urcu_add_reader(pthread_t id)
{
void urcu_add_reader(pthread_t id)
{
- struct reader_data *oldarray;
+ struct reader_registry *oldarray;
alloc_readers = INIT_NUM_THREADS;
num_readers = 0;
alloc_readers = INIT_NUM_THREADS;
num_readers = 0;
- reader_data =
- malloc(sizeof(struct reader_data) * alloc_readers);
+ registry =
+ malloc(sizeof(struct reader_registry) * alloc_readers);
}
if (alloc_readers < num_readers + 1) {
}
if (alloc_readers < num_readers + 1) {
- oldarray = reader_data;
- reader_data = malloc(sizeof(struct reader_data)
+ oldarray = registry;
+ registry = malloc(sizeof(struct reader_registry)
- memcpy(reader_data, oldarray,
- sizeof(struct reader_data) * alloc_readers);
+ memcpy(registry, oldarray,
+ sizeof(struct reader_registry) * alloc_readers);
alloc_readers <<= 1;
free(oldarray);
}
alloc_readers <<= 1;
free(oldarray);
}
- reader_data[num_readers].tid = id;
+ registry[num_readers].tid = id;
/* reference to the TLS of _this_ reader thread. */
/* reference to the TLS of _this_ reader thread. */
- reader_data[num_readers].urcu_active_readers = &urcu_active_readers;
+ registry[num_readers].urcu_active_readers = &urcu_active_readers;
*/
void urcu_remove_reader(pthread_t id)
{
*/
void urcu_remove_reader(pthread_t id)
{
- struct reader_data *index;
+ struct reader_registry *index;
- assert(reader_data != NULL);
- for (index = reader_data; index < reader_data + num_readers; index++) {
+ assert(registry != NULL);
+ for (index = registry; index < registry + num_readers; index++) {
if (pthread_equal(index->tid, id)) {
if (pthread_equal(index->tid, id)) {
- memcpy(index, &reader_data[num_readers - 1],
- sizeof(struct reader_data));
- reader_data[num_readers - 1].tid = 0;
- reader_data[num_readers - 1].urcu_active_readers = NULL;
+ memcpy(index, ®istry[num_readers - 1],
+ sizeof(struct reader_registry));
+ registry[num_readers - 1].tid = 0;
+ registry[num_readers - 1].urcu_active_readers = NULL;
exit(-1);
}
assert(act.sa_sigaction == sigurcu_handler);
exit(-1);
}
assert(act.sa_sigaction == sigurcu_handler);