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
remove useless dependency
[simgrid.git]
/
src
/
surf
/
surf_timer.c
diff --git
a/src/surf/surf_timer.c
b/src/surf/surf_timer.c
index
297bff6
..
3a7463b
100644
(file)
--- a/
src/surf/surf_timer.c
+++ b/
src/surf/surf_timer.c
@@
-59,13
+59,13
@@
static void *name_service(const char *name)
return NULL;
}
return NULL;
}
-static const char *get_
model_name(void *model
_id)
+static const char *get_
resource_name(void *resource
_id)
{
DIE_IMPOSSIBLE;
return "";
}
{
DIE_IMPOSSIBLE;
return "";
}
-static int
model_used(void *model
_id)
+static int
resource_used(void *resource
_id)
{
return 1;
}
{
return 1;
}
@@
-95,7
+95,7
@@
static void action_change_state(surf_action_t action,
return;
}
return;
}
-static double share_
model
s(double now)
+static double share_
resource
s(double now)
{
if (xbt_heap_size(timer_heap))
return (xbt_heap_maxkey(timer_heap));
{
if (xbt_heap_size(timer_heap))
return (xbt_heap_maxkey(timer_heap));
@@
-113,7
+113,7
@@
static void update_actions_state(double now, double delta)
return;
}
return;
}
-static void update_
model
_state(void *id,
+static void update_
resource
_state(void *id,
tmgr_trace_event_t event_type,
double value)
{
tmgr_trace_event_t event_type,
double value)
{
@@
-218,8
+218,8
@@
static void surf_timer_model_init_internal(void)
xbt_swag_new(xbt_swag_offset(action, state_hookup));
surf_timer_model->common_public->name_service = name_service;
xbt_swag_new(xbt_swag_offset(action, state_hookup));
surf_timer_model->common_public->name_service = name_service;
- surf_timer_model->common_public->get_
model
_name =
- get_
model
_name;
+ surf_timer_model->common_public->get_
resource
_name =
+ get_
resource
_name;
surf_timer_model->common_public->action_get_state =
surf_action_get_state;
surf_timer_model->common_public->action_free = action_free;
surf_timer_model->common_public->action_get_state =
surf_action_get_state;
surf_timer_model->common_public->action_free = action_free;
@@
-231,12
+231,12
@@
static void surf_timer_model_init_internal(void)
surf_action_set_data;
surf_timer_model->common_public->name = "TIMER";
surf_action_set_data;
surf_timer_model->common_public->name = "TIMER";
- surf_timer_model->common_private->
model_used = model
_used;
- surf_timer_model->common_private->share_
models = share_model
s;
+ surf_timer_model->common_private->
resource_used = resource
_used;
+ surf_timer_model->common_private->share_
resources = share_resource
s;
surf_timer_model->common_private->update_actions_state =
update_actions_state;
surf_timer_model->common_private->update_actions_state =
update_actions_state;
- surf_timer_model->common_private->update_
model
_state =
- update_
model
_state;
+ surf_timer_model->common_private->update_
resource
_state =
+ update_
resource
_state;
surf_timer_model->common_private->finalize = finalize;
surf_timer_model->common_public->suspend = action_suspend;
surf_timer_model->common_private->finalize = finalize;
surf_timer_model->common_public->suspend = action_suspend;
@@
-256,8
+256,6
@@
static void surf_timer_model_init_internal(void)
empty_trace = tmgr_empty_trace_new();
timer_heap = xbt_heap_new(8, NULL);
empty_trace = tmgr_empty_trace_new();
timer_heap = xbt_heap_new(8, NULL);
-
- xbt_assert0(maxmin_system, "surf_init has to be called first!");
}
void surf_timer_model_init(const char *filename)
}
void surf_timer_model_init(const char *filename)