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
rename host callbacks
[simgrid.git]
/
src
/
surf
/
instr_surf.c
diff --git
a/src/surf/instr_surf.c
b/src/surf/instr_surf.c
index
e9570dd
..
b0003d6
100644
(file)
--- a/
src/surf/instr_surf.c
+++ b/
src/surf/instr_surf.c
@@
-1,14
+1,11
@@
-/* Copyright (c) 2010, 2012. The SimGrid Team.
+/* Copyright (c) 2010, 2012
-2015
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
-#include "instr/instr_private.h"
-#include "surf/surf_private.h"
-#include "surf/network_gtnets_private.h"
-
-#ifdef HAVE_TRACING
+#include "src/instr/instr_private.h"
+#include "src/surf/surf_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
@@
-22,12
+19,12
@@
void TRACE_surf_release(void)
TRACE_surf_resource_utilization_release();
}
TRACE_surf_resource_utilization_release();
}
-void TRACE_surf_host_set_
power(double date, const char *resource, double power
)
+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);
type_t type = PJ_type_get ("power", container->type);
{
if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) {
container_t container = PJ_container_get(resource);
type_t type = PJ_type_get ("power", container->type);
- new_pajeSetVariable(date, container, type,
power
);
+ new_pajeSetVariable(date, container, type,
speed
);
}
}
}
}
@@
-40,14
+37,6
@@
void TRACE_surf_link_set_bandwidth(double date, const char *resource, double ban
}
}
}
}
-/* to trace gtnets */
-void TRACE_surf_gtnets_communicate(void *action, void *src, void *dst)
-{
- surf_action_network_GTNETS_t gtnets_action = (surf_action_network_GTNETS_t)action;
- gtnets_action->src = src;
- gtnets_action->dst = dst;
-}
-
void TRACE_surf_action(surf_action_t surf_action, const char *category)
{
if (!TRACE_is_enabled())
void TRACE_surf_action(surf_action_t surf_action, const char *category)
{
if (!TRACE_is_enabled())
@@
-57,6
+46,5
@@
void TRACE_surf_action(surf_action_t surf_action, const char *category)
if (!category)
return;
if (!category)
return;
- surf_action
->category = xbt_strdup(
category);
+ surf_action
_set_category(surf_action,
category);
}
}
-#endif /* HAVE_TRACING */