#define ROUTE(i,j) routing_table[(i)+(j)*nb_workstation]
static network_link_KCCFLN05_t loopback = NULL;
static xbt_dict_t parallel_task_network_link_set = NULL;
+//added to work with GTNETS
+static xbt_dict_t router_set = NULL;
/*xbt_dict_t network_link_set = NULL;*/
+
/* convenient function */
static void __update_cpu_usage(cpu_KCCFLN05_t cpu)
{
{
xbt_ex_t e;
void *res=NULL;
+
TRY {
- res = xbt_dict_get(workstation_set, name);
+ res = xbt_dict_get(workstation_set, name);
} CATCH(e) {
- RETHROW1("Host '%s' not found (dict raised this exception: %s)",name);
+ if (e.category != not_found_error)
+ RETHROW;
+ WARN1("Host '%s' not found, verifing if it is a router", name);
+ res = NULL;
+ xbt_ex_free(e);
}
+
return res;
}
if (action->generic_action.max_duration != NO_MAX_DURATION)
double_update(&(action->generic_action.max_duration), delta);
- /* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
-
if ((action->generic_action.remains <= 0) &&
(lmm_get_variable_weight(action->variable)>0)) {
action->generic_action.finish = surf_get_clock();
(action->generic_action.max_duration <= 0)) {
action->generic_action.finish = surf_get_clock();
surf_action_change_state((surf_action_t) action, SURF_ACTION_DONE);
- } else { /* Need to check that none of the resource has failed */
+ } else {
+ /* Need to check that none of the resource has failed */
lmm_constraint_t cnst = NULL;
int i = 0;
void *constraint_id = NULL;
lmm_get_cnst_from_var(maxmin_system, action->variable,
i++))) {
constraint_id = lmm_constraint_id(cnst);
+
+/* if(((network_link_KCCFLN05_t)constraint_id)->type== */
+/* SURF_WORKSTATION_RESOURCE_LINK) { */
+/* DEBUG2("Checking for link %s (%p)", */
+/* ((network_link_KCCFLN05_t)constraint_id)->name, */
+/* ((network_link_KCCFLN05_t)constraint_id)); */
+/* } */
+/* if(((cpu_KCCFLN05_t)constraint_id)->type== */
+/* SURF_WORKSTATION_RESOURCE_CPU) { */
+/* DEBUG3("Checking for cpu %s (%p) : %s", */
+/* ((cpu_KCCFLN05_t)constraint_id)->name, */
+/* ((cpu_KCCFLN05_t)constraint_id), */
+/* ((cpu_KCCFLN05_t)constraint_id)->state_current==SURF_CPU_OFF?"Off":"On"); */
+/* } */
+
if(((((network_link_KCCFLN05_t)constraint_id)->type==
SURF_WORKSTATION_RESOURCE_LINK) &&
(((network_link_KCCFLN05_t)constraint_id)->state_current==
SURF_WORKSTATION_RESOURCE_CPU) &&
(((cpu_KCCFLN05_t)constraint_id)->state_current==
SURF_CPU_OFF))) {
+ DEBUG1("Action (%p) Failed!!",action);
action->generic_action.finish = surf_get_clock();
surf_action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
break;
network_link_KCCFLN05_t nw_link = id ;
if(nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) {
+ DEBUG2("Updating link %s (%p)",nw_link->name,nw_link);
if (event_type == nw_link->bw_event) {
nw_link->bw_current = value;
lmm_update_constraint_bound(maxmin_system, nw_link->constraint,
}
return;
} else if(cpu->type == SURF_WORKSTATION_RESOURCE_CPU) {
+ DEBUG3("Updating cpu %s (%p) with value %g",cpu->name,cpu,value);
if (event_type == cpu->power_event) {
cpu->power_current = value;
__update_cpu_usage(cpu);
} else {
CRITICAL0("Unknown event ! \n");
xbt_abort();
- }
+ }
return;
} else {
DIE_IMPOSSIBLE;
xbt_dict_free(&network_link_set);
xbt_dict_free(&workstation_set);
+ xbt_dict_free(&router_set);
if (parallel_task_network_link_set != NULL) {
xbt_dict_free(¶llel_task_network_link_set);
}
/*** Resource Creation & Destruction **/
/**************************************/
+
+static void router_free(void *router)
+{
+ free( ((router_KCCFLN05_t) router)->name );
+}
+
+static void router_new(const char *name)
+{
+ static unsigned int nb_routers = 0;
+
+ INFO1("Creating a router %s", name);
+
+ router_KCCFLN05_t router;
+ router = xbt_new0(s_router_KCCFLN05_t, 1);
+
+ router->name = xbt_strdup(name);
+ router->id = nb_routers++;
+ xbt_dict_set(router_set, name, router, router_free);
+}
+
+static void parse_routers(void)
+{
+ //add a dumb router just to be GTNETS compatible
+ router_new(A_surfxml_router_name);
+}
+
static void cpu_free(void *cpu)
{
free(((cpu_KCCFLN05_t) cpu)->name);
if (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF)
state_initial = SURF_CPU_OFF;
surf_parse_get_trace(&state_trace, A_surfxml_cpu_state_file);
-
+
surf_parse_get_double(&interference_send,
A_surfxml_cpu_interference_send);
surf_parse_get_double(&interference_recv,
static void parse_route_set_endpoints(void)
{
- src_id = ((cpu_KCCFLN05_t) name_service(A_surfxml_route_src))->id;
- dst_id = ((cpu_KCCFLN05_t) name_service(A_surfxml_route_dst))->id;
+ cpu_KCCFLN05_t cpu_tmp = NULL;
+
+ cpu_tmp = (cpu_KCCFLN05_t) name_service(A_surfxml_route_src);
+ if(cpu_tmp != NULL) {
+ src_id = cpu_tmp->id;
+ }else {
+ xbt_assert1(xbt_dict_get_or_null(router_set, A_surfxml_route_src),
+ "Invalid name '%s': neither a cpu nor a router!",
+ A_surfxml_route_src);
+ src_id=-1;
+ return;
+ }
+
+ cpu_tmp = (cpu_KCCFLN05_t) name_service(A_surfxml_route_dst);
+ if(cpu_tmp != NULL) {
+ dst_id = cpu_tmp->id;
+ }else {
+ xbt_assert1(xbt_dict_get_or_null(router_set, A_surfxml_route_dst),
+ "Invalid name '%s': neither a cpu nor a router!",
+ A_surfxml_route_dst);
+ dst_id=-1;
+ return ;
+ }
+
surf_parse_get_double(&impact_on_src, A_surfxml_route_impact_on_src);
surf_parse_get_double(&impact_on_dst, A_surfxml_route_impact_on_dst);
surf_parse_get_double(&impact_on_src_with_other_recv,
A_surfxml_route_impact_on_src_with_other_recv);
surf_parse_get_double(&impact_on_dst_with_other_send,
A_surfxml_route_impact_on_dst_with_other_send);
-
+
nb_link = 0;
- link_list_capacity = 20;
+ link_list_capacity = 1;
link_list = xbt_new(network_link_KCCFLN05_t, link_list_capacity);
+
}
static void parse_route_elem(void)
static void parse_route_set_route(void)
{
+ if( src_id != -1 && dst_id != -1 )
route_new(src_id, dst_id, link_list, nb_link, impact_on_src,
impact_on_dst, impact_on_src_with_other_recv,
impact_on_dst_with_other_send);
static void parse_file(const char *file)
{
- int i ;
+ int i;
/* Figuring out the cpus */
surf_parse_reset_parser();
create_routing_table();
+ /* Figuring out the router (added after GTNETS) */
+ surf_parse_reset_parser();
+ STag_surfxml_router_fun=parse_routers;
+ surf_parse_open(file);
+ xbt_assert1((!surf_parse()),"Parse error in %s",file);
+ surf_parse_close();
+
/* Figuring out the network links */
surf_parse_reset_parser();
ETag_surfxml_network_link_fun = parse_network_link;
surf_workstation_resource->extension_public->get_link_bandwidth = get_link_bandwidth;
surf_workstation_resource->extension_public->get_link_latency = get_link_latency;
- workstation_set = xbt_dict_new();
+ workstation_set = xbt_dict_new();
+ router_set = xbt_dict_new();
network_link_set = xbt_dict_new();
xbt_assert0(maxmin_system, "surf_init has to be called first!");
xbt_dynar_push(resource_list, &surf_workstation_resource);
}
-
-void surf_workstation_resource_init_KCCFLN05_proportional(const char *filename)
-{
- xbt_assert0(!surf_cpu_resource, "CPU resource type already defined");
- xbt_assert0(!surf_network_resource, "network resource type already defined");
- resource_init_internal();
- parse_file(filename);
-
- surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (proportional)";
- use_sdp_solver=1;
- xbt_dynar_push(resource_list, &surf_workstation_resource);
-}
-
-void surf_workstation_resource_init_KCCFLN05_Vegas(const char *filename)
-{
- xbt_assert0(!surf_cpu_resource, "CPU resource type already defined");
- xbt_assert0(!surf_network_resource, "network resource type already defined");
- resource_init_internal();
- parse_file(filename);
-
- lmm_set_default_protocol_functions(func_vegas_fpi);
-
- surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Vegas)";
- use_lagrange_solver=1;
- xbt_dynar_push(resource_list, &surf_workstation_resource);
-}
-
-void surf_workstation_resource_init_KCCFLN05_Reno(const char *filename)
-{
- xbt_assert0(!surf_cpu_resource, "CPU resource type already defined");
- xbt_assert0(!surf_network_resource, "network resource type already defined");
- resource_init_internal();
- parse_file(filename);
-
- lmm_set_default_protocol_functions(func_reno_fpi);
-
- surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Reno)";
- use_lagrange_solver=1;
- xbt_dynar_push(resource_list, &surf_workstation_resource);
-}
-
-
-
