aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuji Mano <yuji.mano@am.sony.com>2009-03-24 18:48:25 -0700
committerYuji Mano <yuji.mano@am.sony.com>2009-03-26 17:23:41 -0700
commit609efda69300dccefcdee18622bf399df86c7032 (patch)
tree8f713b51306858c536aec9f2b9488a719c417918
parent5470c2bc5dcda1f400d46951a2fbed78286e0f39 (diff)
downloadmars-src-609efda69300dccefcdee18622bf399df86c7032.tar.gz
task: Module api compatibility
This patch is for compatibility with the base-workload-queue-module-api-update.patch. Signed-off-by: Yuji Mano <yuji.mano@am.sony.com> Acked-by: Kazunori Asayama <asayama@sm.sony.co.jp>
-rw-r--r--task/src/host/lib/task.c12
-rw-r--r--task/src/mpu/module/task_module.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/task/src/host/lib/task.c b/task/src/host/lib/task.c
index c23c816..f23eeff 100644
--- a/task/src/host/lib/task.c
+++ b/task/src/host/lib/task.c
@@ -187,7 +187,7 @@ int mars_task_create(struct mars_context *mars,
/* map task ELF */
ret = task_map_elf(task, elf_image);
if (ret != MARS_SUCCESS) {
- mars_workload_queue_add_cancel(mars, workload_id);
+ mars_workload_queue_add_end(mars, workload_id, 1);
return ret;
}
@@ -210,7 +210,7 @@ int mars_task_create(struct mars_context *mars,
context_save_size +
MARS_TASK_REGISTER_SAVE_AREA_SIZE);
if (!task->context_save_area_ea) {
- mars_workload_queue_add_cancel(mars, workload_id);
+ mars_workload_queue_add_end(mars, workload_id, 1);
return MARS_ERROR_MEMORY;
}
} else
@@ -221,10 +221,10 @@ int mars_task_create(struct mars_context *mars,
mars_ea_sync();
/* end process to add the task to the workload queue */
- ret = mars_workload_queue_add_end(mars, workload_id);
+ ret = mars_workload_queue_add_end(mars, workload_id, 0);
if (ret != MARS_SUCCESS) {
mars_ea_free(task->context_save_area_ea);
- mars_workload_queue_add_cancel(mars, workload_id);
+ mars_workload_queue_add_end(mars, workload_id, 1);
return ret;
}
@@ -273,7 +273,7 @@ int mars_task_destroy(const struct mars_task_id *id)
mars_ea_unmap(task->data_ea, task->data_size);
/* end process to remove the task from the workload queue */
- ret = mars_workload_queue_remove_end(mars, id->workload_id);
+ ret = mars_workload_queue_remove_end(mars, id->workload_id, 0);
if (ret != MARS_SUCCESS)
return ret;
@@ -323,7 +323,7 @@ int mars_task_schedule(const struct mars_task_id *id,
mars_ea_sync();
/* end process to schedule the workload in the workload queue */
- ret = mars_workload_queue_schedule_end(mars, id->workload_id);
+ ret = mars_workload_queue_schedule_end(mars, id->workload_id, 0);
if (ret != MARS_SUCCESS)
return ret;
diff --git a/task/src/mpu/module/task_module.c b/task/src/mpu/module/task_module.c
index 2d7efa9..ebadc6b 100644
--- a/task/src/mpu/module/task_module.c
+++ b/task/src/mpu/module/task_module.c
@@ -200,7 +200,7 @@ static int task_schedule(uint16_t workload_id,
schedule_task->args = *args;
/* end process to schedule the workload in the workload queue */
- return mars_module_workload_schedule_end(workload_id);
+ return mars_module_workload_schedule_end(workload_id, 0);
}
static int task_wait(uint16_t workload_id, void *task_heap)