X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/509e8eaf9d87061013538f79a0fba44865c58c0a..0d23e0c5e735a1a21e131b5d1d484338df5d0089:/src/simdag/sd_global.c diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index 4a3f62f6a3..e7d4735526 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -1,3 +1,9 @@ +/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ + +/* 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. */ + #include "private.h" #include "xbt/sysdep.h" #include "xbt/dynar.h" @@ -13,14 +19,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, SD_global_t sd_global = NULL; -/* $Id$ */ - -/* Copyright (c) 2007 Arnaud Legrand. - All rights reserved. */ - -/* 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. */ - XBT_LOG_EXTERNAL_CATEGORY(sd_kernel); XBT_LOG_EXTERNAL_CATEGORY(sd_task); XBT_LOG_EXTERNAL_CATEGORY(sd_workstation); @@ -60,10 +58,12 @@ void SD_init(int *argc, char **argv) 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->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 = @@ -75,7 +75,7 @@ void SD_init(int *argc, char **argv) sd_global->task_number = 0; surf_init(argc, argv); - xbt_cfg_set_string(_surf_cfg_set, "workstation_model", "ptask_L07"); + xbt_cfg_set_string(_surf_cfg_set, "workstation/model", "ptask_L07"); } /** @@ -98,8 +98,9 @@ void SD_application_reinit(void) if (SD_INITIALISED()) { DEBUG0("Recreating the swags..."); xbt_swag_free(sd_global->not_scheduled_task_set); - xbt_swag_free(sd_global->scheduled_task_set); xbt_swag_free(sd_global->ready_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); @@ -107,9 +108,11 @@ void SD_application_reinit(void) sd_global->not_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->scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup)); - sd_global->ready_task_set = + 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)); @@ -156,17 +159,17 @@ void SD_create_environment(const char *platform_file) DEBUG0("SD_create_environment"); - surf_timer_model_init(platform_file); surf_config_models_setup(platform_file); parse_platform_file(platform_file); /* now let's create the SD wrappers for workstations and links */ - xbt_dict_foreach(workstation_set, cursor, name, surf_workstation) { + xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor, + name, surf_workstation) { __SD_workstation_create(surf_workstation, NULL); } - xbt_dict_foreach(link_set, cursor, name, surf_link) { + xbt_dict_foreach(surf_model_resource_set(surf_network_model), cursor, name, surf_link) { __SD_link_create(surf_link, NULL); } @@ -177,7 +180,7 @@ void SD_create_environment(const char *platform_file) /** * \brief Launches the simulation. * - * The function will execute the \ref SD_READY ready tasks. + * 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. * Then you can call SD_simulate() again. @@ -186,21 +189,20 @@ void SD_create_environment(const char *platform_file) * \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) +xbt_dynar_t SD_simulate(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; - SD_task_t *res = NULL; xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL); - unsigned int iter; + unsigned int iter, depcnt; static int first_time = 1; SD_CHECK_INIT_DONE(); - INFO0("Starting simulation..."); + VERB0("Starting simulation..."); if (first_time) { surf_presolve(); /* Takes traces into account */ @@ -208,14 +210,14 @@ SD_task_t *SD_simulate(double how_long) } if (how_long > 0) { - surf_timer_model->extension_public->set(surf_get_clock() + how_long, - NULL, NULL); + surf_timer_model->extension.timer.set(surf_get_clock() + how_long, + NULL, NULL); } sd_global->watch_point_reached = 0; - /* explore the ready tasks */ - xbt_swag_foreach_safe(task, task_safe, sd_global->ready_task_set) { - INFO1("Executing task '%s'", SD_task_get_name(task)); + /* 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); } @@ -240,11 +242,11 @@ SD_task_t *SD_simulate(double how_long) /* 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))) { + while ((action = xbt_swag_extract(model->states.done_action_set))) { task = action->data; - INFO1("Task '%s' done", SD_task_get_name(task)); + task->start_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"); __SD_task_just_done(task); DEBUG1("__SD_task_just_done called on task '%s'", @@ -255,14 +257,21 @@ SD_task_t *SD_simulate(double how_long) 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)); + xbt_dynar_foreach(task->tasks_after, depcnt, dependency){ + dst = dependency->dst; + if (dst->unsatisfied_dependencies>0) + dst->unsatisfied_dependencies--; + + if (!(dst->unsatisfied_dependencies)){ + if (__SD_task_is_scheduled(dst)) + __SD_task_set_state(dst, SD_RUNNABLE); + else + __SD_task_set_state(dst, SD_READY); + } + + /* 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); @@ -271,13 +280,13 @@ SD_task_t *SD_simulate(double how_long) } /* let's see which tasks have just failed */ - while ((action = - xbt_swag_extract(model->common_public.states. - failed_action_set))) { + while ((action = xbt_swag_extract(model->states.failed_action_set))) { task = action->data; - INFO1("Task '%s' failed", SD_task_get_name(task)); + task->start_time = 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)); __SD_task_set_state(task, SD_FAILED); - surf_workstation_model->common_public.action_free(action); + surf_workstation_model->action_unref(action); task->surf_action = NULL; if (!xbt_dynar_member(changed_tasks, &task)) @@ -285,23 +294,16 @@ SD_task_t *SD_simulate(double how_long) } } - while (surf_timer_model->extension_public->get(&fun, (void *) &arg)) { + while (surf_timer_model->extension.timer.get(&fun, (void *) &arg)) { } } - 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"); + VERB0("Simulation finished"); 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 res; + return changed_tasks; } /** @@ -343,8 +345,9 @@ void SD_exit(void) DEBUG0("Destroying the swags..."); xbt_swag_free(sd_global->not_scheduled_task_set); - xbt_swag_free(sd_global->scheduled_task_set); xbt_swag_free(sd_global->ready_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);