X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ebc870e81225d8790e5a829134a4d63f4b494d3f..3bb80150f0e018a1ca0ce65e93fedee79c0ea111:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index c9c10d89fa..8a671c14fa 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,11 +9,11 @@ #include "network_interface.hpp" #include "cpu_interface.hpp" #include "host_interface.hpp" -#include "simix/smx_host_private.h" +#include "src/simix/smx_host_private.h" #include "surf_routing.hpp" #include "simgrid/sg_config.h" #include "mc/mc.h" -#include "vm_interface.hpp" +#include "virtual_machine.hpp" XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, @@ -23,67 +23,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, * Utils * *********/ -/* This function is a pimple that we ought to fix. But it won't be easy. - * - * The surf_solve() function does properly return the set of actions that - * changed. Instead, each model change a global data, and then the caller of - * surf_solve must pick into these sets of action_failed and action_done. - * - * This was not clean but ok as long as we didn't had to restart the processes - * when the resource comes back up. - * We worked by putting sentinel actions on every resources we are interested - * in, so that surf informs us if/when the corresponding resource fails. - * - * But this does not work to get Simix informed of when a resource comes back - * up, and this is where this pimple comes. We have a set of resources that are - * currently down and for which simix needs to know when it comes back up. - * And the current function is called *at every simulation step* to sweep over - * that set, searching for a resource that was turned back up in the meanwhile. - * This is UGLY and slow. - * - * The proper solution would be to not rely on globals for the action_failed and - * action_done swags. They must be passed as parameter by the caller (the - * handling of these actions in simix may let you think that these two sets can - * be merged, but their handling in SimDag induce the contrary unless this - * simdag code can check by itself whether the action is done of failed -- seems - * very doable, but yet more cleanup to do). - * - * Once surf_solve() is passed the set of actions that changed, you want to add - * a new set of resources back up as parameter to this function. You also want - * to add a boolean field "restart_watched" to each resource, and make sure that - * whenever a resource with this field enabled comes back up, it's added to that - * set so that Simix sees it and react accordingly. This would kill that need - * for surf to call simix. - * - */ - -/*static void remove_watched_host(void *key) -{ - xbt_dict_remove(watched_hosts_lib, *(char**)key); -}*/ - -/*void surf_watched_hosts(void) -{ - char *key; - void *host; - xbt_dict_cursor_t cursor; - xbt_dynar_t hosts = xbt_dynar_new(sizeof(char*), NULL); - - XBT_DEBUG("Check for host SURF_RESOURCE_ON on watched_hosts_lib"); - xbt_dict_foreach(watched_hosts_lib, cursor, key, host) - { - if(SIMIX_host_get_state((smx_host_t)host) == SURF_RESOURCE_ON){ - XBT_INFO("Restart processes on host: %s", SIMIX_host_get_name((smx_host_t)host)); - SIMIX_host_autorestart((smx_host_t)host); - xbt_dynar_push_as(hosts, char*, key); - } - else - XBT_DEBUG("See SURF_RESOURCE_OFF on host: %s",key); - } - xbt_dynar_map(hosts, remove_watched_host); - xbt_dynar_free(&hosts); -}*/ - /* 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. */ @@ -121,11 +60,6 @@ s_surf_model_description_t surf_network_model_description[] = { {"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_GTNETS - {"GTNets", - "Network pseudo-model using the GTNets simulator instead of an analytic model", - surf_network_model_init_GTNETS}, -#endif #ifdef HAVE_NS3 {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", @@ -194,9 +128,6 @@ static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ #endif double NOW = 0; -double *surf_mins = NULL; /* return value of share_resources for each model */ -int surf_min_index; /* current index in surf_mins */ -double surf_min; /* duration determined by surf_solve */ double surf_get_clock(void) { @@ -342,6 +273,23 @@ static XBT_INLINE void surf_storage_free(void *r) delete static_cast(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); + 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); + } +} void sg_version(int *ver_major,int *ver_minor,int *ver_patch) { *ver_major = SIMGRID_VERSION_MAJOR; @@ -427,9 +375,6 @@ void surf_exit(void) xbt_parmap_destroy(surf_parmap); #endif - xbt_free(surf_mins); - surf_mins = NULL; - tmgr_finalize(); surf_parse_lex_destroy(); surf_parse_free_callbacks(); @@ -441,9 +386,8 @@ void surf_exit(void) * Model * *********/ -Model::Model(const char *name) +Model::Model() : p_maxminSystem(NULL) - , p_name(name) { p_readyActionSet = new ActionList(); p_runningActionSet = new ActionList(); @@ -726,7 +670,6 @@ void Action::initialize(Model *model, double cost, bool failed, m_remains = cost; m_maxDuration = NO_MAX_DURATION; m_finish = -1.0; - m_failed = failed; m_start = surf_get_clock(); m_cost = cost; p_model = model; @@ -736,11 +679,6 @@ void Action::initialize(Model *model, double cost, bool failed, m_lastUpdate = 0; m_suspended = false; m_hat = NOTSET; -} - -Action::Action(Model *model, double cost, bool failed) -{ - initialize(model, cost, failed); p_category = NULL; p_stateHookup.prev = 0; p_stateHookup.next = 0; @@ -752,18 +690,14 @@ Action::Action(Model *model, double cost, bool failed) 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); - 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() { @@ -876,7 +810,7 @@ void Action::setPriority(double priority) void Action::cancel(){ setState(SURF_ACTION_FAILED); if (getModel()->getUpdateMechanism() == UM_LAZY) { - if (actionLmmHook::is_linked()) + if (action_lmm_hook.is_linked()) getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this)); heapRemove(getModel()->getActionHeap()); } @@ -885,14 +819,14 @@ void Action::cancel(){ int Action::unref(){ m_refcount--; if (!m_refcount) { - if (actionHook::is_linked()) + if (action_hook.is_linked()) p_stateSet->erase(p_stateSet->iterator_to(*this)); if (getVariable()) lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); if (getModel()->getUpdateMechanism() == UM_LAZY) { /* remove from heap */ heapRemove(getModel()->getActionHeap()); - if (actionLmmHook::is_linked()) + if (action_lmm_hook.is_linked()) getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this)); } delete this;