merge

include/starpu_task.h

@@ -23,7 +23,7 @@
 #include <starpu_config.h>
 
 #if defined STARPU_USE_CUDA && !defined STARPU_DONT_INCLUDE_CUDA_HEADERS
-# include <cuda.h>
+#include <cuda.h>
 #endif
 
 #include <starpu_data.h>

src/common/barrier_counter.c

@@ -26,7 +26,7 @@ int _starpu_barrier_counter_init(struct _starpu_barrier_counter_t *barrier_c, in
 int _starpu_barrier_counter_update(struct _starpu_barrier_counter_t *barrier_c, int count)
 {
 	barrier_c->barrier.count = count;
-	barrier_c->barrier.reached = 0;
+	barrier_c->barrier.reached_start = 0;
 	return 0;
 }
 
@@ -43,7 +43,7 @@ int _starpu_barrier_counter_wait_for_empty_counter(struct _starpu_barrier_counte
 	_starpu_barrier_t *barrier = &barrier_c->barrier;
 	PTHREAD_MUTEX_LOCK(&barrier->mutex);
 
-	while (barrier->reached > 0)
+	while (barrier->reached_start > 0)
 		PTHREAD_COND_WAIT(&barrier->cond, &barrier->mutex);
 
 	PTHREAD_MUTEX_UNLOCK(&barrier->mutex);
@@ -55,7 +55,7 @@ int _starpu_barrier_counter_wait_for_full_counter(struct _starpu_barrier_counter
 	_starpu_barrier_t *barrier = &barrier_c->barrier;
 	PTHREAD_MUTEX_LOCK(&barrier->mutex);
 
-	while (barrier->reached < barrier->count)
+	while (barrier->reached_start < barrier->count)
 		PTHREAD_COND_WAIT(&barrier_c->cond2, &barrier->mutex);
 
 	PTHREAD_MUTEX_UNLOCK(&barrier->mutex);
@@ -67,7 +67,7 @@ int _starpu_barrier_counter_decrement_until_empty_counter(struct _starpu_barrier
 	_starpu_barrier_t *barrier = &barrier_c->barrier;
 	PTHREAD_MUTEX_LOCK(&barrier->mutex);
 
-	if (--barrier->reached == 0)
+	if (--barrier->reached_start == 0)
 		PTHREAD_COND_BROADCAST(&barrier->cond);
 
 	PTHREAD_MUTEX_UNLOCK(&barrier->mutex);
@@ -79,7 +79,7 @@ int _starpu_barrier_counter_increment_until_full_counter(struct _starpu_barrier_
 	_starpu_barrier_t *barrier = &barrier_c->barrier;
 	PTHREAD_MUTEX_LOCK(&barrier->mutex);
 	
-	if(++barrier->reached == barrier->count)
+	if(++barrier->reached_start == barrier->count)
 		PTHREAD_COND_BROADCAST(&barrier_c->cond2);
 
 	PTHREAD_MUTEX_UNLOCK(&barrier->mutex);
@@ -91,7 +91,7 @@ int _starpu_barrier_counter_increment(struct _starpu_barrier_counter_t *barrier_
 	_starpu_barrier_t *barrier = &barrier_c->barrier;
 	PTHREAD_MUTEX_LOCK(&barrier->mutex);
 
-	barrier->reached++;
+	barrier->reached_start++;
 	
 	PTHREAD_MUTEX_UNLOCK(&barrier->mutex);
 	return 0;

src/drivers/cuda/driver_cuda.c

@@ -169,7 +169,6 @@ static int execute_job_on_cuda(starpu_job_t j, struct starpu_worker_s *args)
 	struct timespec codelet_start, codelet_end;
 
 	unsigned calibrate_model = 0;
-	int workerid = args->workerid;
 
 	STARPU_ASSERT(task);
 	struct starpu_codelet_t *cl = task->cl;
@@ -264,7 +263,7 @@ void *_starpu_cuda_worker(void *arg)
 	int res;
 
 	pthread_cond_t *sched_cond = args->sched_cond;
-    pthread_mutex_t *sched_mutex = args->sched_mutex;
+	pthread_mutex_t *sched_mutex = args->sched_mutex;
 
 	while (_starpu_machine_is_running())
 	{
@@ -311,8 +310,7 @@ void *_starpu_cuda_worker(void *arg)
 
 			cl_func func = cl->cuda_func;
 			STARPU_ASSERT(func);
-			func(task->interface, task->cl_arg);
-
+			func(task->interfaces, task->cl_arg);
 		  }
 		else
 		  {

src/sched_policies/heft.c

@@ -50,8 +50,7 @@ const float idle_power_maximum=10000.0;
 
 void param_modified(struct starputop_param_t* d){
 	//just to show parameter modification
-	fprintf(stderr,"%s has been modified : alpha=%f|beta=%f|gamma=%f|idle_power=%f !\n", 
-		d->name, alpha,beta,_gamma,idle_power);
+	fprintf(stderr,"%s has been modified : %f !\n", d->name, d->value);
 }
 static void heft_init_for_workers(unsigned sched_ctx_id, unsigned nnew_workers)
 {

src/util/starpu_insert_task_utils.c

@@ -193,7 +193,7 @@ int _starpu_insert_task_create_and_submit(char *arg_buffer, starpu_codelet *cl,
 		}
 
 		else if (arg_type==STARPU_CTX) {
-			*ctx = va_arg(varg_list, unsigned);
+			ctx = va_arg(varg_list, unsigned);
 		}
 
 	}