last updates

Author: pap0012

src/intrinsic.c

@@ -10,8 +10,12 @@ int omp_get_num_threads (void) {
 
 int omp_get_thread_num (void) {
   //printf("TBI: omp_get_thread_num still doesn't know who I am ... let's say I am 0\n");
-  int thread_id = ((miniomp_parallel_t*) (pthread_getspecific(miniomp_specifickey)))->id;
-  return(thread_id);
+  printf("Called get_thread: \n");
+  miniomp_thread_t *thread = pthread_getspecific(miniomp_specifickey);
+  printf("Casted getspecific \n");
+  unsigned int thread_id = thread->id;
+  printf("%d\n", thread_id);
+  return((int)thread_id);
 }
 
 // No need to implement this function, it is just involked by Extrae at some point

src/libminiomp.c

@@ -8,6 +8,8 @@ void fini_miniomp(void) __attribute__((destructor));
 // Function to parse OMP_NUM_THREADS environment variable
 void parse_env(void);
 
+pthread_key_t miniomp_specifickey;
+
 void
 init_miniomp(void) {
   printf ("mini-omp is being initialized\n");

src/libminiomp.h

@@ -23,3 +23,4 @@ extern pthread_key_t miniomp_specifickey;
 #include "loop.h"
 #include "single.h"
 #include "task.h"
+

src/parallel.c

@@ -3,46 +3,54 @@
 // This file implements the PARALLEL construct
 
 // Declaration of array for storing pthread identifier from pthread_create function
-pthread_t *miniomp_threads;
+miniomp_thread_t *miniomp_threads;
 
 // Global variable for parallel descriptor
 miniomp_parallel_t *miniomp_parallel;
 
 // Declaration of per-thread specific key
 pthread_key_t miniomp_specifickey;
 
+void miniomp_thread_init(miniomp_thread_t * thread, unsigned int id, void (*fn) (void *), miniomp_parallel_t *region){
+  thread->id = id;
+  thread->region = region;
+  pthread_setspecific(miniomp_specifickey, thread);
+  pthread_create(&(thread->pthread), NULL, fn, thread);
+}
+
+
 // This is the prototype for the Pthreads starting function
-void *worker(void *args) {
-  miniomp_parallel_t *parallel_t = args;
-  int id = parallel_t->id;
+void worker(void *args) {
+  miniomp_thread_t *thread = args;
+  miniomp_parallel_t *parallel = thread->region;
+  int id = thread->id;
   printf("Thread %d initialized\n", id);
-  void (*fn) (void *) = parallel_t->fn;
-  void * data = parallel_t->fn_data;
-  pthread_setspecific(miniomp_specifickey, parallel_t);
+  void (*fn) (void *) = parallel->fn;
+  void * data = parallel->fn_data;
+  //printf("Thread %d fn and data done\n", id);
   fn(data);
+  //printf("Executed fn in thread %d", id);
     // insert all necessary code here for:
   //   1) save thread-specific data
   //   2) invoke the per-threads instance of function encapsulating the parallel region
   //   3) exit the function
-  return(NULL);
 }
 
 void
 GOMP_parallel (void (*fn) (void *), void *data, unsigned num_threads, unsigned int flags) {
   if(!num_threads) num_threads = omp_get_num_threads();
   printf("Starting a parallel region using %d threads\n", num_threads);
-  miniomp_threads = malloc(num_threads*sizeof(pthread_t));
-  miniomp_parallel = malloc(sizeof(miniomp_parallel_t)*num_threads);
+  miniomp_threads = malloc(num_threads*sizeof(miniomp_thread_t));
+  miniomp_parallel = malloc(sizeof(miniomp_parallel_t));
+  miniomp_parallel->fn = fn;
+  miniomp_parallel->fn_data = data;
+  miniomp_parallel->id = 0;  
+  pthread_mutex_init(&(miniomp_parallel->mutex), NULL);
   for (int i=0; i<num_threads; i++){
-    //pthread_mutex_init(&miniomp_parallel[i].mutex, NULL);
-    miniomp_parallel[i].fn = fn;
-    miniomp_parallel[i].fn_data = data;
-    miniomp_parallel[i].id = i;
-    pthread_create(&miniomp_threads[i], NULL, worker, &miniomp_parallel[i]);
+    miniomp_thread_init(&miniomp_threads[i], i, worker, miniomp_parallel);
   }
   for (int i=0; i < num_threads; i++){
-    pthread_join(miniomp_threads[i], NULL);
-    //pthread_mutex_destroy(&miniomp_parallel[i].mutex);
+    pthread_join(miniomp_threads[i].pthread, NULL);
   }
   free(miniomp_threads);
   free(miniomp_parallel);

src/parallel.h

@@ -1,25 +1,26 @@
 #include <pthread.h>
 
 // Declaration of array for storing pthread identifiers from pthread_create function
-extern pthread_t *miniomp_threads;
 
 // Type declaration for parallel descriptor (arguments needed to create pthreads)
 typedef struct {
   void (*fn) (void *);
   void *fn_data;
-  int id;
+  unsigned int id;
   pthread_mutex_t mutex;
     // complete the definition of parallel descriptor
 } miniomp_parallel_t;
 
 typedef struct {
   unsigned int id;
-} miniomp_parallel_region;
+  pthread_t pthread;
+  miniomp_parallel_t *region;
+} miniomp_thread_t;
 
 extern miniomp_parallel_t *miniomp_parallel;
-
-// Declaration of per-thread specific key
 extern pthread_key_t miniomp_specifickey;
 
 // Functions implemented in this module
+void miniomp_parallel_init(miniomp_parallel_t *parallel, void (*fn) (void *), void *data, unsigned int id);
+void miniomp_thread_init(miniomp_thread_t * thread, unsigned int id, void (*fn) (void *), miniomp_parallel_t *region);
 void GOMP_parallel (void (*fn) (void *), void *data, unsigned num_threads, unsigned int flags);

src/thread.c

@@ -1,6 +1,11 @@
 #include "thread.h"
+#include "libminiomp.h"
 
-void miniomp_thread_init(miniomp_thread * thread, unsigned int id, void (*fn) (void *), void *data){
+pthread_key_t miniomp_specifickey;
+
+void miniomp_thread_init(miniomp_thread_t * thread, unsigned int id, void (*fn) (void *), void *data){
   thread->id = id;
+  thread->region = data;
   pthread_create(thread->pthread, NULL, fn, data);
+  pthread_setspecific(miniomp_specifickey, thread);
 }

src/thread.h

@@ -1,9 +1,12 @@
 #include <pthread.h>
-#include "libminiomp.h"
+
 
 typedef struct {
   unsigned int id;
   pthread_t pthread;
-} miniomp_thread;
+  struct miniomp_parallel_t *region;
+} miniomp_thread_t;
+
+extern pthread_key_t miniomp_specifickey;
 
-void miniomp_thread_init(miniomp_thread * thread, unsigned int id);
+void miniomp_thread_init(miniomp_thread_t * thread, unsigned int id, void (*fn) (void *), void *data);

test/tparallel.c

@@ -8,7 +8,7 @@ int foo() {
     int i, x = 1023;
     #pragma omp parallel firstprivate(x) reduction(+:first) if(x>0) num_threads(2)
     {
-    x++; 
+    x++;
     first += x;
     }