test/class: fix opal_fifo and opal_lifo

Signed-off-by: Shintaro Iwasaki <siwasaki@anl.gov>

Author: shintaro-iwasaki

opal/mca/threads/argobots/threads_argobots_module.c

@@ -40,7 +40,7 @@ struct opal_tsd_key_value {
 };
 
 static ABT_thread opal_main_thread;
-struct opal_tsd_key_value *opal_tsd_key_values = NULL;
+static struct opal_tsd_key_value *opal_tsd_key_values = NULL;
 static int opal_tsd_key_values_count = 0;
 
 /*

opal/mca/threads/pthreads/threads_pthreads_module.c

@@ -32,13 +32,14 @@
 #include "opal/mca/threads/threads.h"
 #include "opal/mca/threads/tsd.h"
 
+static pthread_t opal_main_thread;
+
 struct opal_tsd_key_value {
     opal_tsd_key_t key;
     opal_tsd_destructor_t destructor;
 };
 
-static pthread_t opal_main_thread;
-struct opal_tsd_key_value *opal_tsd_key_values = NULL;
+static struct opal_tsd_key_value *opal_tsd_key_values = NULL;
 static int opal_tsd_key_values_count = 0;
 
 /*
@@ -54,17 +55,19 @@ OBJ_CLASS_INSTANCE(opal_thread_t,
                    opal_object_t,
                    opal_thread_construct, NULL);
 
-
-opal_thread_t *opal_thread_get_self(void)
+int opal_thread_start(opal_thread_t *t)
 {
-    opal_thread_t *t = OBJ_NEW(opal_thread_t);
-    t->t_handle = pthread_self();
-    return t;
-}
+    int rc;
 
-bool opal_thread_self_compare(opal_thread_t *t)
-{
-    return pthread_self() == t->t_handle;
+    if (OPAL_ENABLE_DEBUG) {
+        if (NULL == t->t_run || (pthread_t)-1 != t->t_handle) {
+            return OPAL_ERR_BAD_PARAM;
+        }
+    }
+
+    rc = pthread_create(&t->t_handle, NULL, (void *(*)(void *))t->t_run, t);
+
+    return 0 == rc ? OPAL_SUCCESS : OPAL_ERR_IN_ERRNO;
 }
 
 int opal_thread_join(opal_thread_t *t, void **thr_return)
@@ -74,28 +77,18 @@ int opal_thread_join(opal_thread_t *t, void **thr_return)
     return 0 == rc ? OPAL_SUCCESS : OPAL_ERR_IN_ERRNO;
 }
 
-void opal_thread_set_main(void)
+bool opal_thread_self_compare(opal_thread_t *t)
 {
-    opal_main_thread = pthread_self();
+    return pthread_self() == t->t_handle;
 }
 
-int opal_thread_start(opal_thread_t *t)
+opal_thread_t *opal_thread_get_self(void)
 {
-    int rc;
-
-    if (OPAL_ENABLE_DEBUG) {
-        if (NULL == t->t_run || (pthread_t)-1 != t->t_handle) {
-            return OPAL_ERR_BAD_PARAM;
-        }
-    }
-
-    rc = pthread_create(&t->t_handle, NULL, (void *(*)(void *))t->t_run, t);
-
-    return 0 == rc ? OPAL_SUCCESS : OPAL_ERR_IN_ERRNO;
+    opal_thread_t *t = OBJ_NEW(opal_thread_t);
+    t->t_handle = pthread_self();
+    return t;
 }
 
-OBJ_CLASS_DECLARATION(opal_thread_t);
-
 int opal_tsd_key_create(opal_tsd_key_t *key, opal_tsd_destructor_t destructor)
 {
     int rc;
@@ -131,6 +124,11 @@ int opal_tsd_keys_destruct(void)
     return OPAL_SUCCESS;
 }
 
+void opal_thread_set_main(void)
+{
+    opal_main_thread = pthread_self();
+}
+
 void opal_event_use_threads(void)
 {
     evthread_use_pthreads();

test/class/opal_fifo.c

@@ -42,8 +42,9 @@
     } while (0)
 #endif
 
-static void *thread_test (opal_thread_t *arg) {
-    opal_fifo_t *fifo = (opal_fifo_t *) arg->t_arg;
+static void *thread_test (opal_object_t *arg) {
+    opal_thread_t *t = (opal_thread_t *) arg;
+    opal_fifo_t *fifo = (opal_fifo_t *) t->t_arg;
     opal_list_item_t *item;
     struct timeval start, stop, total;
     double timing;
@@ -67,8 +68,9 @@ static void *thread_test (opal_thread_t *arg) {
     return NULL;
 }
 
-static void *thread_test_exhaust (opal_thread_t *arg) {
-  opal_fifo_t *fifo = (opal_fifo_t *) arg->t_arg;
+static void *thread_test_exhaust (opal_object_t *arg) {
+  opal_thread_t *t = (opal_thread_t *) arg;
+  opal_fifo_t *fifo = (opal_fifo_t *) t->t_arg;
   opal_list_item_t *items[ITEMS_PER_LOOP];
   struct timeval start, stop, total;
   int item_count = 0;
@@ -184,7 +186,7 @@ int main (int argc, char *argv[]) {
             (int)total.tv_usec, (int)(timing / 1e-9));
 
     threads[0].t_arg = &fifo;
-    thread_test (&threads[0]);
+    thread_test ((opal_object_t *) &threads[0]);
 
     if (check_fifo_consistency (&fifo, ITEM_COUNT)) {
         test_success ();
@@ -194,7 +196,8 @@ int main (int argc, char *argv[]) {
 
     gettimeofday (&start, NULL);
     for (int i = 0 ; i < OPAL_FIFO_TEST_THREAD_COUNT ; ++i) {
-        threads[i].t_run = (opal_thread_fn_t) thread_test;
+        OBJ_CONSTRUCT(&threads[i], opal_thread_t);
+        threads[i].t_run = thread_test;
         threads[i].t_arg = &fifo;
         opal_thread_start (threads + i);
     }
@@ -222,7 +225,8 @@ int main (int argc, char *argv[]) {
 
     gettimeofday (&start, NULL);
     for (int i = 0 ; i < OPAL_FIFO_TEST_THREAD_COUNT ; ++i) {
-        threads[i].t_run = (opal_thread_fn_t) thread_test_exhaust;
+        OBJ_CONSTRUCT(&threads[i], opal_thread_t);
+        threads[i].t_run = thread_test_exhaust;
         threads[i].t_arg = &fifo;
         opal_thread_start (threads + i);
     }

test/class/opal_lifo.c

@@ -39,8 +39,9 @@
     } while (0)
 #endif
 
-static void *thread_test (opal_thread_t *arg) {
-    opal_lifo_t *lifo = (opal_lifo_t *) arg->t_arg;
+static void *thread_test (opal_object_t *arg) {
+    opal_thread_t *t = (opal_thread_t *) arg;
+    opal_lifo_t *lifo = (opal_lifo_t *) t->t_arg;
     opal_list_item_t *item;
     struct timeval start, stop, total;
     double timing;
@@ -145,7 +146,7 @@ int main (int argc, char *argv[]) {
             (int)total.tv_usec, (int)(timing / 1e-9));
 
     threads[0].t_arg = &lifo;
-    thread_test (&threads[0]);
+    thread_test ((opal_object_t *) &threads[0]);
 
     if (check_lifo_consistency (&lifo, ITEM_COUNT)) {
         test_success ();
@@ -155,7 +156,8 @@ int main (int argc, char *argv[]) {
 
     gettimeofday (&start, NULL);
     for (int i = 0 ; i < OPAL_LIFO_TEST_THREAD_COUNT ; ++i) {
-        threads[i].t_run = (opal_thread_fn_t) thread_test;
+        OBJ_CONSTRUCT(&threads[i], opal_thread_t);
+        threads[i].t_run = thread_test;
         threads[i].t_arg = &lifo;
         opal_thread_start (threads + i);
     }