#include "../single-thread/nbody.h" //Use original simulation code
#include <pthread.h>
+#include "barrier.h" // Barriers
#undef SINGLE_THREADED
#define PTHREADED
#define DEFAULT_WORKING_THREADS 2
-#define PERSISTENT_THREADS //If defined, threads will not be continually destroyed and then respawned
+//#define PERSISTENT_THREADS //If defined, threads will not be continually destroyed and then respawned
+
+
//Undefine default macros, replace with functions
#undef Simulation_Run
void * Compute_Thread(void * system); //Thread - Continuously perform computations for a System of bodies. May spawn additional worker threads.
+
+
+
+
+pthread_t * Allocate_Threads(unsigned n); // Allocates space for threads - handles errors
+
+#ifdef PERSISTENT_THREADS
+void * Worker_Thread(void * arg);
+#endif //PERSISTENT_THREADS
void * Force_Thread(void * system); //Thread - Compute forces for all objects in a system
void * Position_Thread(void * system); //Thread - Compute positions for all objects in a system
+void Thread_Cleanup(void); //Called at program exit to safely join computation thread
-void Thread_Cleanup(void); //Called at program exit to safely join computation thread
-typedef struct
-{
- pthread_mutex_t mutex;
- unsigned threads_busy; // Counter of threads which are busy
- pthread_cond_t threads_done_cv;
-} Barrier;
-
-void Barrier_Init(Barrier * b);
-void Barrier_Enter(Barrier * b);
-void Barrier_Leave(Barrier * b);
-void Barrier_Wait(Barrier * b);
+void * StepFunction(void * s); //Function called at the end of every step
#endif //_NBODY_MTHREAD_H