X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04b62daf10d4a89e8a74ec793403183009da153b..e9af650f7b0e1eb307aecd28d81f16c007421237:/src/surf/workstation_KCCFLN05.c

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 1c3288c74a..894ffa3ba3 100644
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -489,7 +489,7 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate)
   action->generic_action.cost = size;
   action->generic_action.remains = size;
   action->generic_action.max_duration = NO_MAX_DURATION;
-  action->generic_action.start = -1.0;
+  action->generic_action.start = surf_get_clock();
   action->generic_action.finish = -1.0;
   action->src = src;
   action->dst = dst;
@@ -548,31 +548,125 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate)
   return (surf_action_t) action;
 }
 
-/* FIXME: execute_parallel_task */
-static surf_action_t execute_parallel_task(int cpu_nb,
-					   void **cpu_list, 
+static surf_action_t execute_parallel_task(int workstation_nb,
+					   void **workstation_list, 
 					   double *computation_amount, 
 					   double *communication_amount,
 					   double amount,
 					   double rate)
 {
-  DIE_IMPOSSIBLE;
-  return NULL;
+  surf_action_workstation_KCCFLN05_t action = NULL;
+  int i, j, k;
+  static xbt_dict_t network_link_set;
+  static int first_run = 1;
+  int nb_link = 0;
+  int nb_host = 0;
+
+  if (first_run) {
+    network_link_set = xbt_dict_new_ext(workstation_nb * workstation_nb * 10);
+    first_run = 0;
+  }
+  else {
+    xbt_dict_reset(network_link_set);
+  }
+
+  /* Compute the number of affected resources... */
+  for(i=0; i< workstation_nb; i++) {
+    for(j=0; j< workstation_nb; j++) {
+      cpu_KCCFLN05_t card_src = workstation_list[i];
+      cpu_KCCFLN05_t card_dst = workstation_list[j];
+      int route_size = ROUTE(card_src->id, card_dst->id).size;
+      network_link_KCCFLN05_t *route = ROUTE(card_src->id, card_dst->id).links;
+      
+      if(communication_amount[i*workstation_nb+j]>0)
+	for(k=0; k< route_size; k++) {
+	  xbt_dict_set(network_link_set, route[k]->name, route[k], NULL);
+	}
+    }
+  }
+
+  nb_link = xbt_dict_length(network_link_set);
+
+  for (i = 0; i<workstation_nb; i++)
+    if(computation_amount[i]>0) nb_host++;
+ 
+  if(nb_link + workstation_nb == 0)
+    return NULL;
+
+  action = xbt_new0(s_surf_action_workstation_KCCFLN05_t, 1);
+  action->generic_action.using = 1;
+  action->generic_action.cost = amount;
+  action->generic_action.remains = amount;
+  action->generic_action.max_duration = NO_MAX_DURATION;
+  action->generic_action.start = -1.0;
+  action->generic_action.finish = -1.0;
+  action->generic_action.resource_type =
+      (surf_resource_t) surf_workstation_resource;
+  action->suspended = 0;  /* Should be useless because of the
+			     calloc but it seems to help valgrind... */
+  action->generic_action.state_set =
+      surf_workstation_resource->common_public->states.running_action_set;
+
+  xbt_swag_insert(action, action->generic_action.state_set);
+  action->rate = rate;
+
+  if(action->rate>0)
+    action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0,
+					nb_host + nb_link);
+  else   
+    action->variable = lmm_variable_new(maxmin_system, action, 1.0, action->rate,
+					nb_host + nb_link);
+
+  for (i = 0; i<workstation_nb; i++)
+    if(computation_amount[i]>0)
+      lmm_expand(maxmin_system, ((cpu_KCCFLN05_t) workstation_list[i])->constraint, 
+		 action->variable, computation_amount[i]);
+
+  for (i=0; i<workstation_nb; i++) {
+    for(j=0; j< workstation_nb; j++) {
+      cpu_KCCFLN05_t card_src = workstation_list[i];
+      cpu_KCCFLN05_t card_dst = workstation_list[j];
+      int route_size = ROUTE(card_src->id, card_dst->id).size;
+      network_link_KCCFLN05_t *route = ROUTE(card_src->id, card_dst->id).links;
+      
+      for(k=0; k< route_size; k++) {
+	if(communication_amount[i*workstation_nb+j]>0) {
+	  lmm_expand_add(maxmin_system, route[k]->constraint, 
+		       action->variable, communication_amount[i*workstation_nb+j]);
+	}
+      }
+    }
+  }
+  
+  return (surf_action_t) action;
 }
 
-static void* get_route(void *src, void *dst) {
-  /* TODO: return a NULL-terminated array of network_link_KCCFLN05_t */
+/* returns an array of network_link_KCCFLN05_t */
+static const void** get_route(void *src, void *dst) {
+  cpu_KCCFLN05_t card_src = src;
+  cpu_KCCFLN05_t card_dst = dst;
+  route_KCCFLN05_t route = &(ROUTE(card_src->id, card_dst->id));
+
+  return (const void**) route->links;
+}
 
+static int get_route_size(void *src, void *dst) {
   cpu_KCCFLN05_t card_src = src;
   cpu_KCCFLN05_t card_dst = dst;
   route_KCCFLN05_t route = &(ROUTE(card_src->id, card_dst->id));
-  int route_size = route->size;
+  return route->size;
+}
 
-  network_link_KCCFLN05_t *link_list = route->links;
-  link_list = xbt_realloc(link_list, (route_size+1) * sizeof(route_KCCFLN05_t));
-  link_list[route_size] = NULL;
+static const char *get_link_name(const void *link) {
+  return ((network_link_KCCFLN05_t) link)->name;
+}
+
+static double get_link_bandwidth(const void *link) {
+  return ((network_link_KCCFLN05_t) link)->bw_current;
+}
 
-  return link_list;
+static double get_link_latency(const void *link) {
+  return ((network_link_KCCFLN05_t) link)->lat_current;
 }
 
 /**************************************/
@@ -898,6 +992,10 @@ static void resource_init_internal(void)
   surf_workstation_resource->common_public->name_service = name_service;
   surf_workstation_resource->common_public->get_resource_name = get_resource_name;
   surf_workstation_resource->common_public->action_get_state = surf_action_get_state;
+  surf_workstation_resource->common_public->action_get_start_time =
+      surf_action_get_start_time;
+  surf_workstation_resource->common_public->action_get_finish_time =
+      surf_action_get_finish_time;
   surf_workstation_resource->common_public->action_use = action_use;
   surf_workstation_resource->common_public->action_free = action_free;
   surf_workstation_resource->common_public->action_cancel = action_cancel;
@@ -925,6 +1023,10 @@ static void resource_init_internal(void)
   surf_workstation_resource->extension_public->communicate = communicate;
   surf_workstation_resource->extension_public->execute_parallel_task = execute_parallel_task;
   surf_workstation_resource->extension_public->get_route = get_route;
+  surf_workstation_resource->extension_public->get_route_size = get_route_size;
+  surf_workstation_resource->extension_public->get_link_name = get_link_name;
+  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();
   network_link_set = xbt_dict_new();