#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/config.h"
-#include "instr/private.h"
+#include "instr/instr_private.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"
+#endif
+
XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd,
"Logging specific to SimDag (kernel)");
s_SD_task_t task;
- xbt_assert0(!SD_INITIALISED(), "SD_init() already called");
+ xbt_assert(!SD_INITIALISED(), "SD_init() already called");
/* Connect our log channels: that must be done manually under windows */
XBT_LOG_CONNECT(sd_kernel, sd);
sd_global = xbt_new(s_SD_global_t, 1);
- sd_global->workstations = xbt_dict_new();
- sd_global->workstation_count = 0;
sd_global->workstation_list = NULL;
- sd_global->links = xbt_dict_new();
- sd_global->link_count = 0;
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->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_number = 0;
surf_init(argc, argv);
-#ifndef HAVE_TRACING
+
xbt_cfg_setdefault_string(_surf_cfg_set, "workstation/model",
"ptask_L07");
+
+#ifdef HAVE_TRACING
+ TRACE_start ();
+#endif
+
+#ifdef HAVE_JEDULE
+ jedule_sd_init();
#endif
+
+ XBT_DEBUG("ADD SD LEVELS");
+ SD_HOST_LEVEL = xbt_lib_add_level(host_lib,__SD_workstation_destroy);
+ SD_LINK_LEVEL = xbt_lib_add_level(link_lib,__SD_link_destroy);
}
/**
s_SD_task_t task;
if (SD_INITIALISED()) {
- DEBUG0("Recreating the swags...");
+ 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);
sd_global->failed_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->task_number = 0;
+
+#ifdef HAVE_JEDULE
+ jedule_sd_cleanup();
+ jedule_sd_init();
+#endif
+
} else {
- WARN0("SD_application_reinit called before initialization of SimDag");
+ XBT_WARN("SD_application_reinit called before initialization of SimDag");
/* we cannot use exceptions here because xbt is not running! */
}
*/
void SD_create_environment(const char *platform_file)
{
- xbt_dict_cursor_t cursor = NULL;
+ xbt_lib_cursor_t cursor = NULL;
char *name = NULL;
- void *surf_workstation = NULL;
- void *surf_link = NULL;
+ void **surf_workstation = NULL;
+ void **surf_link = NULL;
- SD_CHECK_INIT_DONE();
+ platform_filename = xbt_strdup(platform_file);
- DEBUG0("SD_create_environment");
-
- surf_config_models_setup(platform_file);
+ // Reset callbacks
+ surf_parse_reset_callbacks();
+ // Add config callbacks
+ surf_parse_add_callback_config();
+ SD_CHECK_INIT_DONE();
parse_platform_file(platform_file);
surf_config_models_create_elms();
/* now let's create the SD wrappers for workstations and links */
- xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
- name, surf_workstation) {
- __SD_workstation_create(surf_workstation, NULL);
+ xbt_lib_foreach(host_lib, cursor, name, surf_workstation){
+ if(surf_workstation[SURF_WKS_LEVEL])
+ __SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL);
}
- xbt_dict_foreach(surf_model_resource_set(surf_network_model), cursor,
- name, surf_link) {
- __SD_link_create(surf_link, NULL);
+ xbt_lib_foreach(link_lib, cursor, name, surf_link) {
+ if(surf_link[SURF_LINK_LEVEL])
+ __SD_link_create(surf_link[SURF_LINK_LEVEL], NULL);
}
- DEBUG2("Workstation number: %d, link number: %d",
+ XBT_DEBUG("Workstation number: %d, link number: %d",
SD_workstation_get_number(), SD_link_get_number());
-
-#ifdef HAVE_TRACING
- TRACE_surf_save_onelink();
+#ifdef HAVE_JEDULE
+ jedule_setup_platform();
#endif
}
* \brief Launches the simulation.
*
* The function will execute the \ref SD_RUNNABLE runnable tasks.
- * The simulation will be stopped when its time reaches \a how_long,
- * when a watch point is reached, or when no more task can be executed.
+ * If \a how_long is positive, then the simulation will be stopped either
+ * when time reaches \a how_long or when a watch point is reached.
+ * A nonpositive value for \a how_long means no time limit, in which case
+ * the simulation will be stopped either when a watch point is reached or
+ * 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)
* \return a NULL-terminated array 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 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 = 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 */
double elapsed_time = 0.0;
SD_task_t task, task_safe, dst;
SD_dependency_t dependency;
surf_action_t action;
- xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL);
unsigned int iter, depcnt;
static int first_time = 1;
SD_CHECK_INIT_DONE();
- VERB0("Starting simulation...");
+ if (first_time) {
+ XBT_VERB("Starting simulation...");
- if (first_time) {
- surf_presolve(); /* Takes traces into account */
- first_time = 0;
- }
+ surf_presolve(); /* Takes traces into account */
+ first_time = 0;
+ }
- if (how_long > 0) {
- surf_timer_model->extension.timer.set(surf_get_clock() + how_long,
- NULL, NULL);
- }
sd_global->watch_point_reached = 0;
+ while(xbt_swag_extract(sd_global->return_set)) {}
+
/* explore the runnable tasks */
- xbt_swag_foreach_safe(task, task_safe, sd_global->runnable_task_set) {
- VERB1("Executing task '%s'", SD_task_get_name(task));
- if (__SD_task_try_to_run(task)
- && !xbt_dynar_member(changed_tasks, &task))
- xbt_dynar_push(changed_tasks, &task);
+ xbt_swag_foreach(task, sd_global->runnable_task_set) {
+ 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);
}
/* main loop */
!sd_global->watch_point_reached) {
surf_model_t model = NULL;
/* dumb variables */
- void *fun = NULL;
- void *arg = NULL;
- DEBUG1("Total time: %f", total_time);
+ XBT_DEBUG("Total time: %f", total_time);
- elapsed_time = surf_solve();
- DEBUG1("surf_solve() returns %f", elapsed_time);
+ elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long : -1.0);
+ XBT_DEBUG("surf_solve() returns %f", elapsed_time);
if (elapsed_time > 0.0)
total_time += elapsed_time;
surf_workstation_model->
action_get_start_time(task->surf_action);
task->finish_time = surf_get_clock();
- VERB1("Task '%s' done", SD_task_get_name(task));
- DEBUG0("Calling __SD_task_just_done");
+ XBT_VERB("Task '%s' done", SD_task_get_name(task));
+ XBT_DEBUG("Calling __SD_task_just_done");
__SD_task_just_done(task);
- DEBUG1("__SD_task_just_done called on task '%s'",
+ XBT_DEBUG("__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);
+ xbt_swag_insert(task,sd_global->return_set);
/* remove the dependencies after this task */
xbt_dynar_foreach(task->tasks_after, depcnt, dependency) {
/* is dst runnable now? */
if (__SD_task_is_runnable(dst)
&& !sd_global->watch_point_reached) {
- VERB1("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);
+ 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);
}
}
}
surf_workstation_model->
action_get_start_time(task->surf_action);
task->finish_time = surf_get_clock();
- VERB1("Task '%s' failed", SD_task_get_name(task));
+ XBT_VERB("Task '%s' failed", SD_task_get_name(task));
__SD_task_set_state(task, SD_FAILED);
surf_workstation_model->action_unref(action);
task->surf_action = NULL;
- if (!xbt_dynar_member(changed_tasks, &task))
- xbt_dynar_push(changed_tasks, &task);
+ xbt_swag_insert(task,sd_global->return_set);
}
}
+ }
- while (surf_timer_model->extension.timer.get(&fun, (void *) &arg)) {
+ if (!sd_global->watch_point_reached && how_long<0){
+ if (xbt_swag_size(sd_global->done_task_set) < sd_global->task_number){
+ XBT_WARN("Simulation is finished but some tasks are still not done");
+ 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));
+ }
}
}
- VERB0("Simulation finished");
- DEBUG3("elapsed_time = %f, total_time = %f, watch_point_reached = %d",
+ XBT_DEBUG("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());
+ XBT_DEBUG("current time = %f", surf_get_clock());
- return changed_tasks;
+ return sd_global->return_set;
}
/**
#ifdef HAVE_TRACING
TRACE_surf_release();
#endif
+
if (SD_INITIALISED()) {
- DEBUG0("Destroying workstation and link dictionaries...");
- xbt_dict_free(&sd_global->workstations);
- xbt_dict_free(&sd_global->links);
+ xbt_mallocator_free(sd_global->task_mallocator);
- DEBUG0("Destroying workstation and link arrays if necessary...");
+ XBT_DEBUG("Destroying workstation and link arrays if necessary...");
if (sd_global->workstation_list != NULL)
xbt_free(sd_global->workstation_list);
if (sd_global->recyclable_route != NULL)
xbt_free(sd_global->recyclable_route);
- DEBUG0("Destroying the swags...");
+ 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->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("Exiting Surf...");
+ surf_exit();
xbt_free(sd_global);
sd_global = NULL;
- DEBUG0("Exiting Surf...");
- surf_exit();
+#ifdef HAVE_TRACING
+ TRACE_end();
+#endif
+#ifdef HAVE_JEDULE
+ jedule_sd_dump();
+ jedule_sd_cleanup();
+#endif
+
} else {
- WARN0("SD_exit() called, but SimDag is not running");
+ XBT_WARN("SD_exit() called, but SimDag is not running");
/* we cannot use exceptions here because xbt is not running! */
}
}
/**
- * \bried load script file
+ * \brief load script file
*/
void SD_load_environment_script(const char *script_file)
