/* 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 "src/surf/surf_interface.hpp"
-#include "src/simdag/simdag_private.h"
#include "instr/instr_interface.h"
-#include "xbt/sysdep.h"
-#include "xbt/dynar.h"
-#include "surf/surf.h"
#include "simgrid/sg_config.h"
#include "simgrid/host.h"
-#include "xbt/ex.h"
-#include "xbt/log.h"
-#include "xbt/str.h"
-#include "xbt/config.h"
-#include "surf/surfxml_parse.h"
+#include "src/simdag/simdag_private.h"
+#include "src/surf/surf_interface.hpp"
+#include "simgrid/s4u/engine.hpp"
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
#include "simgrid/jedule/jedule_sd_binding.h"
#endif
surf_init(argc, argv);
- xbt_cfg_setdefault_string(_sg_cfg_set, "host/model",
- "ptask_L07");
+ xbt_cfg_setdefault_string("host/model", "ptask_L07");
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
jedule_sd_init();
#endif
/** \brief set a configuration variable
*
- * Do --help on any simgrid binary to see the list of currently existing
- * configuration variables, and see Section @ref options.
+ * Do --help on any simgrid binary to see the list of currently existing configuration variables, and
+ * see Section @ref options.
*
* Example:
* SD_config("host/model","default");
*/
void SD_config(const char *key, const char *value){
xbt_assert(sd_global,"ERROR: Please call SD_init() before using SD_config()");
- xbt_cfg_set_as_string(_sg_cfg_set, key, value);
-}
-
-/**
- * \brief Reinits the application part of the simulation (experimental feature)
- *
- * This function allows you to run several simulations on the same platform
- * by resetting the part describing the application.
- *
- * @warning: this function is still experimental and not perfect. For example,
- * the simulation clock (and traces usage) is not reset. So, do not use it if
- * you use traces in your simulation, and do not use absolute timing after
- * using it.
- * That being said, this function is still precious if you want to compare a
- * bunch of heuristics on the same platforms.
- */
-void SD_application_reinit(void)
-{
- xbt_die("This function is not working since the C++ links and others. Please report the problem if you really need that function.");
-
-#ifdef HAVE_JEDULE
- jedule_sd_cleanup();
- jedule_sd_init();
-#endif
+ xbt_cfg_set_as_string(key, value);
}
/**
* \brief Creates the environment
*
- * The environment (i.e. the \ref sg_host_management "hosts" and the \ref SD_link_management "links") is created with
+ * The environment (i.e. the \ref SD_host_api "hosts" and the \ref SD_link_api "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 sg_host_management, SD_link_management
+ * \see SD_host_api, SD_link_api
*
* The XML file follows this DTD:
*
*/
void SD_create_environment(const char *platform_file)
{
- parse_platform_file(platform_file);
+ simgrid::s4u::Engine::instance()->loadPlatform(platform_file);
XBT_DEBUG("Workstation number: %zu, link number: %d", sg_host_count(), sg_link_count());
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
jedule_setup_platform();
#endif
XBT_VERB("Starting simulation...");
xbt_dynar_t SD_simulate(double how_long) {
/* we stop the simulation when total_time >= how_long */
double total_time = 0.0;
- double elapsed_time = 0.0;
SD_task_t task, dst;
SD_dependency_t dependency;
surf_action_t action;
}
/* main loop */
- elapsed_time = 0.0;
+ double elapsed_time = 0.0;
while (elapsed_time >= 0.0 && (how_long < 0.0 || 0.00001 < (how_long -total_time)) &&
!sd_global->watch_point_reached) {
surf_model_t model = NULL;
/* remove the dependencies after this task */
xbt_dynar_foreach(task->tasks_after, depcnt, dependency) {
dst = dependency->dst;
- if (dst->unsatisfied_dependencies > 0)
- dst->unsatisfied_dependencies--;
+ dst->unsatisfied_dependencies--;
if (dst->is_not_ready > 0)
dst->is_not_ready--;
/* let's see which tasks have just failed */
while ((action = surf_model_extract_failed_action_set(model))) {
task = (SD_task_t) action->getData();
- task->start_time = surf_action_get_start_time(task->surf_action);
+ task->start_time = task->surf_action->getStartTime();
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' failed", SD_task_get_name(task));
SD_task_set_state(task, SD_FAILED);
return sd_global->return_set;
}
-/**
- * \brief Returns the current clock
- *
- * \return the current clock, in second
- */
+/** @brief Returns the current clock, in seconds */
double SD_get_clock(void) {
return surf_get_clock();
}
/**
* \brief Destroys all SD internal data
*
- * This function should be called when the simulation is over. Don't forget
- * to destroy too.
+ * This function should be called when the simulation is over. Don't forget to destroy too.
*
* \see SD_init(), SD_task_destroy()
*/
{
TRACE_surf_resource_utilization_release();
- xbt_mallocator_free(sd_global->task_mallocator);
+#if HAVE_JEDULE
+ jedule_sd_cleanup();
+ jedule_sd_exit();
+#endif
- XBT_DEBUG("Destroying the dynars ...");
+ xbt_mallocator_free(sd_global->task_mallocator);
xbt_dynar_free_container(&(sd_global->initial_task_set));
xbt_dynar_free_container(&(sd_global->executable_task_set));
xbt_dynar_free_container(&(sd_global->completed_task_set));
xbt_dynar_free_container(&(sd_global->return_set));
-
- TRACE_end();
-
xbt_free(sd_global);
sd_global = NULL;
-
-#ifdef HAVE_JEDULE
- jedule_sd_cleanup();
- jedule_sd_exit();
-#endif
-
- XBT_DEBUG("Exiting Surf...");
- surf_exit();
}
