X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu.c;h=1a276ce33663439b7cb128e1ab6bea147faec1ed;hb=2bc59bd7ce26378150512280b67599f9004732a5;hp=ee79d1efc7b7a98f87f30a3f5de4abe9e7c822b3;hpb=b257a10b0b05064dcb5dc9d4d1c5f95c0364b9dd;p=urcu.git diff --git a/urcu.c b/urcu.c index ee79d1e..1a276ce 100644 --- a/urcu.c +++ b/urcu.c @@ -101,7 +101,7 @@ void wait_for_quiescent_state(int parity) /* * BUSY-LOOP. */ - while (*index->urcu_active_readers != 0) + while (index->urcu_active_readers[parity] != 0) barrier(); } /* @@ -113,13 +113,35 @@ void wait_for_quiescent_state(int parity) force_mb_all_threads(); } +static void switch_qparity(void) +{ + int prev_parity; + + /* All threads should read qparity before accessing data structure. */ + /* Write ptr before changing the qparity */ + force_mb_all_threads(); + prev_parity = switch_next_urcu_qparity(); + + /* + * Wait for previous parity to be empty of readers. + */ + wait_for_quiescent_state(prev_parity); +} + +void synchronize_rcu(void) +{ + rcu_write_lock(); + switch_qparity(); + switch_qparity(); + rcu_write_unlock(); +} + /* * Return old pointer, OK to free, no more reference exist. * Called under rcu_write_lock. */ void *urcu_publish_content(void **ptr, void *new) { - int ret, prev_parity; void *oldptr; /* @@ -134,19 +156,10 @@ void *urcu_publish_content(void **ptr, void *new) */ oldptr = *ptr; *ptr = new; - wmb(); /* Write ptr before changing the qparity */ - /* All threads should read qparity before ptr */ - force_mb_all_threads(); - prev_parity = switch_next_urcu_qparity(); - /* - * Wait for previous parity to be empty of readers. - */ - wait_for_quiescent_state(prev_parity); - /* - * Deleting old data is ok ! - */ - + switch_qparity(); + switch_qparity(); + return oldptr; } @@ -185,7 +198,7 @@ void urcu_remove_reader(pthread_t id) assert(reader_data != NULL); for (index = reader_data; index < reader_data + num_readers; index++) { - if (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; @@ -207,7 +220,6 @@ void urcu_register_thread(void) void urcu_unregister_thread(void) { - pthread_t self = pthread_self(); rcu_write_lock(); urcu_remove_reader(pthread_self()); rcu_write_unlock();