Move declarations related to tst_threads.c into tst_threads.h.

cniethammer · cniethammer · commit 001fa7294ddc · 2018-10-05T07:46:39.000+02:00
diff --git a/io/tst_file_simple.c b/io/tst_file_simple.c
@@ -1,7 +1,7 @@
 /*
  * File: tst_file_simple.c
  * Functionality:
- *  simple test opening and closing a file using MPI_File_open and 
+ *  simple test opening and closing a file using MPI_File_open and
  *  MPI_File_close
  * Author: Christoph Niethammer
  *
@@ -12,6 +12,7 @@
 
 #include <mpi.h>
 #include "mpi_test_suite.h"
+#include "tst_threads.h"
 
 
 
diff --git a/mpi_test_suite.c b/mpi_test_suite.c
@@ -8,6 +8,7 @@
 #include <mpi.h>
 
 #include "mpi_test_suite.h"
+#include "tst_threads.h"
 #include "tst_output.h"
 #include "compile_info.h"
 
diff --git a/mpi_test_suite.h b/mpi_test_suite.h
@@ -461,32 +461,6 @@ extern int tst_type_deselect (const char * type_string,
 extern int tst_type_compare(const MPI_Datatype type1, const MPI_Datatype type2);
 extern int tst_hash_value (const struct tst_env * env);
 
-extern int tst_thread_init (int max_threads, struct tst_thread_env_t *** thread_env);
-extern int tst_thread_cleanup (struct tst_thread_env_t ** thread_env);
-extern int tst_thread_assign_reset (struct tst_thread_env_t ** thread_env);
-extern int tst_thread_assign_all (struct tst_env * env, struct tst_thread_env_t ** thread_env);
-extern int tst_thread_assign_one (struct tst_env * env, int thread_number, struct tst_thread_env_t ** thread_env);
-extern int tst_thread_execute_init (struct tst_env * env);
-extern int tst_thread_execute_run (struct tst_env * env);
-extern int tst_thread_execute_cleanup (struct tst_env * env);
-
-extern int tst_thread_get_num (void);
-extern int tst_thread_running (void);
-extern int tst_thread_num_threads (void);
-
-extern int tst_thread_signal_init (int num);
-extern int tst_thread_signal_cleanup (void);
-extern int tst_thread_signal_wait (int tag);
-extern int tst_thread_signal_send (int tag);
-
-extern void * tst_thread_global_buffer_init (int size);
-extern int tst_thread_global_buffer_cleanup (void);
-extern void * tst_thread_get_global_buffer ();
-extern int tst_thread_get_global_buffer_size ();
-
-extern MPI_Request * tst_thread_alloc_global_requests (int num);
-extern MPI_Request * tst_thread_get_global_request (int num);
-extern int tst_thread_free_global_requests (void);
 
 /*
  * Test functions
diff --git a/p2p/tst_p2p_alltoall_probe_anysource.c b/p2p/tst_p2p_alltoall_probe_anysource.c
@@ -18,6 +18,7 @@
 #endif
 #include <mpi.h>
 #include "mpi_test_suite.h"
+#include "tst_threads.h"
 #include "tst_output.h"
 
 
diff --git a/p2p/tst_p2p_simple_ring_bsend.c b/p2p/tst_p2p_simple_ring_bsend.c
@@ -12,6 +12,7 @@
  */
 #include <mpi.h>
 #include "mpi_test_suite.h"
+#include "tst_threads.h"
 #include "tst_output.h"
 
 
diff --git a/p2p/tst_p2p_simple_ring_ibsend.c b/p2p/tst_p2p_simple_ring_ibsend.c
@@ -12,13 +12,11 @@
  */
 #include <assert.h>
 #include <mpi.h>
+
 #include "mpi_test_suite.h"
+#include "tst_threads.h"
 #include "tst_output.h"
 
-#ifdef HAVE_PTHREAD_H
-#  include <pthread.h>
-#endif
-
 
 /*
  * XXX
diff --git a/threaded/tst_threaded_bcast.c b/threaded/tst_threaded_bcast.c
@@ -10,6 +10,7 @@
  */
 #include <mpi.h>
 #include "mpi_test_suite.h"
+#include "tst_threads.h"
 #include "tst_output.h"
 
 #ifdef HAVE_PTHREAD_H
@@ -25,7 +26,7 @@ int tst_threaded_ring_init (struct tst_env * env)
   int comm_rank;
   int thread_num;
   MPI_Comm comm;
