* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_interface.hpp"
-#include "VirtualMachineImpl.hpp"
#include "cpu_interface.hpp"
#include "mc/mc.h"
#include "network_interface.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/NetCard.hpp"
#include "src/simix/smx_host_private.h"
#include "src/surf/HostImpl.hpp"
#include "surf_private.h"
-#include "surf_routing.hpp"
#include <vector>
XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
delete model;
delete all_existing_models;
xbt_dynar_free(&model_list_invoke);
- routing_exit();
simgrid::surf::surfExitCallbacks();
void Action::setCategory(const char *category)
{
- XBT_IN("(%p,%s)", this, category);
category_ = xbt_strdup(category);
- XBT_OUT();
}
void Action::ref(){
void Action::setMaxDuration(double duration)
{
- XBT_IN("(%p,%g)", this, duration);
maxDuration_ = duration;
if (getModel()->getUpdateMechanism() == UM_LAZY) // remove action from the heap
heapRemove(getModel()->getActionHeap());
- XBT_OUT();
}
void Action::gapRemove() {}
XBT_IN("(%p)", this);
if (suspended_ != 2) {
lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0);
- suspended_ = 1;
- if (getModel()->getUpdateMechanism() == UM_LAZY)
+ if (getModel()->getUpdateMechanism() == UM_LAZY){
heapRemove(getModel()->getActionHeap());
+ if (getModel()->getUpdateMechanism() == UM_LAZY && stateSet_ == getModel()->getRunningActionSet() && priority_ > 0){
+ //If we have a lazy model, we need to update the remaining value accordingly
+ updateRemainingLazy(surf_get_clock());
+ }
+ }
+ suspended_ = 1;
}
XBT_OUT();
}