SD_global_t sd_global = NULL;
-XBT_LOG_EXTERNAL_CATEGORY(sd_kernel);
-XBT_LOG_EXTERNAL_CATEGORY(sd_task);
-XBT_LOG_EXTERNAL_CATEGORY(sd_workstation);
-
/**
* \brief Initialises SD internal data
*
s_SD_task_t task;
- 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);
- XBT_LOG_CONNECT(sd_task, sd);
- XBT_LOG_CONNECT(sd_workstation, sd);
-
+ 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->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 =
s_SD_task_t task;
- if (SD_INITIALISED()) {
- 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->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->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->task_number = 0;
+ 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->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->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->task_number = 0;
#ifdef HAVE_JEDULE
- jedule_sd_cleanup();
- jedule_sd_init();
+ jedule_sd_cleanup();
+ jedule_sd_init();
#endif
-
- } else {
- XBT_WARN("SD_application_reinit called before initialization of SimDag");
- /* we cannot use exceptions here because xbt is not running! */
- }
-
}
/**
void **surf_workstation = NULL;
void **surf_link = NULL;
- platform_filename = xbt_strdup(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_lib_foreach(host_lib, cursor, name, surf_workstation){
unsigned int iter, depcnt;
static int first_time = 1;
- SD_CHECK_INIT_DONE();
-
if (first_time) {
XBT_VERB("Starting simulation...");
sd_global->watch_point_reached = 0;
- while(xbt_swag_extract(sd_global->return_set)) {}
+ xbt_swag_reset(sd_global->return_set);
/* explore the runnable tasks */
- xbt_swag_foreach(task, sd_global->runnable_task_set) {
+ xbt_swag_foreach_safe(task, task_safe, 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);
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_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));
}
*
* \return the current clock, in second
*/
-double SD_get_clock(void)
-{
- SD_CHECK_INIT_DONE();
-
+double SD_get_clock(void) {
return surf_get_clock();
}
TRACE_surf_release();
#endif
- if (SD_INITIALISED()) {
- XBT_DEBUG("Destroying workstation and link dictionaries...");
-
- XBT_DEBUG("Destroying workstation and link arrays if necessary...");
- if (sd_global->workstation_list != NULL)
- xbt_free(sd_global->workstation_list);
-
- if (sd_global->link_list != NULL)
- xbt_free(sd_global->link_list);
-
- if (sd_global->recyclable_route != NULL)
- 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_mallocator_free(sd_global->task_mallocator);
- XBT_DEBUG("Exiting Surf...");
- surf_exit();
+ 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_free(sd_global);
- sd_global = NULL;
+ 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);
#ifdef HAVE_TRACING
TRACE_end();
#endif
+
+ XBT_DEBUG("Exiting Surf...");
+ surf_exit();
+
+ xbt_free(sd_global);
+ sd_global = NULL;
+
#ifdef HAVE_JEDULE
jedule_sd_dump();
jedule_sd_cleanup();
#endif
-
- } else {
- XBT_WARN("SD_exit() called, but SimDag is not running");
- /* we cannot use exceptions here because xbt is not running! */
- }
}
/**