-  MPI_Group 
+  MPI_Group
 
   tst_output_printf (DEBUG_LOG, TST_REPORT_MAX, "(Rank:%d) env->comm:%d env->type:%d env->values_num:%d\n",
                  tst_global_rank, env->comm, env->type, env->values_num);
diff --git a/threaded/tst_threaded_comm_dup.c b/threaded/tst_threaded_comm_dup.c
@@ -1,7 +1,7 @@
 /*
  * File: tst_threaded_comm_dup.c
  *
- * Functionality: 
+ * Functionality:
  *      Generates as many copies of the communicator as threads exist
  *      using MPI_Comm_dup. Then each thread executes MPI_Bcast on its
  *      copy of the communicator.
@@ -11,12 +11,12 @@
  * Date: Feb 26th 2007
  */
 #include <mpi.h>
+
 #include "mpi_test_suite.h"
+#include "tst_threads.h"
 #include "tst_output.h"
 
-#ifdef HAVE_PTHREAD_H
-#  include <pthread.h>
-#endif
+
 
 
 static MPI_Comm * new_comms;
@@ -41,13 +41,13 @@ int tst_threaded_comm_dup_init (struct tst_env * env)
                  tst_global_rank, env->comm, env->type, env->values_num);
 
   env->send_buffer = tst_type_allocvalues (env->type, env->values_num);
