-/* 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_interface.hpp"
-#include "cpu_interface.hpp"
#include "mc/mc.h"
-#include "network_interface.hpp"
-#include "simgrid/s4u/engine.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/internal_config.h"
#include "src/kernel/routing/NetPoint.hpp"
-#include "src/simix/smx_host_private.h"
#include "src/surf/HostImpl.hpp"
-#include "surf_private.h"
+
#include <fstream>
#include <vector>
std::vector<std::string> surf_path;
std::vector<simgrid::s4u::Host*> host_that_restart;
xbt_dict_t watched_hosts_lib;
+extern std::map<std::string, storage_type_t> storage_types;
namespace simgrid {
namespace surf {
-simgrid::xbt::signal<void(void)> surfExitCallbacks;
-
+simgrid::xbt::signal<void()> surfExitCallbacks;
}
}
xbt_die("Please activate SMPI support in cmake to use the IB network model.");
}
#endif
-#if !HAVE_NS3
+#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.");
}
std::string buff = path_elm + FILE_DELIM + name;
fs->open(buff.c_str(), std::ifstream::in);
- if (!fs->fail()) {
+ if (not fs->fail()) {
XBT_DEBUG("Found file at %s", buff.c_str());
return fs;
}
}
FILE *surf_fopen(const char *name, const char *mode)
{
- char *buff;
FILE *file = nullptr;
xbt_assert(name);
/* search relative files in the path */
for (auto path_elm : surf_path) {
- buff = bprintf("%s" FILE_DELIM "%s", path_elm.c_str(), name);
+ char* buff = bprintf("%s" FILE_DELIM "%s", path_elm.c_str(), name);
file = fopen(buff, mode);
free(buff);
unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory);
char root[4] = { 0 };
- if (!len)
+ if (not len)
return nullptr;
strncpy(root, current_directory, 3);
char *name_list = nullptr;
for (i = 0; table[i].name; i++)
- if (!strcmp(name, table[i].name)) {
+ 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++) {
return -1;
}
-static inline void surf_storage_free(void *r)
+void sg_version_check(int lib_version_major, int lib_version_minor, int lib_version_patch)
{
- delete static_cast<simgrid::surf::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,
+ 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. Please fix this.\n",
- lib_version_major,lib_version_minor,lib_version_patch,
- SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH);
+ "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) {
- 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();
- }
- 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);
- }
+ 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_get(int* ver_major, int* ver_minor, int* ver_patch)
std::printf("This program was linked against %s (git: %s), found in %s.\n",
SIMGRID_VERSION_STRING, SIMGRID_GIT_VERSION, SIMGRID_INSTALL_PREFIX);
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
std::printf(" Model-checking support compiled in.\n");
#else
std::printf(" Model-checking support disabled at compilation.\n");
#endif
-#if HAVE_NS3
+#if SIMGRID_HAVE_NS3
std::printf(" NS3 support compiled in.\n");
#else
std::printf(" NS3 support disabled at compilation.\n");
#endif
-#if HAVE_JEDULE
+#if SIMGRID_HAVE_JEDULE
std::printf(" Jedule support compiled in.\n");
#else
std::printf(" Jedule support disabled at compilation.\n");
#endif
-#if HAVE_LUA
+#if SIMGRID_HAVE_LUA
std::printf(" Lua support compiled in.\n");
#else
std::printf(" Lua support disabled at compilation.\n");
#endif
-#if HAVE_MALLOCATOR
+#if SIMGRID_HAVE_MALLOCATOR
std::printf(" Mallocator support compiled in.\n");
#else
std::printf(" Mallocator support disabled at compilation.\n");
XBT_DEBUG("Create all Libs");
USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
- storage_lib = xbt_lib_new();
- storage_type_lib = xbt_lib_new();
- file_lib = xbt_lib_new();
watched_hosts_lib = xbt_dict_new_homogeneous(nullptr);
- XBT_DEBUG("Add SURF levels");
- SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free);
-
xbt_init(argc, argv);
- if (!all_existing_models)
+ if (not all_existing_models)
all_existing_models = new std::vector<simgrid::surf::Model*>();
- if (!future_evt_set)
+ if (not future_evt_set)
future_evt_set = new simgrid::trace_mgr::future_evt_set();
TRACE_surf_alloc();
TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */
sg_host_exit();
- xbt_lib_free(&storage_lib);
sg_link_exit();
- xbt_lib_free(&storage_type_lib);
- xbt_lib_free(&file_lib);
xbt_dict_free(&watched_hosts_lib);
+ for (auto e : storage_types) {
+ storage_type_t stype = e.second;
+ free(stype->model);
+ free(stype->type_id);
+ free(stype->content);
+ xbt_dict_free(&(stype->properties));
+ delete stype->model_properties;
+ free(stype);
+ }
+ delete simgrid::surf::StorageImpl::storages;
for (auto model : *all_existing_models)
delete model;
lmm_solve(maxminSystem_);
XBT_DEBUG("After share resources, The size of modified actions set is %zd", modifiedSet_->size());
- while(!modifiedSet_->empty()) {
+ while (not modifiedSet_->empty()) {
Action *action = &(modifiedSet_->front());
modifiedSet_->pop_front();
bool max_dur_flag = false;
}
if ((action->getMaxDuration() > NO_MAX_DURATION) &&
- (min == -1 || action->getStartTime() + action->getMaxDuration() < min)) {
+ (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) {
+ 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
return isOn_;
}
bool Resource::isOff() const {
- return ! isOn_;
+ return not isOn_;
}
void Resource::turnOn()
int Action::unref(){
refcount_--;
- if (!refcount_) {
+ if (not refcount_) {
if (action_hook.is_linked())
stateSet_->erase(stateSet_->iterator_to(*this));
if (getVariable())