#include "xbt/str.h"
#include "xbt/config.h"
#include "surf/surfxml_parse.h"
-#ifdef HAVE_LUA
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
-#endif
#ifdef HAVE_JEDULE
-#include "instr/jedule/jedule_sd_binding.h"
+#include "simgrid/jedule/jedule_sd_binding.h"
#endif
XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
{
TRACE_global_init(argc, argv);
- s_SD_task_t task;
-
xbt_assert(sd_global == NULL, "SD_init() already called");
sd_global = xbt_new(s_SD_global_t, 1);
- sd_global->workstation_list = NULL;
- sd_global->link_list = NULL;
- sd_global->recyclable_route = NULL;
sd_global->watch_point_reached = 0;
- sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f,SD_task_free_f,SD_task_recycle_f);
-
- sd_global->not_scheduled_task_set =
- xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->schedulable_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->runnable_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->return_set =
- xbt_swag_new(xbt_swag_offset(task, return_hookup));
+ sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f,
+ SD_task_free_f,
+ SD_task_recycle_f);
+
+ sd_global->initial_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
+ sd_global->executable_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
+ sd_global->completed_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
+ sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
+
sd_global->task_number = 0;
surf_init(argc, argv);
jedule_sd_init();
#endif
- XBT_DEBUG("ADD SD LEVELS");
- SD_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,__SD_storage_destroy);
-
if (_sg_cfg_exit_asap) {
SD_exit();
exit(0);
/** \brief set a configuration variable
*
- * Do --help on any simgrid binary to see the list of currently existing configuration variables, and see Section @ref options.
+ * Do --help on any simgrid binary to see the list of currently existing
+ * configuration variables, and see Section @ref options.
*
* Example:
* SD_config("host/model","default");
xbt_cfg_set_as_string(_sg_cfg_set, key, value);
}
-
/**
* \brief Reinits the application part of the simulation (experimental feature)
*
*
* @warning: this function is still experimental and not perfect. For example,
* the simulation clock (and traces usage) is not reset. So, do not use it if
- * you use traces in your simulation, and do not use absolute timing after using it.
- * That being said, this function is still precious if you want to compare a bunch of
- * heuristics on the same platforms.
+ * you use traces in your simulation, and do not use absolute timing after
+ * using it.
+ * 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)
{
- s_SD_task_t task;
+// s_SD_task_t task;
- SD_task_t done_task, next_done_task;
+// SD_task_t done_task, next_done_task;
xbt_die("This function is not working since the C++ links and others. Please report the problem if you really need that function.");
XBT_DEBUG("Recreating the swags...");
- xbt_swag_free(sd_global->not_scheduled_task_set);
- xbt_swag_free(sd_global->schedulable_task_set);
- xbt_swag_free(sd_global->scheduled_task_set);
- xbt_swag_free(sd_global->runnable_task_set);
- xbt_swag_free(sd_global->in_fifo_task_set);
- xbt_swag_free(sd_global->running_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->schedulable_task_set =
- xbt_swag_new(xbt_swag_offset(task, state_hookup));
- xbt_swag_foreach_safe(done_task, next_done_task, sd_global->done_task_set){
- if (xbt_dynar_is_empty(done_task->tasks_before)){
- __SD_task_set_state(done_task, SD_SCHEDULABLE);
- } else{
- __SD_task_set_state(done_task, SD_NOT_SCHEDULED);
- done_task->unsatisfied_dependencies =
- xbt_dynar_length(done_task->tasks_before);
- done_task->is_not_ready = done_task->unsatisfied_dependencies;
- }
- free(done_task->workstation_list);
- done_task->workstation_list = NULL;
- done_task->workstation_nb = 0;
- }
- xbt_swag_free(sd_global->done_task_set);
-
- sd_global->scheduled_task_set =
- xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->runnable_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));
+// xbt_swag_foreach_safe(done_task, next_done_task, sd_global->done_task_set){
+// if (xbt_dynar_is_empty(done_task->tasks_before)){
+// __SD_task_set_state(done_task, SD_SCHEDULABLE);
+// } else{
+// __SD_task_set_state(done_task, SD_NOT_SCHEDULED);
+// done_task->unsatisfied_dependencies =
+// xbt_dynar_length(done_task->tasks_before);
+// done_task->is_not_ready = done_task->unsatisfied_dependencies;
+// }
+// free(done_task->workstation_list);
+// done_task->workstation_list = NULL;
+// done_task->workstation_nb = 0;
+// }
+
sd_global->task_number = 0;
#ifdef HAVE_JEDULE
- jedule_sd_dump();
jedule_sd_cleanup();
jedule_sd_init();
#endif
/**
* \brief Creates the environment
*
- * The environment (i.e. the \ref SD_workstation_management "workstations"
+ * The environment (i.e. the \ref sg_host_management "hosts"
* and the \ref SD_link_management "links") is created with the data stored
* in the given XML platform file.
*
* \param platform_file name of an XML file describing the environment to create
- * \see SD_workstation_management, SD_link_management
+ * \see sg_host_management, SD_link_management
*
* The XML file follows this DTD:
*
*/
void SD_create_environment(const char *platform_file)
{
- xbt_lib_cursor_t cursor = NULL;
- char *name = NULL;
- void **surf_storage = NULL;
-
parse_platform_file(platform_file);
- /* now let's create the SD wrappers for workstations, storages and links */
- {
- xbt_dict_cursor_t cursor = NULL;
- simgrid_Host* host = NULL;
- xbt_dict_foreach(host_list, cursor, name, host){
- __SD_workstation_create((const char*)name);
- }
- }
-
- xbt_lib_foreach(storage_lib, cursor, name, surf_storage) {
- if(surf_storage[SURF_STORAGE_LEVEL])
- __SD_storage_create(surf_storage[SURF_STORAGE_LEVEL], NULL);
- }
-
-
- XBT_DEBUG("Workstation number: %d, link number: %d",
- SD_workstation_get_number(), SD_link_get_number());
+ XBT_DEBUG("Workstation number: %zu, link number: %d",
+ sg_host_count(), sg_link_count());
#ifdef HAVE_JEDULE
jedule_setup_platform();
#endif
* when no more task can be executed.
* Then you can call SD_simulate() again.
*
- * \param how_long maximum duration of the simulation (a negative value means no time limit)
+ * \param how_long maximum duration of the simulation (a negative value means
+ * no time limit)
* \return a dynar of \ref SD_task_t whose state has changed.
* \see SD_task_schedule(), SD_task_watch()
*/
xbt_dynar_t SD_simulate(double how_long) {
- xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL);
- SD_task_t task;
-
- SD_simulate_swag(how_long);
- while( (task = (SD_task_t)xbt_swag_extract(sd_global->return_set)) != NULL) {
- xbt_dynar_push(changed_tasks, &task);
- }
-
- return changed_tasks;
-}
-
-xbt_swag_t SD_simulate_swag(double how_long) {
- double total_time = 0.0; /* we stop the simulation when total_time >= how_long */
+ /* we stop the simulation when total_time >= how_long */
+ double total_time = 0.0;
double elapsed_time = 0.0;
- SD_task_t task, task_safe, dst;
+ SD_task_t task, dst;
SD_dependency_t dependency;
surf_action_t action;
unsigned int iter, depcnt;
XBT_VERB("Run simulation for %f seconds", how_long);
sd_global->watch_point_reached = 0;
- xbt_swag_reset(sd_global->return_set);
+ xbt_dynar_reset(sd_global->return_set);
/* explore the runnable tasks */
- xbt_swag_foreach_safe(task, task_safe, sd_global->runnable_task_set) {
+ xbt_dynar_foreach(sd_global->executable_task_set , iter, task) {
XBT_VERB("Executing task '%s'", SD_task_get_name(task));
- if (__SD_task_try_to_run(task))
- xbt_swag_insert(task,sd_global->return_set);
+ SD_task_run(task);
+ xbt_dynar_push(sd_global->return_set, &task);
+ iter--;
}
/* main loop */
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' done", SD_task_get_name(task));
- XBT_DEBUG("Calling __SD_task_just_done");
- __SD_task_just_done(task);
- XBT_DEBUG("__SD_task_just_done called on task '%s'",
- SD_task_get_name(task));
+ SD_task_set_state(task, SD_DONE);
+ task->surf_action->unref();
+ task->surf_action = NULL;
- /* the state has changed */
- xbt_swag_insert(task,sd_global->return_set);
+ /* the state has changed. Add it only if it's the first change */
+ if (xbt_dynar_search_or_negative(sd_global->return_set, &task) < 0) {
+ xbt_dynar_push(sd_global->return_set, &task);
+ }
/* remove the dependencies after this task */
xbt_dynar_foreach(task->tasks_after, depcnt, dependency) {
dst->is_not_ready);
if (!(dst->unsatisfied_dependencies)) {
- if (__SD_task_is_scheduled(dst))
- __SD_task_set_state(dst, SD_RUNNABLE);
+ if (SD_task_get_state(dst) == SD_SCHEDULED)
+ SD_task_set_state(dst, SD_RUNNABLE);
else
- __SD_task_set_state(dst, SD_SCHEDULABLE);
+ SD_task_set_state(dst, SD_SCHEDULABLE);
}
- if (__SD_task_is_not_scheduled(dst) && !(dst->is_not_ready)) {
- __SD_task_set_state(dst, SD_SCHEDULABLE);
+ if (SD_task_get_state(dst) == SD_NOT_SCHEDULED &&
+ !(dst->is_not_ready)) {
+ SD_task_set_state(dst, SD_SCHEDULABLE);
}
if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E) {
SD_task_t comm_dst;
xbt_dynar_get_cpy(dst->tasks_after, 0, &comm_dep);
comm_dst = comm_dep->dst;
- if (__SD_task_is_not_scheduled(comm_dst) &&
+ if (SD_task_get_state(comm_dst) == SD_NOT_SCHEDULED &&
comm_dst->is_not_ready > 0) {
comm_dst->is_not_ready--;
comm_dst->is_not_ready);
if (!(comm_dst->is_not_ready)) {
- __SD_task_set_state(comm_dst, SD_SCHEDULABLE);
+ SD_task_set_state(comm_dst, SD_SCHEDULABLE);
}
}
}
/* is dst runnable now? */
- if (__SD_task_is_runnable(dst)
+ if (SD_task_get_state(dst) == SD_RUNNABLE
&& !sd_global->watch_point_reached) {
XBT_VERB("Executing task '%s'", SD_task_get_name(dst));
- if (__SD_task_try_to_run(dst))
- xbt_swag_insert(dst,sd_global->return_set);
+ SD_task_run(dst);
+ xbt_dynar_push(sd_global->return_set, &dst);
}
}
}
task->start_time = surf_action_get_start_time(task->surf_action);
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' failed", SD_task_get_name(task));
- __SD_task_set_state(task, SD_FAILED);
+ SD_task_set_state(task, SD_FAILED);
action->unref();
task->surf_action = NULL;
- xbt_swag_insert(task,sd_global->return_set);
+ xbt_dynar_push(sd_global->return_set, &task);
}
}
}
if (!sd_global->watch_point_reached && how_long<0){
- if (xbt_swag_size(sd_global->done_task_set) < sd_global->task_number){
+ if ((int) xbt_dynar_length(sd_global->completed_task_set) <
+ sd_global->task_number){
XBT_WARN("Simulation is finished but %d tasks are still not done",
- (sd_global->task_number - xbt_swag_size(sd_global->done_task_set)));
- xbt_swag_foreach_safe (task, task_safe,sd_global->not_scheduled_task_set){
- XBT_WARN("%s is in SD_NOT_SCHEDULED state", SD_task_get_name(task));
- }
- xbt_swag_foreach_safe (task, task_safe,sd_global->schedulable_task_set){
- XBT_WARN("%s is in SD_SCHEDULABLE state", SD_task_get_name(task));
- }
- xbt_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){
- XBT_WARN("%s is in SD_SCHEDULED state", SD_task_get_name(task));
- }
+ (sd_global->task_number -
+ (int) xbt_dynar_length(sd_global->completed_task_set)));
+ static const char* state_names[] =
+ { "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED",
+ "SD_RUNNABLE", "SD_RUNNING", "SD_DONE",
+ "SD_FAILED" };
+ xbt_dynar_foreach(sd_global->initial_task_set, iter, task){
+ XBT_WARN("%s is in %s state", SD_task_get_name(task),
+ state_names[SD_task_get_state(task)]);
+ }
}
}
xbt_mallocator_free(sd_global->task_mallocator);
- XBT_DEBUG("Destroying workstation and link arrays...");
- xbt_free(sd_global->workstation_list);
- xbt_free(sd_global->link_list);
- xbt_free(sd_global->recyclable_route);
-
- XBT_DEBUG("Destroying the swags...");
- xbt_swag_free(sd_global->not_scheduled_task_set);
- xbt_swag_free(sd_global->schedulable_task_set);
- xbt_swag_free(sd_global->scheduled_task_set);
- xbt_swag_free(sd_global->runnable_task_set);
- xbt_swag_free(sd_global->in_fifo_task_set);
- xbt_swag_free(sd_global->running_task_set);
- xbt_swag_free(sd_global->done_task_set);
- xbt_swag_free(sd_global->failed_task_set);
- xbt_swag_free(sd_global->return_set);
+ XBT_DEBUG("Destroying the dynars ...");
+ xbt_dynar_free_container(&(sd_global->initial_task_set));
+ xbt_dynar_free_container(&(sd_global->executable_task_set));
+ xbt_dynar_free_container(&(sd_global->completed_task_set));
+ xbt_dynar_free_container(&(sd_global->return_set));
TRACE_end();
sd_global = NULL;
#ifdef HAVE_JEDULE
- jedule_sd_dump();
jedule_sd_cleanup();
jedule_sd_exit();
#endif
