X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu.c;h=e401d8dc75d34bf04d2e62da56df3cc08f0d470d;hp=7e79207be6a88eaaf6d2b74c0b16b4543368a6fd;hb=e6d6e2dc86bd63c7e702f68ffdb1e5a6ef723abc;hpb=41718ff94c4a07cb5f56d68084267798e471d1b1 diff --git a/urcu.c b/urcu.c index 7e79207..e401d8d 100644 --- a/urcu.c +++ b/urcu.c @@ -1,3 +1,13 @@ +/* + * urcu.c + * + * Userspace RCU library + * + * Copyright February 2009 - Mathieu Desnoyers + * + * Distributed under GPLv2 + */ + #include #include #include @@ -91,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(); } /* @@ -109,7 +119,7 @@ void wait_for_quiescent_state(int parity) */ void *urcu_publish_content(void **ptr, void *new) { - int ret, prev_parity; + int prev_parity; void *oldptr; /* @@ -124,8 +134,8 @@ 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 */ + /* Write ptr before changing the qparity */ force_mb_all_threads(); prev_parity = switch_next_urcu_qparity(); @@ -175,7 +185,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; @@ -197,7 +207,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();