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
[From Arnaud Giersch] Fix memory leak when MSG_create_environment() or
[simgrid.git]
/
src
/
surf
/
cpu.c
diff --git
a/src/surf/cpu.c
b/src/surf/cpu.c
index
ce88542
..
07761ee
100644
(file)
--- a/
src/surf/cpu.c
+++ b/
src/surf/cpu.c
@@
-1,6
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */
/* 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. */
@@
-63,7
+62,7
@@
static cpu_Cas01_t cpu_new(char *name, double power_peak,
xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
surf_resource_free);
#ifdef HAVE_TRACING
xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
surf_resource_free);
#ifdef HAVE_TRACING
- TRACE_surf_
cpu_new
(name, cpu->power_scale * cpu->power_peak);
+ TRACE_surf_
host_declaration
(name, cpu->power_scale * cpu->power_peak);
#endif
return cpu;
#endif
return cpu;
@@
-194,11
+193,9
@@
static void cpu_update_actions_state(double now, double delta)
xbt_swag_foreach_safe(action, next_action, running_actions) {
#ifdef HAVE_TRACING
xbt_swag_foreach_safe(action, next_action, running_actions) {
#ifdef HAVE_TRACING
- TRACE_surf_update_action_state (action, action->generic_action.data,
- lmm_variable_getvalue(action->variable), "PowerUsed", now-delta, delta);
cpu_Cas01_t x = lmm_constraint_id(lmm_get_cnst_from_var (cpu_maxmin_system, action->variable, 0));
cpu_Cas01_t x = lmm_constraint_id(lmm_get_cnst_from_var (cpu_maxmin_system, action->variable, 0));
- TRACE_surf_
update_action_state_cpu_resource
(x->generic_resource.name,
+ TRACE_surf_
host_set_utilization
(x->generic_resource.name,
action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta);
#endif
double_update(&(action->generic_action.remains),
action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta);
#endif
double_update(&(action->generic_action.remains),
@@
-230,7
+227,7
@@
static void cpu_update_resource_state(void *id,
lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint,
cpu->power_scale * cpu->power_peak);
#ifdef HAVE_TRACING
lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint,
cpu->power_scale * cpu->power_peak);
#ifdef HAVE_TRACING
- TRACE_surf_
cpu
_set_power (date, cpu->generic_resource.name, cpu->power_scale * cpu->power_peak);
+ TRACE_surf_
host
_set_power (date, cpu->generic_resource.name, cpu->power_scale * cpu->power_peak);
#endif
if (tmgr_trace_event_free(event_type))
cpu->power_event = NULL;
#endif
if (tmgr_trace_event_free(event_type))
cpu->power_event = NULL;