X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu.c;h=53c7f37677f762280b2a6337a6820bdf22c55faf;hp=31cdf6fc08b61c14e0a8f47d93154c0d54599ccc;hb=6e8b8429a09800f5a50f0410f5ec4cd95b46974b;hpb=1430ee0bdca4cb454d534ef7fc84af3e0692f26b diff --git a/urcu.c b/urcu.c index 31cdf6f..53c7f37 100644 --- a/urcu.c +++ b/urcu.c @@ -20,9 +20,9 @@ pthread_mutex_t urcu_mutex = PTHREAD_MUTEX_INITIALIZER; /* Global grace period counter */ -int urcu_gp_ctr; +long urcu_gp_ctr; -int __thread urcu_active_readers; +long __thread urcu_active_readers; /* Thread IDs of registered readers */ #define INIT_NUM_THREADS 4 @@ -142,40 +142,6 @@ void synchronize_rcu(void) { debug_yield_write(); internal_urcu_lock(); - debug_yield_write(); - switch_qparity(); - debug_yield_write(); - switch_qparity(); - debug_yield_write(); - internal_urcu_lock(); - debug_yield_write(); -} - -/* - * Return old pointer, OK to free, no more reference exist. - * Called under rcu_write_lock. - */ -void *urcu_publish_content(void **ptr, void *new) -{ - void *oldptr; - - debug_yield_write(); - internal_urcu_lock(); - debug_yield_write(); - /* - * We can publish the new pointer before we change the current qparity. - * Readers seeing the new pointer while being in the previous qparity - * window will make us wait until the end of the quiescent state before - * we release the unrelated memory area. However, given we hold the - * urcu_mutex, we are making sure that no further garbage collection can - * occur until we release the mutex, therefore we guarantee that this - * given reader will have completed its execution using the new pointer - * when the next quiescent state window will be over. - */ - oldptr = *ptr; - debug_yield_write(); - *ptr = new; - debug_yield_write(); switch_qparity(); debug_yield_write(); @@ -183,8 +149,6 @@ void *urcu_publish_content(void **ptr, void *new) debug_yield_write(); internal_urcu_unlock(); debug_yield_write(); - - return oldptr; } void urcu_add_reader(pthread_t id)