-/* $Id$ */
-
-/* Copyright (c) 2007 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/********* cpu object *****************/
/**************************************/
typedef struct cpu_L07 {
- s_surf_resource_t generic_resource; /* Do not move this field: must match surf_resource_t */
+ s_surf_resource_t generic_resource; /* Do not move this field: must match surf_resource_t */
e_surf_workstation_model_type_t type; /* Do not move this field: must match link_L07_t */
lmm_constraint_t constraint; /* Do not move this field: must match link_L07_t */
double power_scale;
/**************************************/
typedef struct link_L07 {
- s_surf_resource_t generic_resource; /* Do not move this field: must match surf_resource_t */
+ s_surf_resource_t generic_resource; /* Do not move this field: must match surf_resource_t */
e_surf_workstation_model_type_t type; /* Do not move this field: must match cpu_L07_t */
lmm_constraint_t constraint; /* Do not move this field: must match cpu_L07_t */
double lat_current;
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_workstation);
-static int host_count = 0;
-static xbt_dict_t parallel_task_link_set = NULL;
+static int ptask_host_count = 0;
+static xbt_dict_t ptask_parallel_task_link_set = NULL;
lmm_system_t ptask_maxmin_system = NULL;
-static void update_action_bound(surf_action_workstation_L07_t action)
+static void ptask_update_action_bound(surf_action_workstation_L07_t action)
{
int workstation_nb = action->workstation_nb;
double lat_current = 0.0;
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
- cpu_L07_t card_src = action->workstation_list[i];
- cpu_L07_t card_dst = action->workstation_list[j];
- xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id);
+// cpu_L07_t card_src = action->workstation_list[i]; // COMMENTED BY DAVID
+// cpu_L07_t card_dst = action->workstation_list[j]; // COMMENTED BY DAVID
+ xbt_dynar_t route = NULL;// used_routing->get_route(card_src->id, card_dst->id); // COMMENTED BY DAVID
double lat = 0.0;
if (action->communication_amount[i * workstation_nb + j] > 0) {
- xbt_dynar_foreach(route,cpt,link) {
+ xbt_dynar_foreach(route, cpt, link) {
lat += link->lat_current;
}
lat_current =
/******* Resource Public **********/
/**************************************/
-static int action_unref(surf_action_t action)
+static int ptask_action_unref(surf_action_t action)
{
action->refcount--;
return 0;
}
-static void action_cancel(surf_action_t action)
+static void ptask_action_cancel(surf_action_t action)
{
surf_action_state_set(action, SURF_ACTION_FAILED);
return;
/* action_change_state is inherited from the surf module */
/* action_set_data is inherited from the surf module */
-static void action_suspend(surf_action_t action)
+static void ptask_action_suspend(surf_action_t action)
{
XBT_IN1("(%p))", action);
if (((surf_action_workstation_L07_t) action)->suspended != 2) {
XBT_OUT;
}
-static void action_resume(surf_action_t action)
+static void ptask_action_resume(surf_action_t action)
{
surf_action_workstation_L07_t act = (surf_action_workstation_L07_t) action;
XBT_OUT;
}
-static int action_is_suspended(surf_action_t action)
+static int ptask_action_is_suspended(surf_action_t action)
{
return (((surf_action_workstation_L07_t) action)->suspended == 1);
}
-static void action_set_max_duration(surf_action_t action, double duration)
+static void ptask_action_set_max_duration(surf_action_t action, double duration)
{ /* FIXME: should inherit */
XBT_IN2("(%p,%g)", action, duration);
action->max_duration = duration;
}
-static void action_set_priority(surf_action_t action, double priority)
+static void ptask_action_set_priority(surf_action_t action, double priority)
{ /* FIXME: should inherit */
XBT_IN2("(%p,%g)", action, priority);
action->priority = priority;
XBT_OUT;
}
+static double ptask_action_get_remains(surf_action_t action)
+{
+ XBT_IN1("(%p)", action);
+ return action->remains;
+ XBT_OUT;
+}
+
/**************************************/
/******* Resource Private **********/
/**************************************/
-static int resource_used(void *resource_id)
+static int ptask_resource_used(void *resource_id)
{
/* We can freely cast as a link_L07_t because it has
the same prefix as cpu_L07_t */
}
-static double share_resources(double now)
+static double ptask_share_resources(double now)
{
s_surf_action_workstation_L07_t s_action;
surf_action_workstation_L07_t action = NULL;
return min;
}
-static void update_actions_state(double now, double delta)
+static void ptask_update_actions_state(double now, double delta)
{
double deltap = 0.0;
surf_action_workstation_L07_t action = NULL;
action->latency = 0.0;
}
if ((action->latency == 0.0) && (action->suspended == 0)) {
- update_action_bound(action);
+ ptask_update_action_bound(action);
lmm_update_variable_weight(ptask_maxmin_system, action->variable,
1.0);
}
SURF_RESOURCE_OFF)) ||
((((cpu_L07_t) constraint_id)->type ==
SURF_WORKSTATION_RESOURCE_CPU) &&
- (((cpu_L07_t) constraint_id)->state_current == SURF_RESOURCE_OFF))) {
+ (((cpu_L07_t) constraint_id)->state_current ==
+ SURF_RESOURCE_OFF))) {
DEBUG1("Action (%p) Failed!!", action);
action->generic_action.finish = surf_get_clock();
- surf_action_state_set((surf_action_t) action,
- SURF_ACTION_FAILED);
+ surf_action_state_set((surf_action_t) action, SURF_ACTION_FAILED);
break;
}
}
return;
}
-static void update_resource_state(void *id,
+static void ptask_update_resource_state(void *id,
tmgr_trace_event_t event_type,
double value, double date)
{
link_L07_t nw_link = id;
if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) {
- DEBUG2("Updating link %s (%p)", nw_link->generic_resource.name, nw_link);
+ DEBUG2("Updating link %s (%p)", surf_resource_name(nw_link), nw_link);
if (event_type == nw_link->bw_event) {
nw_link->bw_current = value;
lmm_update_constraint_bound(ptask_maxmin_system, nw_link->constraint,
nw_link->bw_current);
+ if (tmgr_trace_event_free(event_type))
+ nw_link->bw_event = NULL;
} else if (event_type == nw_link->lat_event) {
lmm_variable_t var = NULL;
surf_action_workstation_L07_t action = NULL;
action = lmm_variable_id(var);
- update_action_bound(action);
+ ptask_update_action_bound(action);
}
+ if (tmgr_trace_event_free(event_type))
+ nw_link->lat_event = NULL;
} else if (event_type == nw_link->state_event) {
if (value > 0)
nw_link->state_current = SURF_RESOURCE_ON;
else
nw_link->state_current = SURF_RESOURCE_OFF;
+ if (tmgr_trace_event_free(event_type))
+ nw_link->state_event = NULL;
} else {
CRITICAL0("Unknown event ! \n");
xbt_abort();
}
return;
} else if (cpu->type == SURF_WORKSTATION_RESOURCE_CPU) {
- DEBUG3("Updating cpu %s (%p) with value %g", cpu->generic_resource.name, cpu, value);
+ DEBUG3("Updating cpu %s (%p) with value %g", surf_resource_name(cpu), cpu,
+ value);
if (event_type == cpu->power_event) {
cpu->power_current = value;
lmm_update_constraint_bound(ptask_maxmin_system, cpu->constraint,
cpu->power_current * cpu->power_scale);
+ if (tmgr_trace_event_free(event_type))
+ cpu->power_event = NULL;
} else if (event_type == cpu->state_event) {
if (value > 0)
cpu->state_current = SURF_RESOURCE_ON;
else
cpu->state_current = SURF_RESOURCE_OFF;
+ if (tmgr_trace_event_free(event_type))
+ cpu->state_event = NULL;
} else {
CRITICAL0("Unknown event ! \n");
xbt_abort();
return;
}
-static void finalize(void)
+static void ptask_finalize(void)
{
- if (parallel_task_link_set != NULL)
- xbt_dict_free(¶llel_task_link_set);
+ if (ptask_parallel_task_link_set != NULL)
+ xbt_dict_free(&ptask_parallel_task_link_set);
surf_model_exit(surf_workstation_model);
surf_workstation_model = NULL;
surf_model_exit(surf_network_model);
surf_network_model = NULL;
- used_routing->finalize();
+ // used_routing->finalize(); // COMMENTED BY DAVID
+ global_routing->finalize();
- host_count = 0; // FIXME: KILLME?
+ ptask_host_count = 0;
if (ptask_maxmin_system) {
lmm_system_free(ptask_maxmin_system);
/******* Resource Private **********/
/**************************************/
-static e_surf_resource_state_t resource_get_state(void *cpu)
+static e_surf_resource_state_t ptask_resource_get_state(void *cpu)
{
return ((cpu_L07_t) cpu)->state_current;
}
-static double get_speed(void *cpu, double load)
+static double ptask_get_speed(void *cpu, double load)
{
return load * (((cpu_L07_t) cpu)->power_scale);
}
-static double get_available_speed(void *cpu)
+static double ptask_get_available_speed(void *cpu)
{
return ((cpu_L07_t) cpu)->power_current;
}
-static surf_action_t execute_parallel_task(int workstation_nb,
+static surf_action_t ptask_execute_parallel_task(int workstation_nb,
void **workstation_list,
double *computation_amount,
double *communication_amount,
int nb_host = 0;
double latency = 0.0;
- if (parallel_task_link_set == NULL)
- parallel_task_link_set = xbt_dict_new();
+ if (ptask_parallel_task_link_set == NULL)
+ ptask_parallel_task_link_set = xbt_dict_new();
- xbt_dict_reset(parallel_task_link_set);
+ xbt_dict_reset(ptask_parallel_task_link_set);
/* Compute the number of affected resources... */
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
- cpu_L07_t card_src = workstation_list[i];
- cpu_L07_t card_dst = workstation_list[j];
+// cpu_L07_t card_src = workstation_list[i]; // COMMENTED BY DAVID
+// cpu_L07_t card_dst = workstation_list[j]; // COMMENTED BY DAVID
link_L07_t link;
- xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id);
+ xbt_dynar_t route = NULL; //used_routing->get_route(card_src->id, card_dst->id); // COMMENTED BY DAVID
double lat = 0.0;
if (communication_amount[i * workstation_nb + j] > 0)
- xbt_dynar_foreach(route,cpt,link) {
- lat += link->lat_current;
- xbt_dict_set(parallel_task_link_set, link->generic_resource.name,
- link, NULL);
+ xbt_dynar_foreach(route, cpt, link) {
+ lat += link->lat_current;
+ xbt_dict_set(ptask_parallel_task_link_set, link->generic_resource.name,
+ link, NULL);
}
latency = MAX(latency, lat);
}
}
- nb_link = xbt_dict_length(parallel_task_link_set);
- xbt_dict_reset(parallel_task_link_set);
+ nb_link = xbt_dict_length(ptask_parallel_task_link_set);
+ xbt_dict_reset(ptask_parallel_task_link_set);
for (i = 0; i < workstation_nb; i++)
if (computation_amount[i] > 0)
nb_host++;
- action=surf_action_new(sizeof(s_surf_action_workstation_L07_t),amount,surf_workstation_model,0);
- DEBUG3("Creating a parallel task (%p) with %d cpus and %d links.",
- action, workstation_nb, nb_link);
+ action =
+ surf_action_new(sizeof(s_surf_action_workstation_L07_t), amount,
+ surf_workstation_model, 0);
+ DEBUG3("Creating a parallel task (%p) with %d cpus and %d links.", action,
+ workstation_nb, nb_link);
action->suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
action->workstation_nb = workstation_nb;
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
- cpu_L07_t card_src = workstation_list[i];
- cpu_L07_t card_dst = workstation_list[j];
+// cpu_L07_t card_src = workstation_list[i]; // COMMENTED BY DAVID
+// cpu_L07_t card_dst = workstation_list[j]; // COMMENTED BY DAVID
link_L07_t link;
- xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id);
+ xbt_dynar_t route = NULL;// used_routing->get_route(card_src->id, card_dst->id); // COMMENTED BY DAVID
if (communication_amount[i * workstation_nb + j] == 0.0)
continue;
- xbt_dynar_foreach(route,cpt,link) {
+ xbt_dynar_foreach(route, cpt, link) {
lmm_expand_add(ptask_maxmin_system, link->constraint,
action->variable,
communication_amount[i * workstation_nb + j]);
return (surf_action_t) action;
}
-static surf_action_t execute(void *cpu, double size)
+static surf_action_t ptask_execute(void *cpu, double size)
{
void **workstation_list = xbt_new0(void *, 1);
double *computation_amount = xbt_new0(double, 1);
communication_amount[0] = 0.0;
computation_amount[0] = size;
- return execute_parallel_task(1, workstation_list, computation_amount,
+ return ptask_execute_parallel_task(1, workstation_list, computation_amount,
communication_amount, 1, -1);
}
-static surf_action_t communicate(void *src, void *dst, double size,
+static surf_action_t ptask_communicate(void *src, void *dst, double size,
double rate)
{
void **workstation_list = xbt_new0(void *, 2);
workstation_list[1] = dst;
communication_amount[1] = size;
- res = execute_parallel_task(2, workstation_list,
+ res = ptask_execute_parallel_task(2, workstation_list,
computation_amount, communication_amount,
1, rate);
return res;
}
-static surf_action_t action_sleep(void *cpu, double duration)
+static surf_action_t ptask_action_sleep(void *cpu, double duration)
{
surf_action_workstation_L07_t action = NULL;
- XBT_IN2("(%s,%g)", ((cpu_L07_t) cpu)->generic_resource.name, duration);
+ XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration);
- action = (surf_action_workstation_L07_t) execute(cpu, 1.0);
+ action = (surf_action_workstation_L07_t) ptask_execute(cpu, 1.0);
action->generic_action.max_duration = duration;
action->suspended = 2;
lmm_update_variable_weight(ptask_maxmin_system, action->variable, 0.0);
return (surf_action_t) action;
}
-static xbt_dynar_t get_route(void *src, void *dst)
+static xbt_dynar_t ptask_get_route(void *src, void *dst)
{
- cpu_L07_t host_src = src;
- cpu_L07_t host_dst = dst;
+// cpu_L07_t host_src = src; // COMMENTED BY DAVID
+// cpu_L07_t host_dst = dst; // COMMENTED BY DAVID
- return used_routing->get_route(host_src->id, host_dst->id);
+ return NULL;// used_routing->get_route(host_src->id, host_dst->id); // COMMENTED BY DAVID
}
-static double get_link_bandwidth(const void *link)
+static double ptask_get_link_bandwidth(const void *link)
{
return ((link_L07_t) link)->bw_current;
}
-static double get_link_latency(const void *link)
+static double ptask_get_link_latency(const void *link)
{
return ((link_L07_t) link)->lat_current;
}
-static int link_shared(const void *link)
+static int ptask_link_shared(const void *link)
{
return lmm_constraint_is_shared(((link_L07_t) link)->constraint);
}
/*** Resource Creation & Destruction **/
/**************************************/
-static cpu_L07_t cpu_new(const char *name, double power_scale,
+static cpu_L07_t ptask_cpu_new(const char *name, double power_scale,
double power_initial,
tmgr_trace_t power_trace,
e_surf_resource_state_t state_initial,
cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
cpu->generic_resource.name = xbt_strdup(name);
cpu->generic_resource.properties = current_property_set;
- cpu->id = host_count++;
+ cpu->id = ptask_host_count++;
cpu->power_scale = power_scale;
xbt_assert0(cpu->power_scale > 0, "Power has to be >0");
return cpu;
}
-static void parse_cpu_init(void)
+static void ptask_parse_cpu_init(void)
{
double power_scale = 0.0;
double power_initial = 0.0;
power_scale = get_cpu_power(A_surfxml_host_power);
surf_parse_get_double(&power_initial, A_surfxml_host_availability);
- power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
+ power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
(A_surfxml_host_state == A_surfxml_host_state_OFF),
state_trace = tmgr_trace_new(A_surfxml_host_state_file);
current_property_set = xbt_dict_new();
- cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
+ ptask_cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
state_initial, state_trace, current_property_set);
}
-static link_L07_t link_new(char *name,
+static void ptask_cpu_create_resource(char *name, double power_peak,
+ double power_scale,
+ tmgr_trace_t power_trace,
+ e_surf_resource_state_t state_initial,
+ tmgr_trace_t state_trace,
+ xbt_dict_t cpu_properties)
+{
+ ptask_cpu_new(xbt_strdup(name),power_peak,power_scale,power_trace,
+ state_initial,state_trace,cpu_properties);
+}
+
+static link_L07_t ptask_link_new(char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
lmm_constraint_shared(nw_link->constraint);
- xbt_dict_set(surf_network_model->resource_set, name, nw_link, surf_resource_free);
+ xbt_dict_set(surf_network_model->resource_set, name, nw_link,
+ surf_resource_free);
return nw_link;
}
-static void parse_link_init(void)
+static void ptask_parse_link_init(void)
{
char *name_link;
double bw_initial;
state_trace = tmgr_trace_new(A_surfxml_link_state_file);
current_property_set = xbt_dict_new();
- link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace,
+ ptask_link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace,
state_initial_link, state_trace, policy_initial_link,
current_property_set);
}
-static void add_traces(void)
+static void ptask_link_create_resource(char *name,
+ double bw_initial,
+ tmgr_trace_t bw_trace,
+ double lat_initial,
+ tmgr_trace_t lat_trace,
+ e_surf_resource_state_t
+ state_initial,
+ tmgr_trace_t state_trace,
+ e_surf_link_sharing_policy_t
+ policy, xbt_dict_t properties)
+{
+
+ ptask_link_new(name, bw_initial, bw_trace,
+ lat_initial, lat_trace, state_initial, state_trace,policy, xbt_dict_new());
+}
+
+
+static void ptask_add_traces(void)
{
xbt_dict_cursor_t cursor = NULL;
char *trace_name, *elm;
/* Connect traces relative to network */
xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- link_L07_t link = xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+ link_L07_t link =
+ xbt_dict_get_or_null(surf_network_model->resource_set, elm);
xbt_assert1(link, "Link %s undefined", elm);
xbt_assert1(trace, "Trace %s undefined", trace_name);
xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- link_L07_t link = xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+ link_L07_t link =
+ xbt_dict_get_or_null(surf_network_model->resource_set, elm);
xbt_assert1(link, "Link %s undefined", elm);
xbt_assert1(trace, "Trace %s undefined", trace_name);
xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- link_L07_t link = xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+ link_L07_t link =
+ xbt_dict_get_or_null(surf_network_model->resource_set, elm);
xbt_assert1(link, "Link %s undefined", elm);
xbt_assert1(trace, "Trace %s undefined", trace_name);
}
}
-static void define_callbacks(const char *file)
+static void ptask_define_callbacks(const char *file)
{
/* Adding callback functions */
surf_parse_reset_parser();
- surfxml_add_callback(STag_surfxml_host_cb_list, &parse_cpu_init);
- surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces);
+ surfxml_add_callback(STag_surfxml_host_cb_list, &ptask_parse_cpu_init);
+ surfxml_add_callback(STag_surfxml_link_cb_list, &ptask_parse_link_init);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces);
}
-
/**************************************/
/********* Module creation ***********/
/**************************************/
-static void model_init_internal(void)
+static void ptask_model_init_internal(void)
{
surf_workstation_model = surf_model_init();
- surf_workstation_model->action_unref = action_unref;
- surf_workstation_model->action_cancel = action_cancel;
+ surf_workstation_model->action_unref = ptask_action_unref;
+ surf_workstation_model->action_cancel = ptask_action_cancel;
surf_workstation_model->action_state_set = surf_action_state_set;
- surf_workstation_model->suspend = action_suspend;
- surf_workstation_model->resume = action_resume;
- surf_workstation_model->is_suspended = action_is_suspended;
- surf_workstation_model->set_max_duration = action_set_max_duration;
- surf_workstation_model->set_priority = action_set_priority;
+ surf_workstation_model->suspend = ptask_action_suspend;
+ surf_workstation_model->resume = ptask_action_resume;
+ surf_workstation_model->is_suspended = ptask_action_is_suspended;
+ surf_workstation_model->set_max_duration = ptask_action_set_max_duration;
+ 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->model_private->resource_used = resource_used;
- surf_workstation_model->model_private->share_resources = share_resources;
+ surf_workstation_model->model_private->resource_used = ptask_resource_used;
+ surf_workstation_model->model_private->share_resources = ptask_share_resources;
surf_workstation_model->model_private->update_actions_state =
- update_actions_state;
+ ptask_update_actions_state;
surf_workstation_model->model_private->update_resource_state =
- update_resource_state;
- surf_workstation_model->model_private->finalize = finalize;
+ ptask_update_resource_state;
+ surf_workstation_model->model_private->finalize = ptask_finalize;
- surf_workstation_model->extension.workstation.execute = execute;
- surf_workstation_model->extension.workstation.sleep = action_sleep;
+
+ surf_workstation_model->extension.workstation.execute = ptask_execute;
+ surf_workstation_model->extension.workstation.sleep = ptask_action_sleep;
surf_workstation_model->extension.workstation.get_state =
- resource_get_state;
- surf_workstation_model->extension.workstation.get_speed = get_speed;
+ ptask_resource_get_state;
+ surf_workstation_model->extension.workstation.get_speed = ptask_get_speed;
surf_workstation_model->extension.workstation.get_available_speed =
- get_available_speed;
- surf_workstation_model->extension.workstation.communicate = communicate;
- surf_workstation_model->extension.workstation.get_route = get_route;
+ ptask_get_available_speed;
+ surf_workstation_model->extension.workstation.communicate = ptask_communicate;
+ surf_workstation_model->extension.workstation.get_route = ptask_get_route;
surf_workstation_model->extension.workstation.execute_parallel_task =
- execute_parallel_task;
+ ptask_execute_parallel_task;
surf_workstation_model->extension.workstation.get_link_bandwidth =
- get_link_bandwidth;
+ ptask_get_link_bandwidth;
surf_workstation_model->extension.workstation.get_link_latency =
- get_link_latency;
- surf_workstation_model->extension.workstation.link_shared = link_shared;
- surf_workstation_model->extension.workstation.get_properties = surf_resource_properties;
-
+ ptask_get_link_latency;
+ surf_workstation_model->extension.workstation.link_shared = ptask_link_shared;
+ surf_workstation_model->extension.workstation.get_properties =
+ surf_resource_properties;
+ surf_workstation_model->extension.workstation.link_create_resource =
+ ptask_link_create_resource;
+ surf_workstation_model->extension.workstation.cpu_create_resource =
+ ptask_cpu_create_resource;
+ surf_workstation_model->extension.workstation.add_traces = ptask_add_traces;
if (!ptask_maxmin_system)
ptask_maxmin_system = lmm_system_new();
routing_model_create(sizeof(link_L07_t),
- link_new(xbt_strdup("__loopback__"),
- 498000000, NULL, 0.000015, NULL,
- SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE, NULL));
+ ptask_link_new(xbt_strdup("__loopback__"),
+ 498000000, NULL, 0.000015, NULL,
+ SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE,
+ NULL));
}
/**************************************/
void surf_workstation_model_init_ptask_L07(const char *filename)
{
+ INFO0("surf_workstation_model_init_ptask_L07");
xbt_assert0(!surf_cpu_model, "CPU model type already defined");
xbt_assert0(!surf_network_model, "network model type already defined");
surf_network_model = surf_model_init();
- define_callbacks(filename);
- model_init_internal();
+ ptask_define_callbacks(filename);
+ ptask_model_init_internal();
update_model_description(surf_workstation_model_description,
"ptask_L07", surf_workstation_model);
