Przeglądaj źródła

fix bug data conversion

Andra Hugo 13 lat temu
rodzic
commit
4d02255b2f

+ 3 - 3
doc/chapters/advanced-api.texi

@@ -524,8 +524,8 @@ This function creates a scheduling context which uses the scheduling policy indi
 The return value represents the identifier of the context that has just been created. It will be further used to indicate the context the tasks will be submitted to. The return value should be at most @code{STARPU_NMAX_SCHED_CTXS}.
 @end deftypefun
 
-@deftypefun void starpu_delete_sched_ctx (unsigned @var{sched_ctx_id}, unsigned @var{inheritor_sched_ctx_id})
-This function deletes the scheduling context indicated by the first argument and lets the scheduling context indicated in the second argument take over its workers.
+@deftypefun void starpu_delete_sched_ctx (unsigned @var{sched_ctx_id}, unsigned @var{inheritor_sched_ctx_id}) 
+Delete scheduling context @var{sched_ctx_id} and lets scheduling context @var{inheritor_sched_ctx_id} take over its workers.
 @end deftypefun
 
 @deftypefun void starpu_add_workers_to_sched_ctx ({int *}@var{workerids_ctx}, int @var{nworkers_ctx}, unsigned @var{sched_ctx})
@@ -570,7 +570,7 @@ Deinitialize the cursor if there is one
 @end deftp
 
 @deftypefun struct worker_collection* starpu_create_worker_collection_for_sched_ctx (unsigned @var{sched_ctx_id}, int @var{type})
-Creates a worker collection of the type indicated by the last parameter for the context specified through the first parameter
+Creates a worker collection of the type indicated by the last parameter for the context specified through the first parameter.
 @end deftypefun
 
 @deftypefun void starpu_delete_worker_collection_for_sched_ctx (unsigned @var{sched_ctx_id})

+ 1 - 1
doc/chapters/sched_ctx_hypervisor.texi

@@ -209,7 +209,7 @@ starpu_insert_task(&codelet,
 @node Performance Counters
 @section Performance Counters
 
-The Scheduling Context Hypervisor Plugin provides a series of performance counters to StarPU. By incrementing them, StarPU can help the hypervisor in the resizing decision taking process.
+The Scheduling Context Hypervisor Plugin provides a series of performance counters to StarPU. By incrementing them, StarPU can help the hypervisor in the resizing decision making process.
 
 @deftp {Data Type} {struct starpu_performance_counters}
 @anchor{struct starpu_performance_counters}

+ 2 - 2
src/sched_policies/heft.c

@@ -404,7 +404,7 @@ static int push_conversion_tasks(struct starpu_task *task, unsigned int workerid
         pthread_cond_t *sched_cond;
         starpu_worker_get_sched_condition(sched_ctx_id, workerid, &sched_mutex, &sched_cond);
 
-	_STARPU_PTHREAD_MUTEX_LOCK(&sched_mutex[workerid]);
+	_STARPU_PTHREAD_MUTEX_LOCK(sched_mutex);
 	for (i = 0; i < task->cl->nbuffers; i++)
 	{
 		struct starpu_task *conversion_task;
@@ -426,7 +426,7 @@ static int push_conversion_tasks(struct starpu_task *task, unsigned int workerid
 	task->execute_on_a_specific_worker = 1;
 	task->workerid = workerid;
 	task->mf_skip= 1;
-	_STARPU_PTHREAD_MUTEX_UNLOCK(&sched_mutex[workerid]);
+	_STARPU_PTHREAD_MUTEX_UNLOCK(sched_mutex);
 
 	return 0;
 }