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 sg_platf_new_AS_{open,close} to {begin,end} since you cannot reopen them to...
[simgrid.git]
/
src
/
surf
/
cpu_im.c
diff --git
a/src/surf/cpu_im.c
b/src/surf/cpu_im.c
index
d1c841e
..
0c29222
100644
(file)
--- a/
src/surf/cpu_im.c
+++ b/
src/surf/cpu_im.c
@@
-1,10
+1,12
@@
-/* Copyright (c) 2009
, 2010
. The SimGrid Team.
+/* Copyright (c) 2009
-2011
. 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_private.h"
* 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_private.h"
+#include "surf/surf_resource.h"
+
#undef GENERIC_LMM_ACTION
#undef GENERIC_ACTION
#undef GENERIC_LMM_ACTION
#undef GENERIC_ACTION
@@
-90,13
+92,13
@@
static void* cpu_im_create_resource(const char *name, double power_peak,
static void parse_cpu_im_init(sg_platf_host_cbarg_t host)
{
static void parse_cpu_im_init(sg_platf_host_cbarg_t host)
{
- cpu_im_create_resource(host->
V_host_
id,
- host->
V_host_
power_peak,
- host->
V_host_
power_scale,
- host->
V_host_
power_trace,
- host->
V_host_core
,
- host->
V_host_state_initial
,
- host->
V_host_
state_trace,
+ cpu_im_create_resource(host->id,
+ host->power_peak,
+ host->power_scale,
+ host->power_trace,
+ host->
core_amount
,
+ host->
initial_state
,
+ host->state_trace,
host->properties);
}
host->properties);
}
@@
-160,8
+162,7
@@
static int cpu_im_action_unref(surf_action_t action)
((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set);
xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
#ifdef HAVE_TRACING
((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set);
xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
#ifdef HAVE_TRACING
- if (action->category)
- xbt_free(action->category);
+ xbt_free(action->category);
#endif
surf_action_free(&action);
return 1;
#endif
surf_action_free(&action);
return 1;