-/* 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>
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");
}
if ((action->getMaxDuration() > NO_MAX_DURATION) &&
- (min == -1 || action->getStartTime() + action->getMaxDuration() < min)) {
+ (min <= -1 || action->getStartTime() + action->getMaxDuration() < min)) {
// when the task will complete anyway because of the deadline if any
min = action->getStartTime() + action->getMaxDuration();
max_dur_flag = true;
}
-
XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->getVariable()->id_int);
XBT_DEBUG("Action(%p) Start %f. May finish at %f (got a share of %f). Max_duration %f", action,
action->getStartTime(), min, share,
action->getMaxDuration());
- if (min != -1) {
+ if (min > -1) {
action->heapUpdate(actionHeap_, min, max_dur_flag ? MAX_DURATION : NORMAL);
XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min, now);
} else