-/* 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 {
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::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");
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");
if (!future_evt_set)
future_evt_set = new simgrid::trace_mgr::future_evt_set();
- TRACE_add_start_function(TRACE_surf_alloc);
- TRACE_add_end_function(TRACE_surf_release);
+ TRACE_surf_alloc();
+ simgrid::surf::surfExitCallbacks.connect(TRACE_surf_release);
sg_config_init(argc, argv);
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);
+ free(stype->content_type);
+ xbt_dict_free(&(stype->properties));
+ delete stype->model_properties;
+ free(stype);
+ }
for (auto model : *all_existing_models)
delete model;