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 use f2c with 64 bits platforms which use old gcc (<4.5)
[simgrid.git]
/
src
/
surf
/
cpu_cas01.c
diff --git
a/src/surf/cpu_cas01.c
b/src/surf/cpu_cas01.c
index
b427a5c
..
79bbc86
100644
(file)
--- a/
src/surf/cpu_cas01.c
+++ b/
src/surf/cpu_cas01.c
@@
-7,6
+7,7
@@
#include "surf_private.h"
#include "surf/surf_resource.h"
#include "maxmin_private.h"
#include "surf_private.h"
#include "surf/surf_resource.h"
#include "maxmin_private.h"
+#include "simgrid/sg_config.h"
surf_model_t surf_cpu_model = NULL;
surf_model_t surf_cpu_model = NULL;
@@
-42,6
+43,7
@@
static xbt_swag_t
cpu_running_action_set_that_does_not_need_being_checked = NULL;
cpu_running_action_set_that_does_not_need_being_checked = NULL;
+/* This function is registered as a callback to sg_platf_new_host() and never called directly */
static void *cpu_create_resource(const char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
static void *cpu_create_resource(const char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
@@
-325,9
+327,9
@@
static void surf_cpu_model_init_internal()
s_surf_action_t action;
s_surf_action_cpu_Cas01_t comp;
s_surf_action_t action;
s_surf_action_cpu_Cas01_t comp;
- char *optim = xbt_cfg_get_string(_s
urf
_cfg_set, "cpu/optim");
+ char *optim = xbt_cfg_get_string(_s
g
_cfg_set, "cpu/optim");
int select =
int select =
- xbt_cfg_get_int(_s
urf
_cfg_set, "cpu/maxmin_selective_update");
+ xbt_cfg_get_int(_s
g
_cfg_set, "cpu/maxmin_selective_update");
surf_cpu_model = surf_model_init();
surf_cpu_model = surf_model_init();
@@
-340,7
+342,7
@@
static void surf_cpu_model_init_internal()
xbt_assert((select == 1)
||
(xbt_cfg_is_default_value
xbt_assert((select == 1)
||
(xbt_cfg_is_default_value
- (_s
urf
_cfg_set, "cpu/maxmin_selective_update")),
+ (_s
g
_cfg_set, "cpu/maxmin_selective_update")),
"Disabling selective update while using the lazy update mechanism is dumb!");
} else {
xbt_die("Unsupported optimization (%s) for this model", optim);
"Disabling selective update while using the lazy update mechanism is dumb!");
} else {
xbt_die("Unsupported optimization (%s) for this model", optim);
@@
-391,7
+393,6
@@
static void surf_cpu_model_init_internal()
surf_cpu_model->extension.cpu.get_speed = cpu_get_speed;
surf_cpu_model->extension.cpu.get_available_speed =
cpu_get_available_speed;
surf_cpu_model->extension.cpu.get_speed = cpu_get_speed;
surf_cpu_model->extension.cpu.get_available_speed =
cpu_get_available_speed;
- surf_cpu_model->extension.cpu.create_resource = cpu_create_resource;
surf_cpu_model->extension.cpu.add_traces = cpu_add_traces_cpu;
if (!surf_cpu_model->model_private->maxmin_system) {
surf_cpu_model->extension.cpu.add_traces = cpu_add_traces_cpu;
if (!surf_cpu_model->model_private->maxmin_system) {
@@
-425,7
+426,7
@@
static void surf_cpu_model_init_internal()
void surf_cpu_model_init_Cas01()
{
void surf_cpu_model_init_Cas01()
{
- char *optim = xbt_cfg_get_string(_s
urf
_cfg_set, "cpu/optim");
+ char *optim = xbt_cfg_get_string(_s
g
_cfg_set, "cpu/optim");
if (surf_cpu_model)
return;
if (surf_cpu_model)
return;