if (action->communication_amount[i * workstation_nb + j] > 0) {
double lat = 0.0;
- routing_get_route_and_latency(action->workstation_list[i]->info,
- action->workstation_list[j]->info,
+ routing_get_route_and_latency(((cpu_L07_t)surf_workstation_resource_priv(action->workstation_list[i]))->info,
+ ((cpu_L07_t)surf_workstation_resource_priv(action->workstation_list[j]))->info,
&route, &lat);
lat_current =
MAX(lat_current,
free(((surf_action_workstation_L07_t) action)->workstation_list);
free(((surf_action_workstation_L07_t) action)->communication_amount);
free(((surf_action_workstation_L07_t) action)->computation_amount);
+#ifdef HAVE_TRACING
+ xbt_free(action->category);
+#endif
surf_action_free(&action);
return 1;
}
}
-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 =
- 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),
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 =
- surf_workstation_model->states.running_action_set;
+ workstation_model->states.running_action_set;
xbt_swag_foreach_safe(action, next_action, running_actions) {
deltap = delta;
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,
return;
}
-static void ptask_finalize(void)
+static void ptask_finalize(surf_model_t workstation_model)
{
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;
static e_surf_resource_state_t ptask_resource_get_state(void *cpu)
{
- return ((cpu_L07_t) cpu)->state_current;
+ return ((cpu_L07_t)surf_workstation_resource_priv(cpu))->state_current;
}
static double ptask_get_speed(void *cpu, double load)
{
- return load * (((cpu_L07_t) cpu)->power_scale);
+ return load * ((cpu_L07_t)surf_workstation_resource_priv(cpu))->power_scale;
}
static double ptask_get_available_speed(void *cpu)
{
- return ((cpu_L07_t) cpu)->power_current;
+ return ((cpu_L07_t)surf_workstation_resource_priv(cpu))->power_current;
}
static surf_action_t ptask_execute_parallel_task(int workstation_nb,
link_L07_t link;
routing_get_route_and_latency(
- ((cpu_L07_t)workstation_list[i])->info,
- ((cpu_L07_t)workstation_list[j])->info,
+ ((cpu_L07_t)surf_workstation_resource_priv(workstation_list[i]))->info,
+ ((cpu_L07_t)surf_workstation_resource_priv(workstation_list[j]))->info,
&route,&lat);
latency = MAX(latency, lat);
for (i = 0; i < workstation_nb; i++)
lmm_expand(ptask_maxmin_system,
- ((cpu_L07_t) workstation_list[i])->constraint,
+ ((cpu_L07_t)surf_workstation_resource_priv(workstation_list[i]))->constraint,
action->variable, computation_amount[i]);
for (i = 0; i < workstation_nb; i++) {
continue;
routing_get_route_and_latency(
- ((cpu_L07_t)workstation_list[i])->info,
- ((cpu_L07_t)workstation_list[j])->info,
+ ((cpu_L07_t)surf_workstation_resource_priv(workstation_list[i]))->info,
+ ((cpu_L07_t)surf_workstation_resource_priv(workstation_list[j]))->info,
&route,NULL);
xbt_dynar_foreach(route, cpt, link) {
{
xbt_dynar_t route=NULL;
routing_get_route_and_latency(
- ((cpu_L07_t)src)->info, ((cpu_L07_t)dst)->info,
+ ((cpu_L07_t)surf_workstation_resource_priv(src))->info, ((cpu_L07_t)surf_workstation_resource_priv(dst))->info,
&route,NULL);
return route;
}
xbt_dict_t cpu_properties)
{
cpu_L07_t cpu = NULL;
- xbt_assert(!surf_workstation_resource_by_name(name),
+ xbt_assert(!surf_workstation_resource_priv(surf_workstation_resource_by_name(name)),
"Host '%s' declared several times in the platform file.",
name);
xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, cpu);
- return cpu;
+ return xbt_lib_get_elm_or_null(host_lib, name);
}
static void ptask_parse_cpu_init(sg_platf_host_cbarg_t host)
/* Connect traces relative to cpu */
xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- cpu_L07_t host = surf_workstation_resource_by_name(elm);
+ cpu_L07_t host = surf_workstation_resource_priv(surf_workstation_resource_by_name(elm));
xbt_assert(host, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- cpu_L07_t host = surf_workstation_resource_by_name(elm);
+ cpu_L07_t host = surf_workstation_resource_priv(surf_workstation_resource_by_name(elm));
xbt_assert(host, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
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;
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();