A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't use binary mask
[simgrid.git]
/
src
/
simdag
/
sd_global.c
diff --git
a/src/simdag/sd_global.c
b/src/simdag/sd_global.c
index
3f1ceb9
..
915cb50
100644
(file)
--- a/
src/simdag/sd_global.c
+++ b/
src/simdag/sd_global.c
@@
-5,14
+5,15
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "private.h"
+#include "instr/instr_interface.h"
#include "xbt/sysdep.h"
#include "xbt/dynar.h"
#include "surf/surf.h"
#include "xbt/sysdep.h"
#include "xbt/dynar.h"
#include "surf/surf.h"
+#include "simgrid/sg_config.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/config.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include "xbt/str.h"
#include "xbt/config.h"
-#include "instr/instr_private.h"
#include "surf/surfxml_parse.h"
#ifdef HAVE_LUA
#include <lua.h>
#include "surf/surfxml_parse.h"
#ifdef HAVE_LUA
#include <lua.h>
@@
-30,12
+31,8
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd,
SD_global_t sd_global = NULL;
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 Initiali
s
es SD internal data
+ * \brief Initiali
z
es SD internal data
*
* This function must be called before any other SD function. Then you
* should call SD_create_environment().
*
* This function must be called before any other SD function. Then you
* should call SD_create_environment().
@@
-54,12
+51,6
@@
void SD_init(int *argc, char **argv)
xbt_assert(sd_global == NULL, "SD_init() already called");
xbt_assert(sd_global == NULL, "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);
-
-
sd_global = xbt_new(s_SD_global_t, 1);
sd_global->workstation_list = NULL;
sd_global->link_list = NULL;
sd_global = xbt_new(s_SD_global_t, 1);
sd_global->workstation_list = NULL;
sd_global->link_list = NULL;
@@
-90,7
+81,7
@@
void SD_init(int *argc, char **argv)
surf_init(argc, argv);
surf_init(argc, argv);
- xbt_cfg_setdefault_string(_s
urf
_cfg_set, "workstation/model",
+ xbt_cfg_setdefault_string(_s
g
_cfg_set, "workstation/model",
"ptask_L07");
#ifdef HAVE_TRACING
"ptask_L07");
#ifdef HAVE_TRACING
@@
-160,9
+151,9
@@
void SD_application_reinit(void)
/**
* \brief Creates the environment
*
/**
* \brief Creates the environment
*
- * The environment (i.e. the \ref SD_workstation_management "workstations"
and the
- *
\ref SD_link_management "links") is created with the data stored in the given XML
- * platform file.
+ * The environment (i.e. the \ref SD_workstation_management "workstations"
+ *
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
*
* \param platform_file name of an XML file describing the environment to create
* \see SD_workstation_management, SD_link_management
@@
-186,12
+177,12
@@
void SD_create_environment(const char *platform_file)
/* now let's create the SD wrappers for workstations and links */
xbt_lib_foreach(host_lib, cursor, name, surf_workstation){
/* now let's create the SD wrappers for workstations and links */
xbt_lib_foreach(host_lib, cursor, name, surf_workstation){
-
if(surf_workstation[SURF_WKS_LEVEL])
-
__SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL);
+ if(surf_workstation[SURF_WKS_LEVEL])
+ __SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL);
}
xbt_lib_foreach(link_lib, cursor, name, surf_link) {
}
xbt_lib_foreach(link_lib, cursor, name, surf_link) {
-
if(surf_link[SURF_LINK_LEVEL])
+ if(surf_link[SURF_LINK_LEVEL])
__SD_link_create(surf_link[SURF_LINK_LEVEL], NULL);
}
__SD_link_create(surf_link[SURF_LINK_LEVEL], NULL);
}
@@
-208,13
+199,13
@@
void SD_create_environment(const char *platform_file)
* The function will execute the \ref SD_RUNNABLE runnable tasks.
* 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.
* The function will execute the \ref SD_RUNNABLE runnable tasks.
* 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
+ * A non
-
positive 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)
* 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.
+ * \return a
dynar
of \ref SD_task_t whose state has changed.
* \see SD_task_schedule(), SD_task_watch()
*/
* \see SD_task_schedule(), SD_task_watch()
*/
@@
-239,13
+230,14
@@
xbt_swag_t SD_simulate_swag(double how_long) {
unsigned int iter, depcnt;
static int first_time = 1;
unsigned int iter, depcnt;
static int first_time = 1;
-
if (first_time) {
-
XBT_VERB("Starting simulation...");
+ if (first_time) {
+ XBT_VERB("Starting simulation...");
-
surf_presolve(); /* Takes traces into account */
-
first_time = 0;
-
}
+ surf_presolve(); /* Takes traces into account */
+ first_time = 0;
+ }
+ XBT_VERB("Run simulation for %f seconds", how_long);
sd_global->watch_point_reached = 0;
xbt_swag_reset(sd_global->return_set);
sd_global->watch_point_reached = 0;
xbt_swag_reset(sd_global->return_set);
@@
-260,7
+252,7
@@
xbt_swag_t SD_simulate_swag(double how_long) {
/* main loop */
elapsed_time = 0.0;
while (elapsed_time >= 0.0 &&
/* main loop */
elapsed_time = 0.0;
while (elapsed_time >= 0.0 &&
- (how_long < 0.0 ||
total_time < how_long
) &&
+ (how_long < 0.0 ||
0.00001 < (how_long -total_time)
) &&
!sd_global->watch_point_reached) {
surf_model_t model = NULL;
/* dumb variables */
!sd_global->watch_point_reached) {
surf_model_t model = NULL;
/* dumb variables */
@@
-268,7
+260,7
@@
xbt_swag_t SD_simulate_swag(double how_long) {
XBT_DEBUG("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);
+ elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long
- total_time
: -1.0);
XBT_DEBUG("surf_solve() returns %f", elapsed_time);
if (elapsed_time > 0.0)
total_time += elapsed_time;
XBT_DEBUG("surf_solve() returns %f", elapsed_time);
if (elapsed_time > 0.0)
total_time += elapsed_time;
@@
-298,6
+290,10
@@
xbt_swag_t SD_simulate_swag(double how_long) {
if (dst->is_not_ready > 0)
dst->is_not_ready--;
if (dst->is_not_ready > 0)
dst->is_not_ready--;
+ XBT_DEBUG("Released a dependency on %s: %d remain(s). Became schedulable if %d=0",
+ SD_task_get_name(dst), dst->unsatisfied_dependencies,
+ dst->is_not_ready);
+
if (!(dst->unsatisfied_dependencies)) {
if (__SD_task_is_scheduled(dst))
__SD_task_set_state(dst, SD_RUNNABLE);
if (!(dst->unsatisfied_dependencies)) {
if (__SD_task_is_scheduled(dst))
__SD_task_set_state(dst, SD_RUNNABLE);
@@
-305,6
+301,10
@@
xbt_swag_t SD_simulate_swag(double how_long) {
__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_kind(dst) == SD_TASK_COMM_E2E) {
SD_dependency_t comm_dep;
SD_task_t comm_dst;
if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E) {
SD_dependency_t comm_dep;
SD_task_t comm_dst;
@@
-314,6
+314,10
@@
xbt_swag_t SD_simulate_swag(double how_long) {
comm_dst->is_not_ready > 0) {
comm_dst->is_not_ready--;
comm_dst->is_not_ready > 0) {
comm_dst->is_not_ready--;
+ XBT_DEBUG("%s is a transfer, %s may be ready now if %d=0",
+ SD_task_get_name(dst), SD_task_get_name(comm_dst),
+ comm_dst->is_not_ready);
+
if (!(comm_dst->is_not_ready)) {
__SD_task_set_state(comm_dst, SD_SCHEDULABLE);
}
if (!(comm_dst->is_not_ready)) {
__SD_task_set_state(comm_dst, SD_SCHEDULABLE);
}
@@
-351,15
+355,15
@@
xbt_swag_t SD_simulate_swag(double how_long) {
if (xbt_swag_size(sd_global->done_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)));
if (xbt_swag_size(sd_global->done_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_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_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_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_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_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){
XBT_WARN("%s is in SD_SCHEDULED state", SD_task_get_name(task));
XBT_WARN("%s is in SD_SCHEDULED state", SD_task_get_name(task));
-
}
+ }
}
}
}
}
@@
-382,15
+386,15
@@
double SD_get_clock(void) {
/**
* \brief Destroys all SD internal data
*
/**
* \brief Destroys all SD internal data
*
- * This function should be called when the simulation is over. Don't forget
also to destroy
- * t
he tasks
.
+ * This function should be called when the simulation is over. Don't forget
+ * t
o destroy too
.
*
* \see SD_init(), SD_task_destroy()
*/
void SD_exit(void)
{
#ifdef HAVE_TRACING
*
* \see SD_init(), SD_task_destroy()
*/
void SD_exit(void)
{
#ifdef HAVE_TRACING
- TRACE_surf_release();
+ TRACE_surf_re
source_utilization_re
lease();
#endif
xbt_mallocator_free(sd_global->task_mallocator);
#endif
xbt_mallocator_free(sd_global->task_mallocator);
@@
-411,15
+415,16
@@
void SD_exit(void)
xbt_swag_free(sd_global->failed_task_set);
xbt_swag_free(sd_global->return_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;
XBT_DEBUG("Exiting Surf...");
surf_exit();
xbt_free(sd_global);
sd_global = NULL;
-#ifdef HAVE_TRACING
- TRACE_end();
-#endif
#ifdef HAVE_JEDULE
jedule_sd_dump();
jedule_sd_cleanup();
#ifdef HAVE_JEDULE
jedule_sd_dump();
jedule_sd_cleanup();