#include "xbt/str.h"
#include "xbt/config.h"
-XBT_LOG_NEW_CATEGORY(sd,"Logging specific to SimDag");
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel,sd,
- "Logging specific to SimDag (kernel)");
+XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd,
+ "Logging specific to SimDag (kernel)");
SD_global_t sd_global = NULL;
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-static int _sd_init_status = 0; /* 0: beginning of time;
- 1: pre-inited (cfg_set created);
- 2: inited (running) */
+static int _sd_init_status = 0; /* 0: beginning of time;
+ 1: pre-inited (cfg_set created);
+ 2: inited (running) */
static xbt_cfg_t _sd_cfg_set = NULL;
/* callback of the workstation_model variable */
char *val;
xbt_assert0(_sd_init_status < 2,
- "Cannot change the model after the initialization");
+ "Cannot change the model after the initialization");
val = xbt_cfg_get_string(_sd_cfg_set, name);
- find_model_description(surf_workstation_model_description,
- surf_workstation_model_description_size,
- val);
+ find_model_description(surf_workstation_model_description, val);
}
/* callback of the cpu_model variable */
char *val;
xbt_assert0(_sd_init_status < 2,
- "Cannot change the model after the initialization");
+ "Cannot change the model after the initialization");
val = xbt_cfg_get_string(_sd_cfg_set, name);
- find_model_description(surf_cpu_model_description,
- surf_cpu_model_description_size, val);
+ find_model_description(surf_cpu_model_description, val);
}
/* callback of the workstation_model variable */
char *val;
xbt_assert0(_sd_init_status < 2,
- "Cannot change the model after the initialization");
+ "Cannot change the model after the initialization");
val = xbt_cfg_get_string(_sd_cfg_set, name);
- find_model_description(surf_network_model_description,
- surf_network_model_description_size, val);
+ find_model_description(surf_network_model_description, val);
}
+XBT_LOG_EXTERNAL_CATEGORY(sd_kernel);
+XBT_LOG_EXTERNAL_CATEGORY(sd_task);
+XBT_LOG_EXTERNAL_CATEGORY(sd_workstation);
+
/* create the config set and register what should be */
static void sd_config_init(void)
{
if (_sd_init_status)
- return; /* Already inited, nothing to do */
+ return; /* Already inited, nothing to do */
+
+ /* Connect our log channels: that must be done manually under windows */
+ XBT_LOG_CONNECT(sd_kernel, sd);
+ XBT_LOG_CONNECT(sd_task, sd);
+ XBT_LOG_CONNECT(sd_workstation, sd);
_sd_init_status = 1;
_sd_cfg_set = xbt_cfg_new();
xbt_cfg_register(_sd_cfg_set,
- "workstation_model", xbt_cfgelm_string, 1, 1,
- &_sd_cfg_cb__workstation_model, NULL);
+ "workstation_model", xbt_cfgelm_string, 1, 1,
+ &_sd_cfg_cb__workstation_model, NULL);
xbt_cfg_register(_sd_cfg_set,
- "cpu_model", xbt_cfgelm_string, 1, 1,
- &_sd_cfg_cb__cpu_model, NULL);
+ "cpu_model", xbt_cfgelm_string, 1, 1,
+ &_sd_cfg_cb__cpu_model, NULL);
xbt_cfg_register(_sd_cfg_set,
- "network_model", xbt_cfgelm_string, 1, 1,
- &_sd_cfg_cb__network_model, NULL);
+ "network_model", xbt_cfgelm_string, 1, 1,
+ &_sd_cfg_cb__network_model, NULL);
xbt_cfg_set_string(_sd_cfg_set, "workstation_model", "ptask_L07");
}
{
if (!_sd_init_status)
- return; /* Not initialized yet. Nothing to do */
+ return; /* Not initialized yet. Nothing to do */
xbt_cfg_free(&_sd_cfg_set);
_sd_init_status = 0;
/* split the string, and remove empty entries */
set_strings = xbt_str_split_quoted(control_string);
- if (xbt_dynar_length(set_strings) == 0) { /* vicious user! */
+ if (xbt_dynar_length(set_strings) == 0) { /* vicious user! */
xbt_dynar_free(&set_strings);
return;
}
value++;
xbt_assert1(strlen(name) != 0, "Invalid name for configuration: '%s'",
- name);
+ name);
xbt_assert1(strlen(value) != 0,
- "Invalid value for configuration: '%s'", value);
+ "Invalid value for configuration: '%s'", value);
INFO2("setting '%s' to '%s'", name, value);
__sd_config_helper(name, value);
/*remove this from argv */
for (j = i + 1; j < *argc; j++) {
- argv[j - 1] = argv[j];
+ argv[j - 1] = argv[j];
}
argv[j - 1] = NULL;
(*argc)--;
- i--; /* compensate effect of next loop incrementation */
+ i--; /* compensate effect of next loop incrementation */
}
}
}
* \param argv argument list
* \see SD_create_environment(), SD_exit()
*/
-void SD_init(int *argc, char **argv) {
+void SD_init(int *argc, char **argv)
+{
s_SD_task_t task;
-
- xbt_assert0( !SD_INITIALISED() , "SD_init() already called");
+
+ xbt_assert0(!SD_INITIALISED(), "SD_init() already called");
sd_global = xbt_new(s_SD_global_t, 1);
sd_global->workstations = xbt_dict_new();
sd_global->recyclable_route = NULL;
sd_global->watch_point_reached = 0;
- sd_global->not_scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->ready_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->in_fifo_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->running_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->done_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->failed_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->not_scheduled_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->scheduled_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->ready_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->in_fifo_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->running_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->done_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->failed_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->task_number = 0;
surf_init(argc, argv);
* That being said, this function is still precious if you want to compare a bunch of
* heuristics on the same platforms.
*/
-void SD_application_reinit(void) {
-
+void SD_application_reinit(void)
+{
+
s_SD_task_t task;
-
+
if (SD_INITIALISED()) {
DEBUG0("Recreating the swags...");
xbt_swag_free(sd_global->not_scheduled_task_set);
xbt_swag_free(sd_global->done_task_set);
xbt_swag_free(sd_global->failed_task_set);
- sd_global->not_scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->ready_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->in_fifo_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->running_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->done_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->failed_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->not_scheduled_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->scheduled_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->ready_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->in_fifo_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->running_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->done_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->failed_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->task_number = 0;
} else {
WARN0("SD_application_reinit called before initialization of SimDag");
*
* The XML file follows this DTD:
*
- * \include surfxml.dtd
+ * \include simgrid.dtd
*
* Here is a small example of such a platform:
*
* \include small_platform.xml
*/
-void SD_create_environment(const char *platform_file) {
+void SD_create_environment(const char *platform_file)
+{
xbt_dict_cursor_t cursor = NULL;
char *name = NULL;
void *surf_workstation = NULL;
surf_timer_model_init(platform_file);
workstation_model_name =
- xbt_cfg_get_string(_sd_cfg_set, "workstation_model");
+ xbt_cfg_get_string(_sd_cfg_set, "workstation_model");
DEBUG1("Model : %s", workstation_model_name);
workstation_id =
- find_model_description(surf_workstation_model_description,
- surf_workstation_model_description_size,
- workstation_model_name);
+ find_model_description(surf_workstation_model_description,
+ workstation_model_name);
if (!strcmp(workstation_model_name, "compound")) {
xbt_ex_t e;
char *network_model_name = NULL;
cpu_model_name = xbt_cfg_get_string(_sd_cfg_set, "cpu_model");
} CATCH(e) {
if (e.category == bound_error) {
- xbt_assert0(0,
- "Set a cpu model to use with the 'compound' workstation model");
- xbt_ex_free(e);
+ xbt_assert0(0,
+ "Set a cpu model to use with the 'compound' workstation model");
+ xbt_ex_free(e);
} else {
- RETHROW;
+ RETHROW;
}
}
TRY {
- network_model_name =
- xbt_cfg_get_string(_sd_cfg_set, "network_model");
+ network_model_name = xbt_cfg_get_string(_sd_cfg_set, "network_model");
}
CATCH(e) {
if (e.category == bound_error) {
- xbt_assert0(0,
- "Set a network model to use with the 'compound' workstation model");
- xbt_ex_free(e);
+ xbt_assert0(0,
+ "Set a network model to use with the 'compound' workstation model");
+ xbt_ex_free(e);
} else {
- RETHROW;
+ RETHROW;
}
}
network_id =
- find_model_description(surf_network_model_description,
- surf_network_model_description_size,
- network_model_name);
+ find_model_description(surf_network_model_description,
+ network_model_name);
cpu_id =
- find_model_description(surf_cpu_model_description,
- surf_cpu_model_description_size,
- cpu_model_name);
+ find_model_description(surf_cpu_model_description, cpu_model_name);
surf_cpu_model_description[cpu_id].model_init(platform_file);
surf_network_model_description[network_id].model_init(platform_file);
}
DEBUG0("Call workstation_model_init");
- surf_workstation_model_description[workstation_id].
- model_init(platform_file);
+ surf_workstation_model_description[workstation_id].model_init
+ (platform_file);
parse_platform_file(platform_file);
__SD_link_create(surf_link, NULL);
}
- DEBUG2("Workstation number: %d, link number: %d", SD_workstation_get_number(), SD_link_get_number());
+ DEBUG2("Workstation number: %d, link number: %d",
+ SD_workstation_get_number(), SD_link_get_number());
}
/**
* \return a NULL-terminated array of \ref SD_task_t whose state has changed.
* \see SD_task_schedule(), SD_task_watch()
*/
-SD_task_t* SD_simulate(double how_long)
+SD_task_t *SD_simulate(double how_long)
{
- double total_time = 0.0; /* we stop the simulation when total_time >= how_long */
+ double total_time = 0.0; /* we stop the simulation when total_time >= how_long */
double elapsed_time = 0.0;
- SD_task_t task, dst;
+ SD_task_t task, task_safe, dst;
SD_dependency_t dependency;
surf_action_t action;
- SD_task_t *changed_tasks = NULL;
- int changed_task_number = 0;
- int changed_task_capacity = sd_global->task_number + 1;
+ SD_task_t *res = NULL;
+ xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL);
unsigned int iter;
static int first_time = 1;
INFO0("Starting simulation...");
- /* create the array that will be returned */
- changed_tasks = xbt_new(SD_task_t, changed_task_capacity);
- changed_tasks[0] = NULL;
-
if (first_time) {
- surf_solve(); /* Takes traces into account. Returns 0.0 */
+ surf_presolve(); /* Takes traces into account */
first_time = 0;
}
- if(how_long>0) {
- surf_timer_model->extension_public->set(surf_get_clock()+how_long,
- NULL,NULL);
+ if (how_long > 0) {
+ surf_timer_model->extension_public->set(surf_get_clock() + how_long,
+ NULL, NULL);
}
sd_global->watch_point_reached = 0;
/* explore the ready tasks */
- xbt_swag_foreach(task, sd_global->ready_task_set) {
+ xbt_swag_foreach_safe(task, task_safe, sd_global->ready_task_set) {
INFO1("Executing task '%s'", SD_task_get_name(task));
- if ((task->state_changed = __SD_task_try_to_run(task))) {
- changed_tasks[changed_task_number++] = task; /* replace NULL by the task */
- /*
- if (changed_task_number == changed_task_capacity) {
- changed_task_capacity *= 2;
- changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
- }
- */
- changed_tasks[changed_task_number] = NULL;
- }
+ if (__SD_task_try_to_run(task) && !xbt_dynar_member(changed_tasks, &task))
+ xbt_dynar_push(changed_tasks, &task);
}
/* main loop */
elapsed_time = 0.0;
while (elapsed_time >= 0.0 &&
- (how_long < 0.0 || total_time < how_long) &&
- !sd_global->watch_point_reached) {
+ (how_long < 0.0 || total_time < how_long) &&
+ !sd_global->watch_point_reached) {
surf_model_t model = NULL;
/* dumb variables */
void *fun = NULL;
/* let's see which tasks are done */
xbt_dynar_foreach(model_list, iter, model) {
- while ((action = xbt_swag_extract(model->common_public->
- states.done_action_set))) {
- task = action->data;
- INFO1("Task '%s' done", SD_task_get_name(task));
- DEBUG0("Calling __SD_task_just_done");
- __SD_task_just_done(task);
- DEBUG1("__SD_task_just_done called on task '%s'", SD_task_get_name(task));
-
- /* the state has changed */
- if (!task->state_changed) {
- task->state_changed = 1;
- changed_tasks[changed_task_number++] = task;
- /*
- if (changed_task_number == changed_task_capacity) {
- changed_task_capacity *= 2;
- changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
- }
- */
- changed_tasks[changed_task_number] = NULL;
- }
-
- /* remove the dependencies after this task */
- while (xbt_dynar_length(task->tasks_after) > 0) {
- xbt_dynar_get_cpy(task->tasks_after, 0, &dependency);
- dst = dependency->dst;
- SD_task_dependency_remove(task, dst);
-
- /* is dst ready now? */
- if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) {
- INFO1("Executing task '%s'", SD_task_get_name(dst));
- if (__SD_task_try_to_run(dst)) {
- changed_tasks[changed_task_number++] = dst;
- /*
- if (changed_task_number == changed_task_capacity) {
- changed_task_capacity *= 2;
- changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
- }
- */
- changed_tasks[changed_task_number] = NULL;
- }
- }
- }
+ while ((action =
+ xbt_swag_extract(model->common_public->states.
+ done_action_set))) {
+ task = action->data;
+ INFO1("Task '%s' done", SD_task_get_name(task));
+ DEBUG0("Calling __SD_task_just_done");
+ __SD_task_just_done(task);
+ DEBUG1("__SD_task_just_done called on task '%s'",
+ SD_task_get_name(task));
+
+ /* the state has changed */
+ if (!xbt_dynar_member(changed_tasks, &task))
+ xbt_dynar_push(changed_tasks, &task);
+
+ /* remove the dependencies after this task */
+ while (xbt_dynar_length(task->tasks_after) > 0) {
+ xbt_dynar_get_cpy(task->tasks_after, 0, &dependency);
+ dst = dependency->dst;
+ SD_task_dependency_remove(task, dst);
+
+ /* is dst ready now? */
+ if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) {
+ INFO1("Executing task '%s'", SD_task_get_name(dst));
+ if (__SD_task_try_to_run(dst) &&
+ !xbt_dynar_member(changed_tasks, &task))
+ xbt_dynar_push(changed_tasks, &task);
+ }
+ }
}
/* let's see which tasks have just failed */
- while ((action = xbt_swag_extract(model->common_public->states.failed_action_set))) {
- task = action->data;
- INFO1("Task '%s' failed", SD_task_get_name(task));
- __SD_task_set_state(task, SD_FAILED);
- surf_workstation_model->common_public->action_free(action);
- task->surf_action = NULL;
-
- if (!task->state_changed) {
- task->state_changed = 1;
- changed_tasks[changed_task_number++] = task;
- /*
- if (changed_task_number == changed_task_capacity) {
- changed_task_capacity *= 2;
- changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
- }
- */
- changed_tasks[changed_task_number] = NULL;
- }
+ while ((action =
+ xbt_swag_extract(model->common_public->states.
+ failed_action_set))) {
+ task = action->data;
+ INFO1("Task '%s' failed", SD_task_get_name(task));
+ __SD_task_set_state(task, SD_FAILED);
+ surf_workstation_model->common_public->action_free(action);
+ task->surf_action = NULL;
+
+ if (!xbt_dynar_member(changed_tasks, &task))
+ xbt_dynar_push(changed_tasks, &task);
}
}
- while (surf_timer_model->extension_public->get(&fun,(void*)&arg)) {
+ while (surf_timer_model->extension_public->get(&fun, (void *) &arg)) {
}
}
- /* we must reset every task->state_changed */
- iter = 0;
- while (changed_tasks[iter] != NULL) {
- changed_tasks[iter]->state_changed = 0;
- iter++;
+ res = xbt_new0(SD_task_t, (xbt_dynar_length(changed_tasks) + 1));
+
+ xbt_dynar_foreach(changed_tasks, iter, task) {
+ res[iter] = task;
}
+ xbt_dynar_free(&changed_tasks);
INFO0("Simulation finished");
- DEBUG3("elapsed_time = %f, total_time = %f, watch_point_reached = %d", elapsed_time, total_time, sd_global->watch_point_reached);
+ DEBUG3("elapsed_time = %f, total_time = %f, watch_point_reached = %d",
+ elapsed_time, total_time, sd_global->watch_point_reached);
DEBUG1("current time = %f", surf_get_clock());
- return changed_tasks;
+ return res;
}
/**
*
* \return the current clock, in second
*/
-double SD_get_clock(void) {
+double SD_get_clock(void)
+{
SD_CHECK_INIT_DONE();
return surf_get_clock();
*
* \see SD_init(), SD_task_destroy()
*/
-void SD_exit(void) {
+void SD_exit(void)
+{
if (SD_INITIALISED()) {
DEBUG0("Destroying workstation and link dictionaries...");
xbt_dict_free(&sd_global->workstations);
DEBUG0("Exiting Surf...");
surf_exit();
- }
- else {
+ } else {
WARN0("SD_exit() called, but SimDag is not running");
/* we cannot use exceptions here because xbt is not running! */
}