A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do not load internal_config.h from mc.h
[simgrid.git]
/
src
/
surf
/
instr_routing.cpp
diff --git
a/src/surf/instr_routing.cpp
b/src/surf/instr_routing.cpp
index
8ec4394
..
6c4a484
100644
(file)
--- a/
src/surf/instr_routing.cpp
+++ b/
src/surf/instr_routing.cpp
@@
-1,13
+1,12
@@
-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-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 "src/instr/instr_private.h"
/* 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 "src/instr/instr_private.h"
-#include "simgrid/s4u/
e
ngine.hpp"
-#include "simgrid/s4u/
h
ost.hpp"
+#include "simgrid/s4u/
E
ngine.hpp"
+#include "simgrid/s4u/
H
ost.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
@@
-245,7
+244,7
@@
void sg_instr_new_host(simgrid::s4u::Host& host)
speed = PJ_type_variable_new ("power", nullptr, container->type);
}
speed = PJ_type_variable_new ("power", nullptr, container->type);
}
- double current_speed_state = host.
getPstateSpeedCurrent
();
+ double current_speed_state = host.
speed
();
new_pajeSetVariable (0, container, speed, current_speed_state);
}
if (TRACE_uncategorized()){
new_pajeSetVariable (0, container, speed, current_speed_state);
}
if (TRACE_uncategorized()){