#endif
#ifdef HAVE_JEDULE
-#include "instr/jedule/jedule_output.h"
+#include "instr/jedule/jedule_sd_binding.h"
#endif
XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
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;
#endif
#ifdef HAVE_JEDULE
- init_jedule_output();
+ 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->task_number = 0;
#ifdef HAVE_JEDULE
- cleanup_jedule();
- init_jedule_output();
+ 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;
platform_filename = bprintf("%s",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) {
+ __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_JEDULE
jedule_setup_platform();
SD_CHECK_INIT_DONE();
if (first_time) {
- VERB0("Starting simulation...");
+ XBT_VERB("Starting simulation...");
surf_presolve(); /* Takes traces into account */
first_time = 0;
/* 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));
+ XBT_VERB("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);
/* dumb variables */
- DEBUG1("Total time: %f", total_time);
+ XBT_DEBUG("Total time: %f", total_time);
elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long : -1.0);
- DEBUG1("surf_solve() returns %f", elapsed_time);
+ 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 */
/* is dst runnable now? */
if (__SD_task_is_runnable(dst)
&& !sd_global->watch_point_reached) {
- VERB1("Executing task '%s'", SD_task_get_name(dst));
+ XBT_VERB("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);
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 (!sd_global->watch_point_reached && how_long<0){
if (xbt_swag_size(sd_global->done_task_set) < sd_global->task_number){
- WARN0("Simulation is finished but some tasks are still not done");
+ 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){
- WARN1("%s is in SD_NOT_SCHEDULED state", SD_task_get_name(task));
+ 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){
- WARN1("%s is in SD_SCHEDULABLE state", SD_task_get_name(task));
+ 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){
- WARN1("%s is in SD_SCHEDULED state", SD_task_get_name(task));
+ XBT_WARN("%s is in SD_SCHEDULED state", SD_task_get_name(task));
}
}
}
- 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;
}
#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_DEBUG("Destroying workstation and link dictionaries...");
- 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->done_task_set);
xbt_swag_free(sd_global->failed_task_set);
+ // Exit the LIB host_lib
+ xbt_lib_free(&host_lib);
+ xbt_lib_free(&link_lib);
+ xbt_lib_free(&as_router_lib);
+
xbt_free(sd_global);
sd_global = NULL;
TRACE_end();
#endif
#ifdef HAVE_JEDULE
- cleanup_jedule();
+ jedule_sd_dump();
+ jedule_sd_cleanup();
#endif
- DEBUG0("Exiting Surf...");
+ XBT_DEBUG("Exiting Surf...");
surf_exit();
+
} 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! */
}
}
