From 605d492bdd18a738b4b44b5d7b3778f3fbbc98a5 Mon Sep 17 00:00:00 2001 From: suter Date: Tue, 26 Jun 2012 12:48:51 +0200 Subject: [PATCH] invalid access mode should be tested in the setter not in the dump function. --- src/simdag/sd_workstation.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c index 4c6be1a02a..7a163ef9e9 100644 --- a/src/simdag/sd_workstation.c +++ b/src/simdag/sd_workstation.c @@ -181,8 +181,7 @@ void SD_workstation_dump(SD_workstation_t ws) else XBT_INFO(" no task running"); break; - default: - XBT_INFO(" - (unknown access mode)"); + default: break; } props = SD_workstation_get_properties(ws); @@ -434,6 +433,10 @@ void SD_workstation_set_access_mode(SD_workstation_t workstation, e_SD_workstation_access_mode_t access_mode) { + xbt_assert(access_mode != SD_WORKSTATION_SEQUENTIAL_ACCESS || + access_mode != SD_WORKSTATION_SHARED_ACCESS, + "Trying to set an invalid access mode"); + if (access_mode == workstation->access_mode) { return; // nothing is changed } @@ -448,16 +451,16 @@ void SD_workstation_set_access_mode(SD_workstation_t workstation, } } -/* Returns whether a task can start now on a workstation. - *//* - int __SD_workstation_can_start(SD_workstation_t workstation, SD_task_t task) { - SD_CHECK_INIT_DONE(); - xbt_assert(workstation != NULL && task != NULL, "Invalid parameter"); +/* Returns whether a task can start now on a workstation*/ +/* + int __SD_workstation_can_start(SD_workstation_t workstation, SD_task_t task) { + SD_CHECK_INIT_DONE(); + xbt_assert(workstation != NULL && task != NULL, "Invalid parameter"); - return !__SD_workstation_is_busy(workstation) && - (xbt_fifo_size(workstation->task_fifo) == 0) || xbt_fifo_get_first_item(workstation->task_fifo) == task); - } - */ + return !__SD_workstation_is_busy(workstation) && + (xbt_fifo_size(workstation->task_fifo) == 0) || xbt_fifo_get_first_item(workstation->task_fifo) == task); + } +*/ /* Returns whether a workstation is busy. A workstation is busy is it is * in sequential mode and a task is running on it or the fifo is not empty. -- 2.20.1