-  /* 
-   * initialise copies of communicators 
+  /*
+   * initialise copies of communicators
    */
   if (thread_num == 0) {
-    if (NULL == (new_comms = malloc (num_threads * sizeof (MPI_Comm)))) 
+    if (NULL == (new_comms = malloc (num_threads * sizeof (MPI_Comm))))
       ERROR (errno, "malloc");
-    for (i = 0; i < num_threads; i++) 
+    for (i = 0; i < num_threads; i++)
       MPI_CHECK (MPI_Comm_dup (comm, &new_comms[i]));
     tst_output_printf (DEBUG_LOG, TST_REPORT_MAX, "(Rank:%d) initialised copies of communicators\n",
 	tst_global_rank);
diff --git a/threaded/tst_threaded_ring.c b/threaded/tst_threaded_ring.c
@@ -3,7 +3,7 @@
  *
  * Functionality:
  *  Threaded point-to-point ring-communication test using MPI_Send and MPI_Recv each on its own thread.
- *  The ring over the threads is realised using tags. The rings starting with process and thread zero. 
+ *  The ring over the threads is realised using tags. The rings starting with process and thread zero.
  *  Works with intra-communicators and up to now with any C (standard and struct) type.
  *
  * Author: Christoph Niethammer
@@ -12,6 +12,7 @@
  */
 #include <mpi.h>
 #include "mpi_test_suite.h"
+#include "tst_threads.h"
 #include "tst_output.h"
 
 #ifdef HAVE_PTHREAD_H
diff --git a/threaded/tst_threaded_ring_bsend.c b/threaded/tst_threaded_ring_bsend.c
@@ -3,7 +3,7 @@
  *
  * Functionality:
  *  Threaded point-to-point ring-communication test using MPI_Send and MPI_Recv each on its own thread.
- *  The ring over the threads is realised using tags. The rings starting with process and thread zero. 
+ *  The ring over the threads is realised using tags. The rings starting with process and thread zero.
  *  Works with intra-communicators and up to now with any C (standard and struct) type.
  *
  * Author: Christoph Niethammer
@@ -12,6 +12,7 @@
  */
 #include <mpi.h>
 #include "mpi_test_suite.h"
+#include "tst_threads.h"
 #include "tst_output.h"
 
 #ifdef HAVE_PTHREAD_H
@@ -145,7 +146,7 @@ int tst_threaded_ring_bsend_run (struct tst_env * env)
     MPI_CHECK (MPI_Bsend (env->send_buffer, env->values_num, type, send_to, thread_tag_to, comm));
 
     MPI_Buffer_detach (&globbuffaddr, &globbuffsize);
-    
+
     /*
      * check results of send process
      */
diff --git a/threaded/tst_threaded_ring_isend.c b/threaded/tst_threaded_ring_isend.c
@@ -12,14 +12,15 @@
  */
 #include <mpi.h>
 #include "mpi_test_suite.h"
+#include "tst_threads.h"
 #include "tst_output.h"
 
 
 int tst_threaded_ring_isend_init (struct tst_env * env)
 {
   int comm_rank;
   MPI_Comm comm;
-  int thread_num = tst_thread_get_num(); 
+  int thread_num = tst_thread_get_num();
 
   tst_output_printf (DEBUG_LOG, TST_REPORT_MAX, "(Rank:%d) env->comm:%d env->type:%d env->values_num:%d\n",
                  tst_global_rank, env->comm, env->type, env->values_num);
@@ -37,7 +38,7 @@ int tst_threaded_ring_isend_init (struct tst_env * env)
   if ( (env->status_buffer = malloc (sizeof (MPI_Status) * 2)) == NULL )
     ERROR (errno, "malloc");
 
-  if (0 == thread_num) 
+  if (0 == thread_num)
   {
     tst_thread_alloc_global_requests (2);
     tst_thread_signal_init (2);
@@ -64,11 +65,11 @@ int tst_threaded_ring_isend_run (struct tst_env * env)
   int thread_num;
 
   num_threads = tst_thread_num_threads();
-  thread_num = tst_thread_get_num(); 
+  thread_num = tst_thread_get_num();
 
   statuses = env->status_buffer;
   requests = tst_thread_get_global_request (0);
-  
+
   comm = tst_comm_getcomm (env->comm);
   type = tst_type_getdatatype (env->type);
 
@@ -117,7 +118,7 @@ int tst_threaded_ring_isend_run (struct tst_env * env)
       tst_thread_signal_wait (0);
       MPI_Waitall(2, requests, statuses);
       /*
-       * Inform thread 0 that communication has finished 
+       * Inform thread 0 that communication has finished
        */
       tst_thread_signal_send (1);
     }
@@ -154,12 +155,12 @@ int tst_threaded_ring_isend_run (struct tst_env * env)
 
 int tst_threaded_ring_isend_cleanup (struct tst_env * env)
 {
-  int thread_num = tst_thread_get_num(); 
+  int thread_num = tst_thread_get_num();
 
   tst_type_freevalues (env->type, env->send_buffer, env->values_num);
   tst_type_freevalues (env->type, env->recv_buffer, env->values_num);
 
-  if (0 == thread_num) 
+  if (0 == thread_num)
   {
     free (env->status_buffer);
     free (env->req_buffer);
diff --git a/threaded/tst_threaded_ring_persistent.c b/threaded/tst_threaded_ring_persistent.c
@@ -12,6 +12,7 @@
  */
 #include <mpi.h>
 #include "mpi_test_suite.h"
+#include "tst_threads.h"
 #include "tst_output.h"
 
 
@@ -32,7 +33,7 @@ int tst_threaded_ring_persistent_init (struct tst_env * env)
   int recv_from;
   int thread_tag_to;
   int thread_tag_from;
-  
+
   tst_output_printf (DEBUG_LOG, TST_REPORT_MAX, "(Rank:%d) env->comm:%d env->type:%d env->values_num:%d\n",
                      tst_global_rank, env->comm, env->type, env->values_num);
 
@@ -45,7 +46,7 @@ int tst_threaded_ring_persistent_init (struct tst_env * env)
   MPI_CHECK (MPI_Comm_size (comm, &comm_size));
   thread_num  = tst_thread_get_num ();
   num_threads = tst_thread_num_threads ();
-  
+
   /*
    * Now, initialize the send_buffer
    */
@@ -85,7 +86,7 @@ int tst_threaded_ring_persistent_init (struct tst_env * env)
 
   tst_output_printf (DEBUG_LOG, TST_REPORT_MAX, "Adresses of allocated requests:\tRequest 0: %p\tRequest 1: %p, MPI_REQUEST_NULL: %p\n", &(env->req_buffer[0]), &(env->req_buffer[1]), MPI_REQUEST_NULL);
   tst_output_printf (DEBUG_LOG, TST_REPORT_MAX, "Before init:\tRequest 0: %p\tRequest 1: %p, MPI_REQUEST_NULL: %p\n", env->req_buffer[0], env->req_buffer[1], MPI_REQUEST_NULL);
- 
+
   MPI_CHECK (MPI_Send_init (env->send_buffer, env->values_num, type, send_to, thread_tag_to, comm, &(env->req_buffer[0])));
   MPI_CHECK (MPI_Recv_init (env->recv_buffer, env->values_num, type, recv_from, thread_tag_from, comm,  &(env->req_buffer[1])));
   tst_output_printf (DEBUG_LOG, TST_REPORT_MAX, "After init:\tRequest 0: %p\tRequest 1: %p, MPI_REQUEST_NULL: %p\n", env->req_buffer[0], env->req_buffer[1], MPI_REQUEST_NULL);
@@ -108,7 +109,7 @@ int tst_threaded_ring_persistent_run (struct tst_env * env)
   comm = tst_comm_getcomm (env->comm);
   type = tst_type_getdatatype (env->type);
   thread_tag = env->tag + tst_thread_get_num ();
-      
+
   if (tst_comm_getcommclass (env->comm) & TST_MPI_COMM_SELF)
     {
       comm_size = 1;
@@ -138,7 +139,7 @@ int tst_threaded_ring_persistent_run (struct tst_env * env)
   MPI_CHECK (MPI_Start (&(env->req_buffer[0])));
   MPI_CHECK (MPI_Start (&(env->req_buffer[1])));
 #endif
-  
+
   tst_output_printf (DEBUG_LOG, TST_REPORT_MAX, "After start:\tRequest 0: %p\tRequest 1: %p, MPI_REQUEST_NULL: %p\n", env->req_buffer[0], env->req_buffer[1], MPI_REQUEST_NULL);
   tst_output_printf (DEBUG_LOG, TST_REPORT_MAX, "Before wait:\tRequest 0: %p\tRequest 1: %p, MPI_REQUEST_NULL: %p\n", env->req_buffer[0], env->req_buffer[1], MPI_REQUEST_NULL);
 #if WAITALL
@@ -148,7 +149,7 @@ int tst_threaded_ring_persistent_run (struct tst_env * env)
   MPI_CHECK (MPI_Wait (&(env->req_buffer[1]), &(env->status_buffer[1])));
 #endif
   tst_output_printf (DEBUG_LOG, TST_REPORT_MAX, "After wait:\tRequest 0: %p\tRequest 1: %p, MPI_REQUEST_NULL: %p\n", env->req_buffer[0], env->req_buffer[1], MPI_REQUEST_NULL);
-  
+
   /*
    * Now verify the sent data
    */
diff --git a/tst_threads.c b/tst_threads.c
@@ -1,5 +1,7 @@
 #include "config.h"
 
+#include "tst_threads.h"
+
 #include <assert.h>
 #include <pthread.h>
 
@@ -13,43 +15,12 @@ static pthread_cond_t working_cond = PTHREAD_COND_INITIALIZER;
 static void * tst_global_buffer;
 static int tst_global_buffer_size;
 
-typedef enum {
-  TST_THREAD_CMD_NULL = 0,
-  TST_THREAD_CMD_INIT,
-  TST_THREAD_CMD_RUN,
-  TST_THREAD_CMD_CLEANUP,
-  TST_THREAD_CMD_FINALIZE
-} tst_thread_cmd_t;
-
 static tst_thread_cmd_t cmd = TST_THREAD_CMD_NULL;
 static int cmd_count = 0;
 static pthread_mutex_t cmd_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t cmd_cond = PTHREAD_COND_INITIALIZER;
 
 
-typedef enum {
-  TST_THREAD_STATE_IDLE = 0,
-  TST_THREAD_STATE_CALLING_INIT,
-  TST_THREAD_STATE_CALLING_RUN,
-  TST_THREAD_STATE_CALLING_CLEANUP,
-  TST_THREAD_STATE_FINALIZE
-} tst_thread_state_t;
-
-
-struct tst_thread_env_t {
-  int thread_num;
-  tst_thread_state_t state;
-  pthread_t tid;
-  struct tst_env env;
-  int (*tst_init_func) (const struct tst_env * env);
-  int (*tst_run_func) (const struct tst_env * env);
-  int (*tst_cleanup_func) (const struct tst_env * env);
-};
-
-typedef enum {
-  TST_THREAD_SIGNAL_STATE_WAIT = 0,
-  TST_THREAD_SIGNAL_STATE_GOON
-} tst_thread_signal_state;
 
 
 /* saving thread_ids for global access, also available in main via struct thread_env */
@@ -171,8 +142,8 @@ int tst_thread_init(int max_threads, struct tst_thread_env_t ***thread_env) {
   /* Without the pthread_mutex_lock, as no threads are started, yet */
   working = 0;
 
-  tst_output_printf (DEBUG_LOG, TST_REPORT_MAX, "(Rank:%d) tst_thread_init: max_threads:%d sizeof (struct tst_thread_env_t):%d\n",
-                 tst_global_rank, max_threads, sizeof (struct tst_thread_env_t));
+  tst_output_printf(DEBUG_LOG, TST_REPORT_MAX, "(Rank:%d) tst_thread_init: Initializing %d threads\n",
+                 tst_global_rank, max_threads);
 
   tst_thread_tid_array = malloc ( max_threads * sizeof (pthread_t));
   memset (tst_thread_tid_array, 0, max_threads * sizeof (pthread_t));
diff --git a/tst_threads.h b/tst_threads.h
