e_surf_cpu_state_t state_current;
tmgr_trace_event_t state_event;
int id; /* cpu and network card are a single object... */
+ xbt_dict_t properties;
} s_cpu_L07_t, *cpu_L07_t;
/**************************************/
tmgr_trace_event_t bw_event;
e_surf_network_link_state_t state_current;
tmgr_trace_event_t state_event;
+ /*holds the property list that can be associated with the link*/
+ xbt_dict_t properties;
} s_network_link_L07_t, *network_link_L07_t;
if (action->communication_amount[i * workstation_nb + j] > 0) {
for (k = 0; k < route_size; k++) {
lat += route[k]->lat_current;
- xbt_dict_set(parallel_task_network_link_set, route[k]->name,
- route[k], NULL);
}
- lat_current=MAX(lat_current,lat/action->communication_amount[i * workstation_nb + j]);
+ lat_current=MAX(lat_current,lat*action->communication_amount[i * workstation_nb + j]);
}
}
}
/* We can freely cast as a cpu_L07_t because it has the same
prefix as network_link_L07_t. However, only cpu_L07_t
will theoretically be given as an argument here. */
+
return ((cpu_L07_t) resource_id)->name;
}
XBT_IN1("(%p)", act);
if (act->suspended != 2) {
- lmm_update_variable_weight(ptask_maxmin_system,action->variable, 1.0);
+ lmm_update_variable_weight(ptask_maxmin_system,act->variable, 1.0);
act->suspended = 0;
}
XBT_OUT;
xbt_swag_t running_actions =
surf_workstation_model->common_public->states.running_action_set;
- double min = generic_maxmin_share_resources2(running_actions,
- xbt_swag_offset(s_action,
- variable),
- ptask_maxmin_system,
- bottleneck_solve);
+ double min = generic_maxmin_share_resources(running_actions,
+ xbt_swag_offset(s_action,
+ variable),
+ ptask_maxmin_system,
+ bottleneck_solve);
xbt_swag_foreach(action, running_actions) {
if (action->latency > 0) {
return ((cpu_L07_t) cpu)->power_current;
}
+static xbt_dict_t get_properties(void *cpu)
+{
+ return ((cpu_L07_t) cpu)->properties;
+}
+
+
static surf_action_t execute_parallel_task(int workstation_nb,
void **workstation_list,
double *computation_amount,
xbt_dict_new_ext(workstation_nb * workstation_nb * 10);
}
+ xbt_dict_reset(parallel_task_network_link_set);
+
/* Compute the number of affected resources... */
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
communication_amount[0] = 0.0;
computation_amount[0] = size;
- return execute_parallel_task(1, workstation_list, communication_amount,
+ return execute_parallel_task(1, workstation_list, computation_amount,
communication_amount, 1, -1);
}
return ((network_link_L07_t) link)->lat_current;
}
+
+static xbt_dict_t get_link_properties(void *link)
+{
+ return ((network_link_L07_t) link)->properties;
+}
+
+
/**************************************/
/*** Resource Creation & Destruction **/
/**************************************/
double power_initial,
tmgr_trace_t power_trace,
e_surf_cpu_state_t state_initial,
- tmgr_trace_t state_trace)
+ tmgr_trace_t state_trace,
+ xbt_dict_t cpu_properties)
{
cpu_L07_t cpu = xbt_new0(s_cpu_L07_t, 1);
lmm_constraint_new(ptask_maxmin_system, cpu,
cpu->power_current * cpu->power_scale);
- xbt_dict_set(workstation_set, name, cpu, cpu_free);
+ /*add the property set*/
+ cpu->properties = current_property_set;
+ xbt_dict_set(workstation_set, name, cpu, cpu_free);
return cpu;
}
-static void parse_cpu(void)
+static void create_routing_table(void)
+{
+ routing_table = xbt_new0(s_route_L07_t, nb_workstation * nb_workstation);
+}
+
+static void parse_cpu_init(void)
{
double power_scale = 0.0;
double power_initial = 0.0;
e_surf_cpu_state_t state_initial = SURF_CPU_OFF;
tmgr_trace_t state_trace = NULL;
- surf_parse_get_double(&power_scale, A_surfxml_cpu_power);
- surf_parse_get_double(&power_initial, A_surfxml_cpu_availability);
- surf_parse_get_trace(&power_trace, A_surfxml_cpu_availability_file);
+ surf_parse_get_double(&power_scale, A_surfxml_host_power);
+ surf_parse_get_double(&power_initial, A_surfxml_host_availability);
+ surf_parse_get_trace(&power_trace, A_surfxml_host_availability_file);
- xbt_assert0((A_surfxml_cpu_state == A_surfxml_cpu_state_ON) ||
- (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF),
+ xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
+ (A_surfxml_host_state == A_surfxml_host_state_OFF),
"Invalid state");
- if (A_surfxml_cpu_state == A_surfxml_cpu_state_ON)
+ if (A_surfxml_host_state == A_surfxml_host_state_ON)
state_initial = SURF_CPU_ON;
- if (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF)
+ if (A_surfxml_host_state == A_surfxml_host_state_OFF)
state_initial = SURF_CPU_OFF;
- surf_parse_get_trace(&state_trace, A_surfxml_cpu_state_file);
+ surf_parse_get_trace(&state_trace, A_surfxml_host_state_file);
- cpu_new(A_surfxml_cpu_name, power_scale, power_initial, power_trace,
- state_initial, state_trace);
-}
-
-static void create_routing_table(void)
-{
- routing_table = xbt_new0(s_route_L07_t, nb_workstation * nb_workstation);
+ current_property_set = xbt_dict_new();
+ cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
+ state_initial, state_trace,/*add the properties*/current_property_set);
}
static void network_link_free(void *nw_link)
state_initial,
tmgr_trace_t state_trace,
e_surf_network_link_sharing_policy_t
- policy)
+ policy, xbt_dict_t properties)
{
network_link_L07_t nw_link = xbt_new0(s_network_link_L07_t, 1);
if (policy == SURF_NETWORK_LINK_FATPIPE)
lmm_constraint_shared(nw_link->constraint);
+ nw_link->properties = properties;
+
xbt_dict_set(network_link_set, name, nw_link, network_link_free);
return nw_link;
}
-static void parse_network_link(void)
+static void parse_network_link_init(void)
{
- char *name;
+ char *name_link;
double bw_initial;
tmgr_trace_t bw_trace;
double lat_initial;
tmgr_trace_t lat_trace;
- e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON;
- e_surf_network_link_sharing_policy_t policy_initial =
- SURF_NETWORK_LINK_SHARED;
+ e_surf_network_link_state_t state_initial_link = SURF_NETWORK_LINK_ON;
+ e_surf_network_link_sharing_policy_t policy_initial_link = SURF_NETWORK_LINK_SHARED;
tmgr_trace_t state_trace;
- name = xbt_strdup(A_surfxml_network_link_name);
- surf_parse_get_double(&bw_initial, A_surfxml_network_link_bandwidth);
- surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file);
- surf_parse_get_double(&lat_initial, A_surfxml_network_link_latency);
- surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file);
-
- xbt_assert0((A_surfxml_network_link_state ==
- A_surfxml_network_link_state_ON)
- || (A_surfxml_network_link_state ==
- A_surfxml_network_link_state_OFF), "Invalid state");
- if (A_surfxml_network_link_state == A_surfxml_network_link_state_ON)
- state_initial = SURF_NETWORK_LINK_ON;
- else if (A_surfxml_network_link_state ==
- A_surfxml_network_link_state_OFF)
- state_initial = SURF_NETWORK_LINK_OFF;
-
- if (A_surfxml_network_link_sharing_policy ==
- A_surfxml_network_link_sharing_policy_SHARED)
- policy_initial = SURF_NETWORK_LINK_SHARED;
- else if (A_surfxml_network_link_sharing_policy ==
- A_surfxml_network_link_sharing_policy_FATPIPE)
- policy_initial = SURF_NETWORK_LINK_FATPIPE;
-
- surf_parse_get_trace(&state_trace, A_surfxml_network_link_state_file);
-
- network_link_new(name, bw_initial, bw_trace, lat_initial, lat_trace,
- state_initial, state_trace, policy_initial);
-}
+ name_link = xbt_strdup(A_surfxml_link_id);
+ surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
+ surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file);
+ surf_parse_get_double(&lat_initial, A_surfxml_link_latency);
+ surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file);
+
+ xbt_assert0((A_surfxml_link_state ==
+ A_surfxml_link_state_ON)
+ || (A_surfxml_link_state ==
+ A_surfxml_link_state_OFF), "Invalid state");
+ if (A_surfxml_link_state == A_surfxml_link_state_ON)
+ state_initial_link = SURF_NETWORK_LINK_ON;
+ else if (A_surfxml_link_state ==
+ A_surfxml_link_state_OFF)
+ state_initial_link = SURF_NETWORK_LINK_OFF;
+
+ if (A_surfxml_link_sharing_policy ==
+ A_surfxml_link_sharing_policy_SHARED)
+ policy_initial_link = SURF_NETWORK_LINK_SHARED;
+ else if (A_surfxml_link_sharing_policy ==
+ A_surfxml_link_sharing_policy_FATPIPE)
+ policy_initial_link = SURF_NETWORK_LINK_FATPIPE;
+
+ surf_parse_get_trace(&state_trace, A_surfxml_link_state_file);
+
+ current_property_set = xbt_dict_new();
+ network_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 route_new(int src_id, int dst_id,
network_link_L07_t * link_list, int nb_link)
static network_link_L07_t *link_list = NULL;
static int src_id = -1;
static int dst_id = -1;
+static int is_first =0;
static void parse_route_set_endpoints(void)
{
cpu_L07_t cpu_tmp = NULL;
+ if (!is_first) create_routing_table();
+ is_first = 1;
+
cpu_tmp = (cpu_L07_t) name_service(A_surfxml_route_src);
xbt_assert1(cpu_tmp, "Invalid cpu %s", A_surfxml_route_src);
if (cpu_tmp != NULL)
}
TRY {
link_list[nb_link++] =
- xbt_dict_get(network_link_set, A_surfxml_route_element_name);
+ xbt_dict_get(network_link_set, A_surfxml_link_c_ctn_id);
}
CATCH(e) {
RETHROW1("Link %s not found (dict raised this exception: %s)",
- A_surfxml_route_element_name);
+ A_surfxml_link_c_ctn_id);
}
}
{
int i;
- /* Figuring out the cpus */
+ /* Adding callback functions */
surf_parse_reset_parser();
- ETag_surfxml_cpu_fun = parse_cpu;
- surf_parse_open(file);
- xbt_assert1((!surf_parse()), "Parse error in %s", file);
- surf_parse_close();
-
- create_routing_table();
-
- /* Figuring out the network links */
- surf_parse_reset_parser();
- ETag_surfxml_network_link_fun = parse_network_link;
- surf_parse_open(file);
- xbt_assert1((!surf_parse()), "Parse error in %s", file);
- surf_parse_close();
-
- /* Building the routes */
- surf_parse_reset_parser();
- STag_surfxml_route_fun = parse_route_set_endpoints;
- ETag_surfxml_route_element_fun = parse_route_elem;
- ETag_surfxml_route_fun = parse_route_set_route;
+ surfxml_add_callback(STag_surfxml_host_cb_list, &parse_cpu_init);
+ surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+ surfxml_add_callback(STag_surfxml_link_cb_list, &parse_network_link_init);
+ surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
+ surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
+ surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
+
+ /* Parse the file */
surf_parse_open(file);
xbt_assert1((!surf_parse()), "Parse error in %s", file);
surf_parse_close();
loopback = network_link_new(xbt_strdup("__MSG_loopback__"),
498000000, NULL, 0.000015, NULL,
SURF_NETWORK_LINK_ON, NULL,
- SURF_NETWORK_LINK_FATPIPE);
+ SURF_NETWORK_LINK_FATPIPE,NULL);
ROUTE(i, i).size = 1;
ROUTE(i, i).links = xbt_new0(network_link_L07_t, 1);
surf_workstation_model->extension_public->get_link_latency =
get_link_latency;
+ surf_workstation_model->common_public->get_link_properties = get_link_properties;
+ surf_workstation_model->common_public->get_cpu_properties = get_properties;
+
workstation_set = xbt_dict_new();
network_link_set = xbt_dict_new();
"network model type already defined");
model_init_internal();
parse_file(filename);
- WARN0("This model does not take latency into account.");
update_model_description(surf_workstation_model_description,
surf_workstation_model_description_size,
