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
Adding the prototype for the callback on startup mechanism.
[simgrid.git]
/
src
/
surf
/
cpu.c
diff --git
a/src/surf/cpu.c
b/src/surf/cpu.c
index
9a85946
..
dcb1507
100644
(file)
--- a/
src/surf/cpu.c
+++ b/
src/surf/cpu.c
@@
-318,6
+318,16
@@
static void action_set_priority(surf_action_t action, double priority)
XBT_OUT;
}
XBT_OUT;
}
+
+static void (*set_callback) (void *resource, void value, void *function, void *arg)
+{
+}
+
+static int (*get_callback) (void **resource, void *value, void **function, void **arg)
+{
+ return 0;
+}
+
static e_surf_cpu_state_t get_state(void *cpu)
{
return ((cpu_Cas01_t) cpu)->state_current;
static e_surf_cpu_state_t get_state(void *cpu)
{
return ((cpu_Cas01_t) cpu)->state_current;
@@
-404,18
+414,18
@@
static void surf_cpu_model_init_internal(void)
surf_cpu_model->common_public->set_max_duration =
action_set_max_duration;
surf_cpu_model->common_public->set_priority = action_set_priority;
surf_cpu_model->common_public->set_max_duration =
action_set_max_duration;
surf_cpu_model->common_public->set_priority = action_set_priority;
+ surf_cpu_model->common_public->set_callback = set_callback;
+ surf_cpu_model->common_public->get_callback = get_callback;
+
surf_cpu_model->extension_public->execute = execute;
surf_cpu_model->extension_public->sleep = action_sleep;
surf_cpu_model->extension_public->execute = execute;
surf_cpu_model->extension_public->sleep = action_sleep;
-
surf_cpu_model->extension_public->get_state = get_state;
surf_cpu_model->extension_public->get_speed = get_speed;
surf_cpu_model->extension_public->get_available_speed =
get_available_speed;
surf_cpu_model->extension_public->get_state = get_state;
surf_cpu_model->extension_public->get_speed = get_speed;
surf_cpu_model->extension_public->get_available_speed =
get_available_speed;
- cpu_set = xbt_dict_new();
-
- if (!cpu_maxmin_system)
- cpu_maxmin_system = lmm_system_new();
+ if(!cpu_set) cpu_set = xbt_dict_new();
+ if (!cpu_maxmin_system) cpu_maxmin_system = lmm_system_new();
}
/*********************************************************************/
}
/*********************************************************************/