tests/rcutorture: Factor out thread registration
[urcu.git] / tests / regression / rcutorture.h
index ead5b4082ca217e5064dcd350a06799dd4e0ccf6..e20d82eeb15df7873f74e8b795b16f8d111110ec 100644 (file)
@@ -336,6 +336,7 @@ void *rcu_read_stress_test(void *arg __attribute__((unused)))
 
 static pthread_mutex_t call_rcu_test_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t call_rcu_test_cond = PTHREAD_COND_INITIALIZER;
+static bool call_rcu_wait;
 
 static
 void rcu_update_stress_test_rcu(struct rcu_head *head __attribute__((unused)))
@@ -356,6 +357,7 @@ void rcu_update_stress_test_rcu(struct rcu_head *head __attribute__((unused)))
                        strerror(errno));
                abort();
        }
+       call_rcu_wait = false;
        ret = pthread_mutex_unlock(&call_rcu_test_mutex);
        if (ret) {
                errno = ret;
@@ -389,8 +391,14 @@ void *rcu_update_stress_test(void *arg __attribute__((unused)))
        struct rcu_head rh;
        enum writer_state writer_state = WRITER_STATE_SYNC_RCU;
 
+       rcu_register_thread();
+
+       /* Offline for poll. */
+       put_thread_offline();
        while (goflag == GOFLAG_INIT)
                (void) poll(NULL, 0, 1);
+       put_thread_online();
+
        while (goflag == GOFLAG_RUN) {
                i = rcu_stress_idx + 1;
                if (i >= RCU_STRESS_PIPE_LEN)
@@ -420,9 +428,8 @@ void *rcu_update_stress_test(void *arg __attribute__((unused)))
                                        strerror(errno));
                                abort();
                        }
-                       rcu_register_thread();
                        call_rcu(&rh, rcu_update_stress_test_rcu);
-                       rcu_unregister_thread();
+
                        /*
                         * Our MacOS X test machine with the following
                         * config:
@@ -437,8 +444,14 @@ void *rcu_update_stress_test(void *arg __attribute__((unused)))
                         * immediately after call_rcu (call_rcu needs
                         * us to be registered RCU readers).
                         */
-                       ret = pthread_cond_wait(&call_rcu_test_cond,
-                                       &call_rcu_test_mutex);
+                       call_rcu_wait = true;
+                       /* Offline for pthread_cond_wait. */
+                       put_thread_offline();
+                       do {
+                               ret = pthread_cond_wait(&call_rcu_test_cond,
+                                                       &call_rcu_test_mutex);
+                       } while (call_rcu_wait);
+                       put_thread_online();
                        if (ret) {
                                errno = ret;
                                diag("pthread_cond_signal: %s",
@@ -458,11 +471,13 @@ void *rcu_update_stress_test(void *arg __attribute__((unused)))
                {
                        struct urcu_gp_poll_state poll_state;
 
-                       rcu_register_thread();
                        poll_state = start_poll_synchronize_rcu();
-                       rcu_unregister_thread();
+
+                       /* Offline for poll. */
+                       put_thread_offline();
                        while (!poll_state_synchronize_rcu(poll_state))
                                (void) poll(NULL, 0, 1);        /* Wait for 1ms */
+                       put_thread_online();
                        break;
                }
                }
@@ -470,6 +485,8 @@ void *rcu_update_stress_test(void *arg __attribute__((unused)))
                advance_writer_state(&writer_state);
        }
 
+       rcu_unregister_thread();
+
        return NULL;
 }
 
This page took 0.032261 seconds and 4 git commands to generate.