-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2017. 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 "surf_private.h"
#include "surf_interface.hpp"
-#include "network_interface.hpp"
-#include "cpu_interface.hpp"
-#include "host_interface.hpp"
-#include "src/simix/smx_host_private.h"
-#include "surf_routing.hpp"
-#include "simgrid/sg_config.h"
#include "mc/mc.h"
-#include "virtual_machine.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/sg_config.h"
+#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
+#include "src/kernel/routing/NetPoint.hpp"
+#include "src/surf/HostImpl.hpp"
+
+#include <fstream>
+#include <set>
+#include <string>
+#include <vector>
XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
- "Logging specific to SURF (kernel)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)");
/*********
* Utils *
*********/
-/* model_list_invoke contains only surf_host and surf_vm.
- * The callback functions of cpu_model and network_model will be called from
- * those of these host models. */
-xbt_dynar_t all_existing_models = NULL; /* to destroy models correctly */
-xbt_dynar_t model_list_invoke = NULL; /* for invoking callbacks */
+std::vector<surf_model_t> * all_existing_models = nullptr; /* to destroy models correctly */
-tmgr_history_t history = NULL;
-lmm_system_t maxmin_system = NULL;
-xbt_dynar_t surf_path = NULL;
-xbt_dynar_t host_that_restart = NULL;
-xbt_dict_t watched_hosts_lib;
+simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
+std::vector<std::string> surf_path;
+std::vector<simgrid::s4u::Host*> host_that_restart;
+/** set of hosts for which one want to be notified if they ever restart. */
+std::set<std::string> watched_hosts;
+extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
-surf_callback(void, void) surfExitCallbacks;
+namespace simgrid {
+namespace surf {
+
+simgrid::xbt::signal<void()> surfExitCallbacks;
+}
+}
+
+#include <simgrid/plugins/energy.h> // FIXME: this plug-in should not be linked to the core
+#include <simgrid/plugins/load.h> // FIXME: this plug-in should not be linked to the core
s_surf_model_description_t surf_plugin_description[] = {
- {"Energy", "Cpu energy consumption.", sg_energy_plugin_init},
- {NULL, NULL, NULL} /* this array must be NULL terminated */
+ {"Energy", "Cpu energy consumption.", &sg_host_energy_plugin_init},
+ {"Load", "Cpu load.", &sg_host_load_plugin_init},
+ {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
-/* Don't forget to update the option description in smx_config when you change
- this */
+/* Don't forget to update the option description in smx_config when you change this */
s_surf_model_description_t surf_network_model_description[] = {
- {"LV08",
- "Realistic network analytic model (slow-start modeled by multiplying latency by 10.4, bandwidth by .92; bottleneck sharing uses a payload of S=8775 for evaluating RTT). ",
- surf_network_model_init_LegrandVelho},
- {"Constant",
- "Simplistic network model where all communication take a constant time (one second). This model provides the lowest realism, but is (marginally) faster.",
- surf_network_model_init_Constant},
- {"SMPI",
- "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)",
- surf_network_model_init_SMPI},
- {"IB",
- "Realistic network model specifically tailored for HPC settings, with Infiniband contention model",
- surf_network_model_init_IB},
- {"CM02",
- "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of small messages are thus poorly modeled).",
- surf_network_model_init_CM02},
-#ifdef HAVE_NS3
- {"NS3",
- "Network pseudo-model using the NS3 tcp model instead of an analytic model",
- surf_network_model_init_NS3},
-#endif
- {"Reno",
- "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
- surf_network_model_init_Reno},
- {"Reno2",
- "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
- surf_network_model_init_Reno2},
- {"Vegas",
- "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
- surf_network_model_init_Vegas},
- {NULL, NULL, NULL} /* this array must be NULL terminated */
+ {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 13.01, bandwidth by .97; "
+ "bottleneck sharing uses a payload of S=20537 for evaluating RTT). ",
+ &surf_network_model_init_LegrandVelho},
+ {"Constant", "Simplistic network model where all communication take a constant time (one second). This model "
+ "provides the lowest realism, but is (marginally) faster.",
+ &surf_network_model_init_Constant},
+ {"SMPI", "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with "
+ "correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)",
+ &surf_network_model_init_SMPI},
+ {"IB", "Realistic network model specifically tailored for HPC settings, with Infiniband contention model",
+ &surf_network_model_init_IB},
+ {"CM02", "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of "
+ "small messages are thus poorly modeled).",
+ &surf_network_model_init_CM02},
+ {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", &surf_network_model_init_NS3},
+ {"Reno",
+ "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
+ &surf_network_model_init_Reno},
+ {"Reno2",
+ "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
+ &surf_network_model_init_Reno2},
+ {"Vegas",
+ "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
+ &surf_network_model_init_Vegas},
+ {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
+#if ! HAVE_SMPI
+void surf_network_model_init_SMPI() {
+ xbt_die("Please activate SMPI support in cmake to use the SMPI network model.");
+}
+void surf_network_model_init_IB() {
+ xbt_die("Please activate SMPI support in cmake to use the IB network model.");
+}
+#endif
+#if !SIMGRID_HAVE_NS3
+void surf_network_model_init_NS3() {
+ xbt_die("Please activate NS3 support in cmake and install the dependencies to use the NS3 network model.");
+}
+#endif
+
s_surf_model_description_t surf_cpu_model_description[] = {
- {"Cas01",
- "Simplistic CPU model (time=size/power).",
- surf_cpu_model_init_Cas01},
- {NULL, NULL, NULL} /* this array must be NULL terminated */
+ {"Cas01", "Simplistic CPU model (time=size/power).", &surf_cpu_model_init_Cas01},
+ {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
s_surf_model_description_t surf_host_model_description[] = {
- {"default",
- "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)",
- surf_host_model_init_current_default},
- {"compound",
- "Host model that is automatically chosen if you change the network and CPU models",
- surf_host_model_init_compound},
- {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks",
- surf_host_model_init_ptask_L07},
- {NULL, NULL, NULL} /* this array must be NULL terminated */
-};
-
-s_surf_model_description_t surf_vm_model_description[] = {
- {"default",
- "Default vm model.",
- surf_vm_model_init_HL13},
- {NULL, NULL, NULL} /* this array must be NULL terminated */
+ {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", &surf_host_model_init_current_default},
+ {"compound", "Host model that is automatically chosen if you change the network and CPU models", &surf_host_model_init_compound},
+ {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", &surf_host_model_init_ptask_L07},
+ {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
s_surf_model_description_t surf_optimization_mode_description[] = {
- {"Lazy",
- "Lazy action management (partial invalidation in lmm + heap in action remaining).",
- NULL},
- {"TI",
- "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).",
- NULL},
- {"Full",
- "Full update of remaining and variables. Slow but may be useful when debugging.",
- NULL},
- {NULL, NULL, NULL} /* this array must be NULL terminated */
+ {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", nullptr},
+ {"TI", "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", nullptr},
+ {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr},
+ {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
s_surf_model_description_t surf_storage_model_description[] = {
- {"default",
- "Simplistic storage model.",
- surf_storage_model_init_default},
- {NULL, NULL, NULL} /* this array must be NULL terminated */
+ {"default", "Simplistic storage model.", &surf_storage_model_init_default},
+ {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
};
-#ifdef CONTEXT_THREADS
-static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
-#endif
-
double NOW = 0;
-double surf_get_clock(void)
+double surf_get_clock()
{
return NOW;
}
-#ifdef _XBT_WIN32
+#ifdef _WIN32
# define FILE_DELIM "\\"
#else
# define FILE_DELIM "/" /* FIXME: move to better location */
#endif
+std::ifstream* surf_ifsopen(std::string name)
+{
+ std::ifstream* fs = new std::ifstream();
+ xbt_assert(not name.empty());
+ if (__surf_is_absolute_file_path(name.c_str())) { /* don't mess with absolute file names */
+ fs->open(name.c_str(), std::ifstream::in);
+ }
+
+ /* search relative files in the path */
+ for (auto const& path_elm : surf_path) {
+ std::string buff = path_elm + FILE_DELIM + name;
+ fs->open(buff.c_str(), std::ifstream::in);
+
+ if (not fs->fail()) {
+ XBT_DEBUG("Found file at %s", buff.c_str());
+ return fs;
+ }
+ }
+
+ return fs;
+}
+
FILE *surf_fopen(const char *name, const char *mode)
{
- unsigned int cpt;
- char *path_elm = NULL;
- char *buff;
- FILE *file = NULL;
+ FILE *file = nullptr;
xbt_assert(name);
return fopen(name, mode);
/* search relative files in the path */
- xbt_dynar_foreach(surf_path, cpt, path_elm) {
- buff = bprintf("%s" FILE_DELIM "%s", path_elm, name);
- file = fopen(buff, mode);
- free(buff);
+ for (auto const& path_elm : surf_path) {
+ std::string buff = path_elm + FILE_DELIM + name;
+ file = fopen(buff.c_str(), mode);
if (file)
return file;
}
- return NULL;
+ return nullptr;
}
-#ifdef _XBT_WIN32
+#ifdef _WIN32
#include <windows.h>
#define MAX_DRIVE 26
static const char *disk_drives_letter_table[MAX_DRIVE] = {
* directory on Unix/Linux platforms.
*/
-const char *__surf_get_initial_path(void)
+const char *__surf_get_initial_path()
{
-#ifdef _XBT_WIN32
+#ifdef _WIN32
unsigned i;
char current_directory[MAX_PATH + 1] = { 0 };
unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory);
char root[4] = { 0 };
- if (!len)
- return NULL;
+ if (not len)
+ return nullptr;
strncpy(root, current_directory, 3);
return disk_drives_letter_table[i];
}
- return NULL;
+ return nullptr;
#else
return "./";
#endif
*/
int __surf_is_absolute_file_path(const char *file_path)
{
-#ifdef _XBT_WIN32
+#ifdef _WIN32
WIN32_FIND_DATA wfd = { 0 };
HANDLE hFile = FindFirstFile(file_path, &wfd);
/** Displays the long description of all registered models, and quit */
void model_help(const char *category, s_surf_model_description_t * table)
{
- int i;
- printf("Long description of the %s models accepted by this simulator:\n",
- category);
- for (i = 0; table[i].name; i++)
+ printf("Long description of the %s models accepted by this simulator:\n", category);
+ for (int i = 0; table[i].name; i++)
printf(" %s: %s\n", table[i].name, table[i].description);
}
-int find_model_description(s_surf_model_description_t * table,
- const char *name)
+int find_model_description(s_surf_model_description_t* table, const char* name)
{
- int i;
- char *name_list = NULL;
-
- for (i = 0; table[i].name; i++)
- if (!strcmp(name, table[i].name)) {
+ for (int i = 0; table[i].name; i++)
+ if (not strcmp(name, table[i].name)) {
return i;
}
- if (!table[0].name)
+
+ if (not table[0].name)
xbt_die("No model is valid! This is a bug.");
- name_list = xbt_strdup(table[0].name);
- for (i = 1; table[i].name; i++) {
+
+ char* name_list = xbt_strdup(table[0].name);
+ for (int i = 1; table[i].name; i++) {
name_list = (char *) xbt_realloc(name_list, strlen(name_list) + strlen(table[i].name) + 3);
- strcat(name_list, ", ");
- strcat(name_list, table[i].name);
+ strncat(name_list, ", ", 2);
+ strncat(name_list, table[i].name, strlen(table[i].name));
}
xbt_die("Model '%s' is invalid! Valid models are: %s.", name, name_list);
return -1;
}
-static XBT_INLINE void routing_asr_prop_free(void *p)
+void sg_version_check(int lib_version_major, int lib_version_minor, int lib_version_patch)
{
- //xbt_dict_t elm = (xbt_dict_t) p;
- //xbt_dict_free(&elm); FIXME: leaking in some case? That's a sometimes double-free with AsCluster::~AsCluster
-}
-
-static XBT_INLINE void surf_host_free(void *r)
-{
- delete static_cast<Host*>(r);
-}
-
-static XBT_INLINE void surf_storage_free(void *r)
-{
- delete static_cast<Storage*>(r);
-}
-
-void sg_version_check(int lib_version_major,int lib_version_minor,int lib_version_patch) {
- if ((lib_version_major != SIMGRID_VERSION_MAJOR) || (lib_version_minor != SIMGRID_VERSION_MINOR)) {
- fprintf(stderr,
- "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, "
- "and then linked against SimGrid %d.%d.%d. Please fix this.\n",
- SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH,
- lib_version_major,lib_version_minor,lib_version_patch);
+ if ((lib_version_major != SIMGRID_VERSION_MAJOR) || (lib_version_minor != SIMGRID_VERSION_MINOR)) {
+ fprintf(stderr, "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, "
+ "and then linked against SimGrid %d.%d.%d. Please fix this.\n",
+ lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR,
+ SIMGRID_VERSION_PATCH);
+ abort();
+ }
+ if (lib_version_patch != SIMGRID_VERSION_PATCH) {
+ if (SIMGRID_VERSION_PATCH >= 90 || lib_version_patch >= 90) {
+ fprintf(
+ stderr,
+ "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, "
+ "and then linked against SimGrid %d.%d.%d. \n"
+ "One of them is a development version, and should not be mixed with the stable release. Please fix this.\n",
+ lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR,
+ SIMGRID_VERSION_PATCH);
abort();
}
- if (lib_version_patch != SIMGRID_VERSION_PATCH) {
- fprintf(stderr,
- "Warning: Your program was compiled with SimGrid version %d.%d.%d, "
- "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n",
- SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH,
- lib_version_major,lib_version_minor,lib_version_patch);
- }
+ fprintf(stderr, "Warning: Your program was compiled with SimGrid version %d.%d.%d, "
+ "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n",
+ lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR,
+ SIMGRID_VERSION_PATCH);
+ }
}
-void sg_version(int *ver_major,int *ver_minor,int *ver_patch) {
+void sg_version_get(int* ver_major, int* ver_minor, int* ver_patch)
+{
*ver_major = SIMGRID_VERSION_MAJOR;
*ver_minor = SIMGRID_VERSION_MINOR;
*ver_patch = SIMGRID_VERSION_PATCH;
}
-void surf_init(int *argc, char **argv)
+void sg_version()
{
- XBT_DEBUG("Create all Libs");
- host_lib = xbt_lib_new();
- as_router_lib = xbt_lib_new();
- storage_lib = xbt_lib_new();
- storage_type_lib = xbt_lib_new();
- file_lib = xbt_lib_new();
- watched_hosts_lib = xbt_dict_new_homogeneous(NULL);
+ std::printf("This program was linked against %s (git: %s), found in %s.\n",
+ SIMGRID_VERSION_STRING, SIMGRID_GIT_VERSION, SIMGRID_INSTALL_PREFIX);
- sg_host_init();
+#if SIMGRID_HAVE_MC
+ std::printf(" Model-checking support compiled in.\n");
+#else
+ std::printf(" Model-checking support disabled at compilation.\n");
+#endif
- XBT_DEBUG("Add routing levels");
- ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_prop_free);
+#if SIMGRID_HAVE_NS3
+ std::printf(" NS3 support compiled in.\n");
+#else
+ std::printf(" NS3 support disabled at compilation.\n");
+#endif
- XBT_DEBUG("Add SURF levels");
- SURF_HOST_LEVEL = xbt_lib_add_level(host_lib,surf_host_free);
- SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free);
+#if SIMGRID_HAVE_JEDULE
+ std::printf(" Jedule support compiled in.\n");
+#else
+ std::printf(" Jedule support disabled at compilation.\n");
+#endif
- xbt_init(argc, argv);
- if (!all_existing_models)
- all_existing_models = xbt_dynar_new(sizeof(Model*), NULL);
- if (!model_list_invoke)
- model_list_invoke = xbt_dynar_new(sizeof(Model*), NULL);
- if (!history)
- history = tmgr_history_new();
+#if SIMGRID_HAVE_LUA
+ std::printf(" Lua support compiled in.\n");
+#else
+ std::printf(" Lua support disabled at compilation.\n");
+#endif
+
+#if SIMGRID_HAVE_MALLOCATOR
+ std::printf(" Mallocator support compiled in.\n");
+#else
+ std::printf(" Mallocator support disabled at compilation.\n");
+#endif
- TRACE_add_start_function(TRACE_surf_alloc);
- TRACE_add_end_function(TRACE_surf_release);
+ std::printf("\nTo cite SimGrid in a publication, please use:\n"
+ " Henri Casanova, Arnaud Giersch, Arnaud Legrand, Martin Quinson, Frédéric Suter. \n"
+ " Versatile, Scalable, and Accurate Simulation of Distributed Applications and Platforms. \n"
+ " Journal of Parallel and Distributed Computing, Elsevier, 2014, 74 (10), pp.2899-2917.\n");
+ std::printf("The pdf file and a BibTeX entry for LaTeX users can be found at http://hal.inria.fr/hal-01017319\n");
+}
+
+void surf_init(int *argc, char **argv)
+{
+ if (USER_HOST_LEVEL != -1) // Already initialized
+ return;
+
+ XBT_DEBUG("Create all Libs");
+ USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
+
+ xbt_init(argc, argv);
+ if (not all_existing_models)
+ all_existing_models = new std::vector<simgrid::surf::Model*>();
+ if (not future_evt_set)
+ future_evt_set = new simgrid::trace_mgr::future_evt_set();
sg_config_init(argc, argv);
MC_memory_init();
}
-void surf_exit(void)
+void surf_exit()
{
- unsigned int iter;
- Model *model = NULL;
-
- TRACE_end(); /* Just in case it was not called by the upper
- * layer (or there is no upper layer) */
-
- sg_config_finalize();
+ TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */
- xbt_dynar_free(&host_that_restart);
- xbt_dynar_free(&surf_path);
-
- xbt_lib_free(&host_lib);
- xbt_lib_free(&as_router_lib);
- xbt_lib_free(&storage_lib);
+ sg_host_exit();
sg_link_exit();
- xbt_lib_free(&storage_type_lib);
- xbt_lib_free(&file_lib);
- xbt_dict_free(&watched_hosts_lib);
+ for (auto const& e : storage_types) {
+ simgrid::surf::StorageType* stype = e.second;
+ delete stype->properties;
+ delete stype->model_properties;
+ delete stype;
+ }
+ for (auto const& s : *simgrid::surf::StorageImpl::storagesMap())
+ delete s.second;
+ delete simgrid::surf::StorageImpl::storagesMap();
- xbt_dynar_foreach(all_existing_models, iter, model)
+ for (auto const& model : *all_existing_models)
delete model;
- xbt_dynar_free(&all_existing_models);
- xbt_dynar_free(&model_list_invoke);
- routing_exit();
+ delete all_existing_models;
- surf_callback_emit(surfExitCallbacks);
+ simgrid::surf::surfExitCallbacks();
- if (maxmin_system) {
- lmm_system_free(maxmin_system);
- maxmin_system = NULL;
- }
- if (history) {
- tmgr_history_free(history);
- history = NULL;
+ if (future_evt_set) {
+ delete future_evt_set;
+ future_evt_set = nullptr;
}
-#ifdef CONTEXT_THREADS
- xbt_parmap_destroy(surf_parmap);
-#endif
-
tmgr_finalize();
- surf_parse_lex_destroy();
- surf_parse_free_callbacks();
+ sg_platf_exit();
+ simgrid::s4u::Engine::shutdown();
NOW = 0; /* Just in case the user plans to restart the simulation afterward */
}
* Model *
*********/
+namespace simgrid {
+namespace surf {
+
Model::Model()
- : p_maxminSystem(NULL)
+ : maxminSystem_(nullptr)
{
- p_readyActionSet = new ActionList();
- p_runningActionSet = new ActionList();
- p_failedActionSet = new ActionList();
- p_doneActionSet = new ActionList();
+ readyActionSet_ = new ActionList();
+ runningActionSet_ = new ActionList();
+ failedActionSet_ = new ActionList();
+ doneActionSet_ = new ActionList();
- p_modifiedSet = NULL;
- p_actionHeap = NULL;
- p_updateMechanism = UM_UNDEFINED;
- m_selectiveUpdate = 0;
+ modifiedSet_ = nullptr;
+ actionHeap_ = nullptr;
+ updateMechanism_ = UM_UNDEFINED;
+ selectiveUpdate_ = 0;
}
Model::~Model(){
- delete p_readyActionSet;
- delete p_runningActionSet;
- delete p_failedActionSet;
- delete p_doneActionSet;
+ delete readyActionSet_;
+ delete runningActionSet_;
+ delete failedActionSet_;
+ delete doneActionSet_;
}
-double Model::shareResources(double now)
+double Model::nextOccuringEvent(double now)
{
//FIXME: set the good function once and for all
- if (p_updateMechanism == UM_LAZY)
- return shareResourcesLazy(now);
- else if (p_updateMechanism == UM_FULL)
- return shareResourcesFull(now);
+ if (updateMechanism_ == UM_LAZY)
+ return nextOccuringEventLazy(now);
+ else if (updateMechanism_ == UM_FULL)
+ return nextOccuringEventFull(now);
else
xbt_die("Invalid cpu update mechanism!");
}
-double Model::shareResourcesLazy(double now)
+double Model::nextOccuringEventLazy(double now)
{
- Action *action = NULL;
- double min = -1;
- double share;
-
- XBT_DEBUG
- ("Before share resources, the size of modified actions set is %zd",
- p_modifiedSet->size());
-
- lmm_solve(p_maxminSystem);
-
- XBT_DEBUG
- ("After share resources, The size of modified actions set is %zd",
- p_modifiedSet->size());
+ XBT_DEBUG("Before share resources, the size of modified actions set is %zu", modifiedSet_->size());
+ lmm_solve(maxminSystem_);
+ XBT_DEBUG("After share resources, The size of modified actions set is %zu", modifiedSet_->size());
- while(!p_modifiedSet->empty()) {
- action = &(p_modifiedSet->front());
- p_modifiedSet->pop_front();
- int max_dur_flag = 0;
+ while (not modifiedSet_->empty()) {
+ Action *action = &(modifiedSet_->front());
+ modifiedSet_->pop_front();
+ bool max_dur_flag = false;
- if (action->getStateSet() != p_runningActionSet)
+ if (action->getStateSet() != runningActionSet_)
continue;
/* bogus priority, skip it */
action->updateRemainingLazy(now);
- min = -1;
- share = lmm_variable_getvalue(action->getVariable());
+ double min = -1;
+ double share = lmm_variable_getvalue(action->getVariable());
if (share > 0) {
double time_to_completion;
min = now + time_to_completion; // when the task will complete if nothing changes
}
- if ((action->getMaxDuration() != NO_MAX_DURATION)
- && (min == -1
- || action->getStartTime() +
- action->getMaxDuration() < min)) {
- min = action->getStartTime() +
- action->getMaxDuration(); // when the task will complete anyway because of the deadline if any
- max_dur_flag = 1;
+ if ((action->getMaxDuration() > NO_MAX_DURATION) &&
+ (min <= -1 || action->getStartTime() + action->getMaxDuration() < min)) {
+ // when the task will complete anyway because of the deadline if any
+ min = action->getStartTime() + action->getMaxDuration();
+ max_dur_flag = true;
}
-
XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->getVariable()->id_int);
XBT_DEBUG("Action(%p) Start %f. May finish at %f (got a share of %f). Max_duration %f", action,
action->getStartTime(), min, share,
action->getMaxDuration());
- if (min != -1) {
- action->heapUpdate(p_actionHeap, min, max_dur_flag ? MAX_DURATION : NORMAL);
- XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min,
- now);
- } else DIE_IMPOSSIBLE;
+ if (min > -1) {
+ action->heapUpdate(actionHeap_, min, max_dur_flag ? MAX_DURATION : NORMAL);
+ XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min, now);
+ } else
+ DIE_IMPOSSIBLE;
}
//hereafter must have already the min value for this resource model
- if (xbt_heap_size(p_actionHeap) > 0)
- min = xbt_heap_maxkey(p_actionHeap) - now;
- else
- min = -1;
-
- XBT_DEBUG("The minimum with the HEAP %f", min);
-
- return min;
+ if (xbt_heap_size(actionHeap_) > 0) {
+ double min = xbt_heap_maxkey(actionHeap_) - now;
+ XBT_DEBUG("minimum with the HEAP %f", min);
+ return min;
+ } else {
+ XBT_DEBUG("The HEAP is empty, thus returning -1");
+ return -1;
+ }
}
-double Model::shareResourcesFull(double /*now*/) {
- THROW_UNIMPLEMENTED;
-}
+double Model::nextOccuringEventFull(double /*now*/) {
+ maxminSystem_->solve_fun(maxminSystem_);
-double Model::shareResourcesMaxMin(ActionList *running_actions,
- lmm_system_t sys,
- void (*solve) (lmm_system_t))
-{
- Action *action = NULL;
double min = -1;
- double value = -1;
-
- solve(sys);
-
- ActionList::iterator it(running_actions->begin()), itend(running_actions->end());
- for(; it != itend ; ++it) {
- action = &*it;
- value = lmm_variable_getvalue(action->getVariable());
- if ((value > 0) || (action->getMaxDuration() >= 0))
- break;
- }
-
- if (!action)
- return -1.0;
-
- if (value > 0) {
- if (action->getRemains() > 0)
- min = action->getRemainsNoUpdate() / value;
- else
- min = 0.0;
- if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min))
- min = action->getMaxDuration();
- } else
- min = action->getMaxDuration();
-
-
- for (++it; it != itend; ++it) {
- action = &*it;
- value = lmm_variable_getvalue(action->getVariable());
+ for (auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; ++it) {
+ Action *action = &*it;
+ double value = lmm_variable_getvalue(action->getVariable());
if (value > 0) {
if (action->getRemains() > 0)
value = action->getRemainsNoUpdate() / value;
else
value = 0.0;
- if (value < min) {
+ if (min < 0 || value < min) {
min = value;
XBT_DEBUG("Updating min (value) with %p: %f", action, min);
}
}
- if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min)) {
+ if ((action->getMaxDuration() >= 0) && (min<0 || action->getMaxDuration() < min)) {
min = action->getMaxDuration();
XBT_DEBUG("Updating min (duration) with %p: %f", action, min);
}
void Model::updateActionsState(double now, double delta)
{
- if (p_updateMechanism == UM_FULL)
- updateActionsStateFull(now, delta);
- else if (p_updateMechanism == UM_LAZY)
- updateActionsStateLazy(now, delta);
+ if (updateMechanism_ == UM_FULL)
+ updateActionsStateFull(now, delta);
+ else if (updateMechanism_ == UM_LAZY)
+ updateActionsStateLazy(now, delta);
else
- xbt_die("Invalid cpu update mechanism!");
+ xbt_die("Invalid cpu update mechanism!");
}
void Model::updateActionsStateLazy(double /*now*/, double /*delta*/)
{
- THROW_UNIMPLEMENTED;
+ THROW_UNIMPLEMENTED;
}
void Model::updateActionsStateFull(double /*now*/, double /*delta*/)
THROW_UNIMPLEMENTED;
}
+}
+}
+
/************
* Resource *
************/
-Resource::Resource()
-: p_name(NULL), p_properties(NULL), p_model(NULL)
-{}
+namespace simgrid {
+namespace surf {
-Resource::Resource(Model *model, const char *name, xbt_dict_t props)
- : p_name(xbt_strdup(name)), p_properties(props), p_model(model)
- , m_running(true), m_stateCurrent(SURF_RESOURCE_ON)
+Resource::Resource(Model* model, const std::string& name, lmm_constraint_t constraint)
+ : name_(name), model_(model), constraint_(constraint)
{}
-Resource::Resource(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint)
- : p_name(xbt_strdup(name)), p_properties(props), p_model(model)
- , m_running(true), m_stateCurrent(SURF_RESOURCE_ON), p_constraint(constraint)
-{}
-
-Resource::Resource(Model *model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit)
- : p_name(xbt_strdup(name)), p_properties(props), p_model(model)
- , m_running(true), m_stateCurrent(stateInit)
-{}
+Resource::~Resource() = default;
-Resource::~Resource() {
- xbt_free((void*)p_name);
- xbt_dict_free(&p_properties);
+bool Resource::isOn() const {
+ return isOn_;
}
-
-e_surf_resource_state_t Resource::getState()
-{
- return m_stateCurrent;
+bool Resource::isOff() const {
+ return not isOn_;
}
-void Resource::setState(e_surf_resource_state_t state)
+void Resource::turnOn()
{
- m_stateCurrent = state;
+ isOn_ = true;
}
-bool Resource::isOn()
+void Resource::turnOff()
{
- return m_running;
+ isOn_ = false;
}
-void Resource::turnOn()
+Model* Resource::model() const
{
- if (!m_running) {
- m_running = true;
- }
+ return model_;
}
-void Resource::turnOff()
+const char* Resource::cname() const
{
- if (m_running) {
- m_running = false;
- }
+ return name_.c_str();
}
-Model *Resource::getModel() {
- return p_model;
+bool Resource::operator==(const Resource &other) const {
+ return name_ == other.name_;
}
-const char *Resource::getName() {
- return p_name;
+lmm_constraint_t Resource::constraint() const
+{
+ return constraint_;
}
-xbt_dict_t Resource::getProperties() {
- if (p_properties==NULL)
- p_properties = xbt_dict_new();
- return p_properties;
}
-
-lmm_constraint_t Resource::getConstraint() {
- return p_constraint;
}
/**********
"SURF_ACTION_NOT_IN_THE_SYSTEM"
};
-void Action::initialize(Model *model, double cost, bool failed,
- lmm_variable_t var)
-{
- m_priority = 1.0;
- m_refcount = 1;
- m_remains = cost;
- m_maxDuration = NO_MAX_DURATION;
- m_finish = -1.0;
- m_start = surf_get_clock();
- m_cost = cost;
- p_model = model;
- p_data = NULL;
- p_variable = var;
- m_lastValue = 0;
- m_lastUpdate = 0;
- m_suspended = false;
- m_hat = NOTSET;
- p_category = NULL;
- p_stateHookup.prev = 0;
- p_stateHookup.next = 0;
- if (failed)
- p_stateSet = getModel()->getFailedActionSet();
- else
- p_stateSet = getModel()->getRunningActionSet();
-
- p_stateSet->push_back(*this);
-}
-
-Action::Action(Model *model, double cost, bool failed)
-{
- initialize(model, cost, failed);
-}
-
-Action::Action(Model *model, double cost, bool failed, lmm_variable_t var)
-{
- initialize(model, cost, failed, var);
-}
-
-Action::~Action() {
- xbt_free(p_category);
+/* added to manage the communication action's heap */
+void surf_action_lmm_update_index_heap(void *action, int i) {
+ static_cast<simgrid::surf::Action*>(action)->updateIndexHeap(i);
}
-void Action::finish() {
- m_finish = surf_get_clock();
-}
+namespace simgrid {
+namespace surf {
-e_surf_action_state_t Action::getState()
+Action::Action(simgrid::surf::Model* model, double cost, bool failed) : Action(model, cost, failed, nullptr)
{
- if (p_stateSet == getModel()->getReadyActionSet())
- return SURF_ACTION_READY;
- if (p_stateSet == getModel()->getRunningActionSet())
- return SURF_ACTION_RUNNING;
- if (p_stateSet == getModel()->getFailedActionSet())
- return SURF_ACTION_FAILED;
- if (p_stateSet == getModel()->getDoneActionSet())
- return SURF_ACTION_DONE;
- return SURF_ACTION_NOT_IN_THE_SYSTEM;
}
-void Action::setState(e_surf_action_state_t state)
+Action::Action(simgrid::surf::Model* model, double cost, bool failed, lmm_variable_t var)
+ : remains_(cost), start_(surf_get_clock()), cost_(cost), model_(model), variable_(var)
{
- //surf_action_state_t action_state = &(action->model_type->states);
- XBT_IN("(%p,%s)", this, surf_action_state_names[state]);
- p_stateSet->erase(p_stateSet->iterator_to(*this));
- if (state == SURF_ACTION_READY)
- p_stateSet = getModel()->getReadyActionSet();
- else if (state == SURF_ACTION_RUNNING)
- p_stateSet = getModel()->getRunningActionSet();
- else if (state == SURF_ACTION_FAILED)
- p_stateSet = getModel()->getFailedActionSet();
- else if (state == SURF_ACTION_DONE)
- p_stateSet = getModel()->getDoneActionSet();
+ if (failed)
+ stateSet_ = getModel()->getFailedActionSet();
else
- p_stateSet = NULL;
+ stateSet_ = getModel()->getRunningActionSet();
- if (p_stateSet)
- p_stateSet->push_back(*this);
- XBT_OUT();
+ stateSet_->push_back(*this);
+}
+
+Action::~Action() {
+ xbt_free(category_);
+}
+
+void Action::finish(Action::State state)
+{
+ finishTime_ = surf_get_clock();
+ setState(state);
+}
+
+Action::State Action::getState()
+{
+ if (stateSet_ == model_->getReadyActionSet())
+ return Action::State::ready;
+ if (stateSet_ == model_->getRunningActionSet())
+ return Action::State::running;
+ if (stateSet_ == model_->getFailedActionSet())
+ return Action::State::failed;
+ if (stateSet_ == model_->getDoneActionSet())
+ return Action::State::done;
+ return Action::State::not_in_the_system;
+}
+
+void Action::setState(Action::State state)
+{
+ stateSet_->erase(stateSet_->iterator_to(*this));
+ switch (state) {
+ case Action::State::ready:
+ stateSet_ = model_->getReadyActionSet();
+ break;
+ case Action::State::running:
+ stateSet_ = model_->getRunningActionSet();
+ break;
+ case Action::State::failed:
+ stateSet_ = model_->getFailedActionSet();
+ break;
+ case Action::State::done:
+ stateSet_ = model_->getDoneActionSet();
+ break;
+ default:
+ stateSet_ = nullptr;
+ break;
+ }
+ if (stateSet_)
+ stateSet_->push_back(*this);
}
double Action::getBound()
{
- return (p_variable) ? lmm_variable_getbound(p_variable) : 0;
+ return (variable_) ? lmm_variable_getbound(variable_) : 0;
}
void Action::setBound(double bound)
{
XBT_IN("(%p,%g)", this, bound);
- if (p_variable)
- lmm_update_variable_bound(getModel()->getMaxminSystem(), p_variable, bound);
+ if (variable_)
+ lmm_update_variable_bound(getModel()->getMaxminSystem(), variable_, bound);
- if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate()!=surf_get_clock())
+ if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate() != surf_get_clock())
heapRemove(getModel()->getActionHeap());
XBT_OUT();
}
double Action::getStartTime()
{
- return m_start;
+ return start_;
}
double Action::getFinishTime()
{
/* keep the function behavior, some models (cpu_ti) change the finish time before the action end */
- return m_remains == 0 ? m_finish : -1;
+ return remains_ <= 0 ? finishTime_ : -1;
}
void Action::setData(void* data)
{
- p_data = data;
+ data_ = data;
}
void Action::setCategory(const char *category)
{
- XBT_IN("(%p,%s)", this, category);
- p_category = xbt_strdup(category);
- XBT_OUT();
+ category_ = xbt_strdup(category);
}
void Action::ref(){
- m_refcount++;
+ refcount_++;
}
void Action::setMaxDuration(double duration)
{
- XBT_IN("(%p,%g)", this, duration);
- m_maxDuration = duration;
+ maxDuration_ = duration;
if (getModel()->getUpdateMechanism() == UM_LAZY) // remove action from the heap
heapRemove(getModel()->getActionHeap());
- XBT_OUT();
}
-void Action::gapRemove() {}
-
-void Action::setPriority(double priority)
+void Action::setSharingWeight(double weight)
{
- XBT_IN("(%p,%g)", this, priority);
- m_priority = priority;
- lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority);
+ XBT_IN("(%p,%g)", this, weight);
+ sharingWeight_ = weight;
+ lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), weight);
if (getModel()->getUpdateMechanism() == UM_LAZY)
- heapRemove(getModel()->getActionHeap());
+ heapRemove(getModel()->getActionHeap());
XBT_OUT();
}
void Action::cancel(){
- setState(SURF_ACTION_FAILED);
+ setState(Action::State::failed);
if (getModel()->getUpdateMechanism() == UM_LAZY) {
if (action_lmm_hook.is_linked())
getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this));
}
int Action::unref(){
- m_refcount--;
- if (!m_refcount) {
+ refcount_--;
+ if (not refcount_) {
if (action_hook.is_linked())
- p_stateSet->erase(p_stateSet->iterator_to(*this));
+ stateSet_->erase(stateSet_->iterator_to(*this));
if (getVariable())
lmm_variable_free(getModel()->getMaxminSystem(), getVariable());
if (getModel()->getUpdateMechanism() == UM_LAZY) {
void Action::suspend()
{
XBT_IN("(%p)", this);
- if (m_suspended != 2) {
+ if (suspended_ != 2) {
lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0);
- m_suspended = 1;
- if (getModel()->getUpdateMechanism() == UM_LAZY)
+ if (getModel()->getUpdateMechanism() == UM_LAZY){
heapRemove(getModel()->getActionHeap());
+ if (getModel()->getUpdateMechanism() == UM_LAZY && stateSet_ == getModel()->getRunningActionSet() &&
+ sharingWeight_ > 0) {
+ //If we have a lazy model, we need to update the remaining value accordingly
+ updateRemainingLazy(surf_get_clock());
+ }
+ }
+ suspended_ = 1;
}
XBT_OUT();
}
void Action::resume()
{
XBT_IN("(%p)", this);
- if (m_suspended != 2) {
- lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), m_priority);
- m_suspended = 0;
+ if (suspended_ != 2) {
+ lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), sharingWeight_);
+ suspended_ = 0;
if (getModel()->getUpdateMechanism() == UM_LAZY)
heapRemove(getModel()->getActionHeap());
}
bool Action::isSuspended()
{
- return m_suspended == 1;
+ return suspended_ == 1;
}
/* insert action on heap using a given key and a hat (heap_action_type)
* a hat can be of three types for communications:
*/
void Action::heapInsert(xbt_heap_t heap, double key, enum heap_action_type hat)
{
- m_hat = hat;
+ hat_ = hat;
xbt_heap_push(heap, this, key);
}
void Action::heapRemove(xbt_heap_t heap)
{
- m_hat = NOTSET;
- if (m_indexHeap >= 0) {
- xbt_heap_remove(heap, m_indexHeap);
+ hat_ = NOTSET;
+ if (indexHeap_ >= 0) {
+ xbt_heap_remove(heap, indexHeap_);
}
}
void Action::heapUpdate(xbt_heap_t heap, double key, enum heap_action_type hat)
{
- m_hat = hat;
- if (m_indexHeap >= 0) {
- xbt_heap_update(heap, m_indexHeap, key);
+ hat_ = hat;
+ if (indexHeap_ >= 0) {
+ xbt_heap_update(heap, indexHeap_, key);
}else{
xbt_heap_push(heap, this, key);
}
}
-/* added to manage the communication action's heap */
-void surf_action_lmm_update_index_heap(void *action, int i) {
- static_cast<Action*>(action)->updateIndexHeap(i);
-}
-
void Action::updateIndexHeap(int i) {
- m_indexHeap = i;
+ indexHeap_ = i;
}
double Action::getRemains()
if (getModel()->getUpdateMechanism() == UM_LAZY) /* update remains before return it */
updateRemainingLazy(surf_get_clock());
XBT_OUT();
- return m_remains;
+ return remains_;
}
double Action::getRemainsNoUpdate()
{
- return m_remains;
+ return remains_;
}
-//FIXME split code in the right places
-void Action::updateRemainingLazy(double now)
-{
- double delta = 0.0;
-
- if(getModel() == surf_network_model)
- {
- if (m_suspended != 0)
- return;
- }
- else
- {
- xbt_assert(p_stateSet == getModel()->getRunningActionSet(),
- "You're updating an action that is not running.");
-
- /* bogus priority, skip it */
- xbt_assert(m_priority > 0,
- "You're updating an action that seems suspended.");
- }
-
- delta = now - m_lastUpdate;
-
- if (m_remains > 0) {
- XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, m_remains, m_lastUpdate);
- double_update(&m_remains, m_lastValue * delta, sg_surf_precision*sg_maxmin_precision);
-
- if (getModel() == surf_cpu_model_pm && TRACE_is_enabled()) {
- Resource *cpu = static_cast<Resource*>(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0)));
- TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), m_lastValue, m_lastUpdate, now - m_lastUpdate);
- }
- XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains);
- }
-
- if(getModel() == surf_network_model)
- {
- if (m_maxDuration != NO_MAX_DURATION)
- double_update(&m_maxDuration, delta, sg_surf_precision);
-
- //FIXME: duplicated code
- if ((m_remains <= 0) &&
- (lmm_get_variable_weight(getVariable()) > 0)) {
- finish();
- setState(SURF_ACTION_DONE);
- heapRemove(getModel()->getActionHeap());
- } else if (((m_maxDuration != NO_MAX_DURATION)
- && (m_maxDuration <= 0))) {
- finish();
- setState(SURF_ACTION_DONE);
- heapRemove(getModel()->getActionHeap());
- }
- }
-
- m_lastUpdate = now;
- m_lastValue = lmm_variable_getvalue(getVariable());
+}
}
