Browse Source

name functions consistently
remove now unnecessary notified_workers arg

Olivier Aumage 8 years ago
parent
commit
060a2f7985
1 changed files with 9 additions and 9 deletions
  1. 9 9
      src/core/sched_ctx.c

+ 9 - 9
src/core/sched_ctx.c

@@ -38,8 +38,8 @@ static int occupied_sms = 0;
 static unsigned _starpu_get_first_free_sched_ctx(struct _starpu_machine_config *config);
 static unsigned _starpu_get_first_free_sched_ctx(struct _starpu_machine_config *config);
 
 
 static void _starpu_sched_ctx_put_new_master(unsigned sched_ctx_id);
 static void _starpu_sched_ctx_put_new_master(unsigned sched_ctx_id);
-static void _starpu_sched_ctx_put_workers_to_sleep(unsigned sched_ctx_id, unsigned all, int notified_workers);
-static void _starpu_sched_ctx_wake_up_workers(unsigned sched_ctx_id, unsigned all, int notified_workers);
+static void _starpu_sched_ctx_block_workers(unsigned sched_ctx_id, unsigned all);
+static void _starpu_sched_ctx_unblock_workers(unsigned sched_ctx_id, unsigned all);
 static void _starpu_sched_ctx_update_parallel_workers_with(unsigned sched_ctx_id);
 static void _starpu_sched_ctx_update_parallel_workers_with(unsigned sched_ctx_id);
 static void _starpu_sched_ctx_update_parallel_workers_without(unsigned sched_ctx_id);
 static void _starpu_sched_ctx_update_parallel_workers_without(unsigned sched_ctx_id);
 
 
@@ -1104,7 +1104,7 @@ void starpu_sched_ctx_delete(unsigned sched_ctx_id)
 	if(!_starpu_wait_for_all_tasks_of_sched_ctx(sched_ctx_id))
 	if(!_starpu_wait_for_all_tasks_of_sched_ctx(sched_ctx_id))
 	{
 	{
 		if(!sched_ctx->sched_policy)
 		if(!sched_ctx->sched_policy)
-			_starpu_sched_ctx_wake_up_workers(sched_ctx_id, 0, 1);
+			_starpu_sched_ctx_unblock_workers(sched_ctx_id, 0);
 		/*if btw the mutex release & the mutex lock the context has changed take care to free all
 		/*if btw the mutex release & the mutex lock the context has changed take care to free all
 		  scheduling data before deleting the context */
 		  scheduling data before deleting the context */
 
 
@@ -2319,7 +2319,7 @@ void starpu_sched_ctx_list_task_counters_reset_all(struct starpu_task *task, uns
 	}
 	}
 }
 }
 
 
-static void _starpu_sched_ctx_put_workers_to_sleep(unsigned sched_ctx_id, unsigned all, int notified_workers)
+static void _starpu_sched_ctx_block_workers(unsigned sched_ctx_id, unsigned all)
 {
 {
 	struct _starpu_sched_ctx *sched_ctx = _starpu_get_sched_ctx_struct(sched_ctx_id);
 	struct _starpu_sched_ctx *sched_ctx = _starpu_get_sched_ctx_struct(sched_ctx_id);
 	int current_worker_id = starpu_worker_get_id();
 	int current_worker_id = starpu_worker_get_id();
@@ -2381,7 +2381,7 @@ static void _starpu_sched_ctx_put_workers_to_sleep(unsigned sched_ctx_id, unsign
 		sched_ctx->main_master = -1;
 		sched_ctx->main_master = -1;
 }
 }
 
 
-static void _starpu_sched_ctx_wake_up_workers(unsigned sched_ctx_id, unsigned all, int notified_workers)
+static void _starpu_sched_ctx_unblock_workers(unsigned sched_ctx_id, unsigned all)
 {
 {
 	struct _starpu_sched_ctx *sched_ctx = _starpu_get_sched_ctx_struct(sched_ctx_id);
 	struct _starpu_sched_ctx *sched_ctx = _starpu_get_sched_ctx_struct(sched_ctx_id);
 	int current_worker_id = starpu_worker_get_id();
 	int current_worker_id = starpu_worker_get_id();
@@ -2447,13 +2447,13 @@ static void _starpu_sched_ctx_wake_up_workers(unsigned sched_ctx_id, unsigned al
 
 
 void* starpu_sched_ctx_exec_parallel_code(void* (*func)(void*), void* param, unsigned sched_ctx_id)
 void* starpu_sched_ctx_exec_parallel_code(void* (*func)(void*), void* param, unsigned sched_ctx_id)
 {
 {
-	_starpu_sched_ctx_put_workers_to_sleep(sched_ctx_id, 1, 0);
+	_starpu_sched_ctx_block_workers(sched_ctx_id, 1);
 
 
 	/* execute parallel code */
 	/* execute parallel code */
 	void* ret = func(param);
 	void* ret = func(param);
 
 
 	/* wake up starpu workers */
 	/* wake up starpu workers */
-	_starpu_sched_ctx_wake_up_workers(sched_ctx_id, 1, 0);
+	_starpu_sched_ctx_unblock_workers(sched_ctx_id, 1);
 	return ret;
 	return ret;
 }
 }
 
 
@@ -2469,7 +2469,7 @@ static void _starpu_sched_ctx_update_parallel_workers_with(unsigned sched_ctx_id
 
 
 	if(!sched_ctx->awake_workers)
 	if(!sched_ctx->awake_workers)
 	{
 	{
-		_starpu_sched_ctx_put_workers_to_sleep(sched_ctx_id, 0, 1);
+		_starpu_sched_ctx_block_workers(sched_ctx_id, 0);
 	}
 	}
 }
 }
 
 
@@ -2485,7 +2485,7 @@ static void _starpu_sched_ctx_update_parallel_workers_without(unsigned sched_ctx
 
 
 	if(!sched_ctx->awake_workers)
 	if(!sched_ctx->awake_workers)
 	{
 	{
-		_starpu_sched_ctx_wake_up_workers(sched_ctx_id, 0, 1);
+		_starpu_sched_ctx_unblock_workers(sched_ctx_id, 0);
 	}
 	}
 }
 }