#include "xbt/str.h"
#include "xbt/config.h"
#include "surf/surfxml_parse.h"
-#ifdef HAVE_LUA
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
-#endif
#ifdef HAVE_JEDULE
-#include "instr/jedule/jedule_sd_binding.h"
+#include "simgrid/jedule/jedule_sd_binding.h"
#endif
XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
xbt_assert(sd_global == NULL, "SD_init() already called");
sd_global = xbt_new(s_SD_global_t, 1);
- sd_global->workstation_list = NULL;
- sd_global->link_list = NULL;
- sd_global->recyclable_route = NULL;
sd_global->watch_point_reached = 0;
sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f,
jedule_sd_init();
#endif
- XBT_DEBUG("ADD SD LEVELS");
- SD_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,__SD_storage_destroy);
-
if (_sg_cfg_exit_asap) {
SD_exit();
exit(0);
xbt_cfg_set_as_string(_sg_cfg_set, key, value);
}
-
/**
* \brief Reinits the application part of the simulation (experimental feature)
*
#ifdef HAVE_JEDULE
- jedule_sd_dump();
jedule_sd_cleanup();
jedule_sd_init();
#endif
/**
* \brief Creates the environment
*
- * The environment (i.e. the \ref SD_workstation_management "workstations"
+ * The environment (i.e. the \ref sg_host_management "hosts"
* and the \ref SD_link_management "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 SD_workstation_management, SD_link_management
+ * \see sg_host_management, SD_link_management
*
* The XML file follows this DTD:
*
*/
void SD_create_environment(const char *platform_file)
{
- xbt_lib_cursor_t cursor = NULL;
- char *name = NULL;
- void **surf_storage = NULL;
-
parse_platform_file(platform_file);
- /* now let's create the SD wrappers for workstations, storages and links */
- {
- xbt_dict_cursor_t cursor = NULL;
- simgrid_Host* host = NULL;
- xbt_dict_foreach(host_list, cursor, name, host){
- __SD_workstation_create((const char*)name);
- }
- }
-
- xbt_lib_foreach(storage_lib, cursor, name, surf_storage) {
- if(surf_storage[SURF_STORAGE_LEVEL])
- __SD_storage_create(surf_storage[SURF_STORAGE_LEVEL], NULL);
- }
-
-
- XBT_DEBUG("Workstation number: %d, link number: %d",
- SD_workstation_get_count(), sg_link_count());
+ XBT_DEBUG("Workstation number: %zu, link number: %d",
+ sg_host_count(), sg_link_count());
#ifdef HAVE_JEDULE
jedule_setup_platform();
#endif
xbt_mallocator_free(sd_global->task_mallocator);
- XBT_DEBUG("Destroying workstation and link arrays...");
- xbt_free(sd_global->workstation_list);
- xbt_free(sd_global->link_list);
- xbt_free(sd_global->recyclable_route);
-
XBT_DEBUG("Destroying the dynars ...");
xbt_dynar_free_container(&(sd_global->initial_task_set));
xbt_dynar_free_container(&(sd_global->executable_task_set));
sd_global = NULL;
#ifdef HAVE_JEDULE
- jedule_sd_dump();
jedule_sd_cleanup();
jedule_sd_exit();
#endif