#include "simgrid/host.h"
#include "src/simdag/simdag_private.h"
#include "src/surf/surf_interface.hpp"
+#include "simgrid/s4u/engine.hpp"
-#include "xbt/dynar.h"
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
-
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
#include "simgrid/jedule/jedule_sd_binding.h"
#endif
XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd, "Logging specific to SimDag (kernel)");
-SD_global_t sd_global = NULL;
+SD_global_t sd_global = nullptr;
/**
* \brief Initializes SD internal data
{
TRACE_global_init(argc, argv);
- xbt_assert(sd_global == NULL, "SD_init() already called");
+ xbt_assert(sd_global == nullptr, "SD_init() already called");
sd_global = xbt_new(s_SD_global_t, 1);
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->initial_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
- sd_global->executable_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
- sd_global->completed_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
- sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
+ sd_global->initial_tasks = new std::set<SD_task_t>();
+ sd_global->executable_tasks = new std::set<SD_task_t>();
+ sd_global->completed_tasks = new std::set<SD_task_t>();
+ sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), nullptr);
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
* 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");
+ * 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);
+ 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;
xbt_dynar_reset(sd_global->return_set);
/* explore the runnable tasks */
- xbt_dynar_foreach(sd_global->executable_task_set , iter, task) {
+ for (std::set<SD_task_t>::iterator it=sd_global->executable_tasks->begin();
+ it!=sd_global->executable_tasks->end(); ++it){
+ task = *it;
XBT_VERB("Executing task '%s'", SD_task_get_name(task));
SD_task_run(task);
xbt_dynar_push(sd_global->return_set, &task);
- iter--;
}
/* 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;
+ surf_model_t model = nullptr;
XBT_DEBUG("Total time: %f", total_time);
/* let's see which tasks are done */
xbt_dynar_foreach(all_existing_models, iter, model) {
while ((action = surf_model_extract_done_action_set(model))) {
- task = (SD_task_t) action->getData();
+ task = static_cast<SD_task_t>(action->getData());
task->start_time = task->surf_action->getStartTime();
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' done", SD_task_get_name(task));
SD_task_set_state(task, SD_DONE);
task->surf_action->unref();
- task->surf_action = NULL;
+ task->surf_action = nullptr;
/* the state has changed. Add it only if it's the first change */
- if (!xbt_dynar_member(sd_global->return_set, &task)) {
+ if (xbt_dynar_member(sd_global->return_set, &task) == 0) {
xbt_dynar_push(sd_global->return_set, &task);
}
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 (dst->unsatisfied_dependencies == 0) {
if (SD_task_get_state(dst) == SD_SCHEDULED)
SD_task_set_state(dst, SD_RUNNABLE);
else
SD_task_set_state(dst, SD_SCHEDULABLE);
}
- if (SD_task_get_state(dst) == SD_NOT_SCHEDULED && !(dst->is_not_ready)) {
+ if (SD_task_get_state(dst) == SD_NOT_SCHEDULED && dst->is_not_ready == 0) {
SD_task_set_state(dst, SD_SCHEDULABLE);
}
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)) {
+ if (comm_dst->is_not_ready == 0) {
SD_task_set_state(comm_dst, SD_SCHEDULABLE);
}
}
/* 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 = static_cast<SD_task_t>(action->getData());
+ 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);
action->unref();
- task->surf_action = NULL;
+ task->surf_action = nullptr;
xbt_dynar_push(sd_global->return_set, &task);
}
}
}
- if (!sd_global->watch_point_reached && how_long<0){
- if (!xbt_dynar_is_empty(sd_global->initial_task_set)) {
- XBT_WARN("Simulation is finished but %lu tasks are still not done",
- xbt_dynar_length(sd_global->initial_task_set));
- static const char* state_names[] =
- { "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED", "SD_RUNNABLE", "SD_RUNNING", "SD_DONE","SD_FAILED" };
- xbt_dynar_foreach(sd_global->initial_task_set, iter, task){
- XBT_WARN("%s is in %s state", SD_task_get_name(task), state_names[SD_task_get_state(task)]);
- }
+ if (!sd_global->watch_point_reached && how_long<0 && !sd_global->initial_tasks->empty()) {
+ XBT_WARN("Simulation is finished but %zu tasks are still not done",
+ sd_global->initial_tasks->size());
+ static const char* state_names[] =
+ { "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED", "SD_RUNNABLE", "SD_RUNNING", "SD_DONE","SD_FAILED" };
+ for (std::set<SD_task_t>::iterator it=sd_global->initial_tasks->begin();
+ it!=sd_global->initial_tasks->end(); ++it){
+ task = *it;
+ XBT_WARN("%s is in %s state", SD_task_get_name(task), state_names[SD_task_get_state(task)]);
}
}
}
/** @brief Returns the current clock, in seconds */
-double SD_get_clock(void) {
+double SD_get_clock() {
return surf_get_clock();
}
*
* \see SD_init(), SD_task_destroy()
*/
-void SD_exit(void)
+void SD_exit()
{
TRACE_surf_resource_utilization_release();
- TRACE_end();
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
jedule_sd_cleanup();
jedule_sd_exit();
#endif
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));
+ delete sd_global->initial_tasks;
+ delete sd_global->executable_tasks;
+ delete sd_global->completed_tasks;
xbt_dynar_free_container(&(sd_global->return_set));
xbt_free(sd_global);
- sd_global = NULL;
-
- surf_exit();
+ sd_global = nullptr;
}
