-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2018. 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. */
{
TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */
+ simgrid::s4u::Engine::shutdown();
sg_link_exit();
for (auto const& e : storage_types) {
simgrid::surf::StorageType* stype = e.second;
tmgr_finalize();
sg_platf_exit();
- simgrid::s4u::Engine::shutdown();
NOW = 0; /* Just in case the user plans to restart the simulation afterward */
}
* Action *
**********/
-const char *surf_action_state_names[6] = {
- "SURF_ACTION_READY",
- "SURF_ACTION_RUNNING",
- "SURF_ACTION_FAILED",
- "SURF_ACTION_DONE",
- "SURF_ACTION_TO_FREE",
- "SURF_ACTION_NOT_IN_THE_SYSTEM"
-};
-
namespace simgrid {
namespace surf {
void Action::suspend()
{
XBT_IN("(%p)", this);
- if (suspended_ != 2) {
+ if (suspended_ != SuspendStates::sleeping) {
getModel()->getMaxminSystem()->update_variable_weight(getVariable(), 0.0);
if (getModel()->getUpdateMechanism() == UM_LAZY){
heapRemove(getModel()->getActionHeap());
updateRemainingLazy(surf_get_clock());
}
}
- suspended_ = 1;
+ suspended_ = SuspendStates::suspended;
}
XBT_OUT();
}
void Action::resume()
{
XBT_IN("(%p)", this);
- if (suspended_ != 2) {
+ if (suspended_ != SuspendStates::sleeping) {
getModel()->getMaxminSystem()->update_variable_weight(getVariable(), getPriority());
- suspended_ = 0;
+ suspended_ = SuspendStates::not_suspended;
if (getModel()->getUpdateMechanism() == UM_LAZY)
heapRemove(getModel()->getActionHeap());
}
bool Action::isSuspended()
{
- return suspended_ == 1;
+ return suspended_ == SuspendStates::suspended;
}
/* insert action on heap using a given key and a hat (heap_action_type)
* a hat can be of three types for communications: