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
Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
[simgrid.git]
/
src
/
surf
/
workstation_ptask_L07.c
diff --git
a/src/surf/workstation_ptask_L07.c
b/src/surf/workstation_ptask_L07.c
index
183c305
..
6d948ac
100644
(file)
--- a/
src/surf/workstation_ptask_L07.c
+++ b/
src/surf/workstation_ptask_L07.c
@@
-216,13
+216,13
@@
static int ptask_resource_used(void *resource_id)
}
}
-static double ptask_share_resources(double now)
+static double ptask_share_resources(
surf_model_t workstation_model,
double now)
{
s_surf_action_workstation_L07_t s_action;
surf_action_workstation_L07_t action = NULL;
xbt_swag_t running_actions =
{
s_surf_action_workstation_L07_t s_action;
surf_action_workstation_L07_t action = NULL;
xbt_swag_t running_actions =
-
surf_
workstation_model->states.running_action_set;
+ workstation_model->states.running_action_set;
double min = generic_maxmin_share_resources(running_actions,
xbt_swag_offset(s_action,
variable),
double min = generic_maxmin_share_resources(running_actions,
xbt_swag_offset(s_action,
variable),
@@
-248,13
+248,13
@@
static double ptask_share_resources(double now)
return min;
}
return min;
}
-static void ptask_update_actions_state(double now, double delta)
+static void ptask_update_actions_state(
surf_model_t workstation_model,
double now, double delta)
{
double deltap = 0.0;
surf_action_workstation_L07_t action = NULL;
surf_action_workstation_L07_t next_action = NULL;
xbt_swag_t running_actions =
{
double deltap = 0.0;
surf_action_workstation_L07_t action = NULL;
surf_action_workstation_L07_t next_action = NULL;
xbt_swag_t running_actions =
-
surf_
workstation_model->states.running_action_set;
+ workstation_model->states.running_action_set;
xbt_swag_foreach_safe(action, next_action, running_actions) {
deltap = delta;
xbt_swag_foreach_safe(action, next_action, running_actions) {
deltap = delta;
@@
-344,8
+344,8
@@
static void ptask_update_resource_state(void *id,
link_L07_t nw_link = id;
if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) {
link_L07_t nw_link = id;
if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) {
- XBT_DEBUG("Updating link %s (%p) with value=%f",
- surf_resource_name(nw_link), nw_link, value);
+ XBT_DEBUG("Updating link %s (%p) with value=%f
for date=%g
",
+ surf_resource_name(nw_link), nw_link, value
, date
);
if (event_type == nw_link->bw_event) {
nw_link->bw_current = value;
lmm_update_constraint_bound(ptask_maxmin_system, nw_link->constraint,
if (event_type == nw_link->bw_event) {
nw_link->bw_current = value;
lmm_update_constraint_bound(ptask_maxmin_system, nw_link->constraint,
@@
-407,12
+407,12
@@
static void ptask_update_resource_state(void *id,
return;
}
return;
}
-static void ptask_finalize(
void
)
+static void ptask_finalize(
surf_model_t workstation_model
)
{
xbt_dict_free(&ptask_parallel_task_link_set);
{
xbt_dict_free(&ptask_parallel_task_link_set);
- surf_model_exit(
surf_
workstation_model);
-
surf_
workstation_model = NULL;
+ surf_model_exit(workstation_model);
+ workstation_model = NULL;
surf_model_exit(surf_network_model);
surf_network_model = NULL;
surf_model_exit(surf_network_model);
surf_network_model = NULL;
@@
-856,6
+856,7
@@
static void ptask_model_init_internal(void)
surf_workstation_model->set_priority = ptask_action_set_priority;
surf_workstation_model->get_remains = ptask_action_get_remains;
surf_workstation_model->name = "Workstation ptask_L07";
surf_workstation_model->set_priority = ptask_action_set_priority;
surf_workstation_model->get_remains = ptask_action_get_remains;
surf_workstation_model->name = "Workstation ptask_L07";
+ surf_workstation_model->type = SURF_MODEL_TYPE_WORKSTATION;
surf_workstation_model->model_private->resource_used =
ptask_resource_used;
surf_workstation_model->model_private->resource_used =
ptask_resource_used;
@@
-918,7
+919,7
@@
static void ptask_model_init_internal(void)
void surf_workstation_model_init_ptask_L07(void)
{
XBT_INFO("surf_workstation_model_init_ptask_L07");
void surf_workstation_model_init_ptask_L07(void)
{
XBT_INFO("surf_workstation_model_init_ptask_L07");
- xbt_assert(!surf_cpu_model, "CPU model type already defined");
+ xbt_assert(!surf_cpu_model
_pm
, "CPU model type already defined");
xbt_assert(!surf_network_model, "network model type already defined");
ptask_define_callbacks();
ptask_model_init_internal();
xbt_assert(!surf_network_model, "network model type already defined");
ptask_define_callbacks();
ptask_model_init_internal();