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
Fix build on Centos7 (again).
[simgrid.git]
/
src
/
surf
/
instr_surf.cpp
diff --git
a/src/surf/instr_surf.cpp
b/src/surf/instr_surf.cpp
index
83f7e1e
..
2746a66
100644
(file)
--- a/
src/surf/instr_surf.cpp
+++ b/
src/surf/instr_surf.cpp
@@
-1,10
+1,10
@@
-/* Copyright (c) 2010, 2012-201
5
. The SimGrid Team.
+/* Copyright (c) 2010, 2012-201
7
. 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. */
* 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"
+#include "src/instr/instr_private.h
pp
"
#include "src/surf/surf_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
#include "src/surf/surf_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
@@
-12,28
+12,20
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
void TRACE_surf_host_set_speed(double date, const char *resource, double speed)
{
if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
void TRACE_surf_host_set_speed(double date, const char *resource, double speed)
{
if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
- container_t container = PJ_container_get(resource);
- simgrid::instr::Type* type = container->type_->getChild("power");
- new simgrid::instr::SetVariableEvent(date, container, type, speed);
+ simgrid::instr::Container::byName(resource)->getVariable("power")->setEvent(date, speed);
}
}
void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth)
{
if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
}
}
void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth)
{
if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
- container_t container = PJ_container_get(resource);
- simgrid::instr::Type* type = container->type_->getChild("bandwidth");
- new simgrid::instr::SetVariableEvent(date, container, type, bandwidth);
+ simgrid::instr::Container::byName(resource)->getVariable("bandwidth")->setEvent(date, bandwidth);
}
}
void TRACE_surf_action(surf_action_t surf_action, const char *category)
{
}
}
void TRACE_surf_action(surf_action_t surf_action, const char *category)
{
- if (not TRACE_is_enabled())
- return;
- if (not TRACE_categorized())
- return;
- if (not category)
+ if (not TRACE_is_enabled() || not TRACE_categorized() || not category)
return;
surf_action->setCategory(category);
return;
surf_action->setCategory(category);