X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/899a3b2de973f018bd96d419212ee4cdb2860b85..db8a1188f020fa641b311dc3ca15a9775a6df67a:/src/surf/workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index b0c219ce55..22c141b6d0 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -17,10 +17,10 @@ surf_workstation_resource_t surf_workstation_resource = NULL;
 
 xbt_dict_t workstation_set = NULL;
 
-static workstation_t workstation_new(const char *name,
+static workstation_CLM03_t workstation_new(const char *name,
 				     void *cpu, void *card)
 {
-  workstation_t workstation = xbt_new0(s_workstation_t, 1);
+  workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1);
 
   workstation->resource = (surf_resource_t) surf_workstation_resource;
   workstation->name = xbt_strdup(name);
@@ -32,13 +32,13 @@ static workstation_t workstation_new(const char *name,
 
 static void workstation_free(void *workstation)
 {
-  xbt_free(((workstation_t)workstation)->name);
-  xbt_free(workstation);
+  free(((workstation_CLM03_t)workstation)->name);
+  free(workstation);
 }
 
 static void create_workstations(void)
 {
-  xbt_dict_cursor_t cursor = NULL;
+   xbt_dict_cursor_t cursor = NULL;
   char *name = NULL;
   void *cpu = NULL;
   void *nw_card = NULL;
@@ -46,7 +46,7 @@ static void create_workstations(void)
   xbt_dict_foreach(cpu_set, cursor, name, cpu) {
     nw_card = NULL;
     xbt_dict_get(network_card_set, name, (void *) &nw_card);
-    xbt_assert0(nw_card, "No corresponding card found");
+    xbt_assert1(nw_card, "No corresponding card found for %s",name);
     xbt_dict_set(workstation_set, name,
 		 workstation_new(name, cpu, nw_card), workstation_free);
   }
@@ -63,7 +63,7 @@ static void *name_service(const char *name)
 
 static const char *get_resource_name(void *resource_id)
 {
-  return ((workstation_t) resource_id)->name;
+  return ((workstation_CLM03_t) resource_id)->name;
 }
 
 static int resource_used(void *resource_id)
@@ -73,23 +73,63 @@ static int resource_used(void *resource_id)
   return 0;
 }
 
-static void action_free(surf_action_t action)
+static int parallel_action_free(surf_action_t action)
+{
+  action->using--;
+  if(!action->using) {
+    xbt_swag_remove(action, action->state_set);
+    if(((surf_action_parallel_task_CSL05_t)action)->variable)
+      lmm_variable_free(maxmin_system, ((surf_action_parallel_task_CSL05_t)action)->variable);
+    free(action);
+    return 1;
+  }
+  return 0;
+}
+
+static void parallel_action_use(surf_action_t action)
+{
+  action->using++;
+}
+
+static int action_free(surf_action_t action)
 {
   if(action->resource_type==(surf_resource_t)surf_network_resource) 
-    surf_network_resource->common_public->action_free(action);
+    return surf_network_resource->common_public->action_free(action);
   else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
-    surf_cpu_resource->common_public->action_free(action);
+    return surf_cpu_resource->common_public->action_free(action);
+  else if(action->resource_type==(surf_resource_t)surf_workstation_resource)
+    return parallel_action_free(action);
+  else DIE_IMPOSSIBLE;
+  return 0;
+}
+
+static void action_use(surf_action_t action)
+{
+  if(action->resource_type==(surf_resource_t)surf_network_resource) 
+    surf_network_resource->common_public->action_use(action);
+  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
+    surf_cpu_resource->common_public->action_use(action);
+  else if(action->resource_type==(surf_resource_t)surf_workstation_resource)
+    return parallel_action_use(action);
   else DIE_IMPOSSIBLE;
   return;
 }
 
 static void action_cancel(surf_action_t action)
 {
+  if(action->resource_type==(surf_resource_t)surf_network_resource) 
+    surf_network_resource->common_public->action_cancel(action);
+  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
+    surf_cpu_resource->common_public->action_cancel(action);
+  else if(action->resource_type==(surf_resource_t)surf_workstation_resource)
+    return parallel_action_use(action);
+  else DIE_IMPOSSIBLE;
   return;
 }
 
 static void action_recycle(surf_action_t action)
 {
+  DIE_IMPOSSIBLE;
   return;
 }
 
@@ -100,18 +140,71 @@ static void action_change_state(surf_action_t action,
     surf_network_resource->common_public->action_change_state(action,state);
   else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
     surf_cpu_resource->common_public->action_change_state(action,state);
+  else if(action->resource_type==(surf_resource_t)surf_workstation_resource)
+    surf_action_change_state(action, state);
   else DIE_IMPOSSIBLE;
   return;
 }
 
 static double share_resources(double now)
 {
-  return -1.0;
+  s_surf_action_parallel_task_CSL05_t action;
+  return generic_maxmin_share_resources(surf_workstation_resource->common_public->
+					states.running_action_set,
+					xbt_swag_offset(action, variable));
 }
 
-
 static void update_actions_state(double now, double delta)
 {
+  surf_action_parallel_task_CSL05_t action = NULL;
+  surf_action_parallel_task_CSL05_t next_action = NULL;
+  xbt_swag_t running_actions =
+      surf_workstation_resource->common_public->states.running_action_set;
+  xbt_swag_t failed_actions =
+      surf_workstation_resource->common_public->states.failed_action_set;
+
+  xbt_swag_foreach_safe(action, next_action, running_actions) {
+    surf_double_update(&(action->generic_action.remains),
+	lmm_variable_getvalue(action->variable) * delta);
+    if (action->generic_action.max_duration != NO_MAX_DURATION)
+      surf_double_update(&(action->generic_action.max_duration), delta);
+    if ((action->generic_action.remains <= 0) && 
+	(lmm_get_variable_weight(action->variable)>0)) {
+      action->generic_action.finish = surf_get_clock();
+      action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+    } else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
+	       (action->generic_action.max_duration <= 0)) {
+      action->generic_action.finish = surf_get_clock();
+      action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+    } else {			/* Need to check that none of the resource has failed */
+      lmm_constraint_t cnst = NULL;
+      int i = 0;
+      surf_resource_t resource = NULL;
+
+      while ((cnst =
+	      lmm_get_cnst_from_var(maxmin_system, action->variable,
+				    i++))) {
+	resource = (surf_resource_t) lmm_constraint_id(cnst);
+	if(resource== (surf_resource_t) surf_cpu_resource) {
+	  cpu_Cas01_t cpu = lmm_constraint_id(cnst);
+	  if (cpu->state_current == SURF_CPU_OFF) {
+	    action->generic_action.finish = surf_get_clock();
+	    action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
+	    break;
+	  }
+	} else if (resource== (surf_resource_t) surf_network_resource) {
+	  network_link_CM02_t nw_link = lmm_constraint_id(cnst);
+
+	  if (nw_link->state_current == SURF_NETWORK_LINK_OFF) {
+	    action->generic_action.finish = surf_get_clock();
+	    action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
+	    break;
+	  }
+	} 
+      }
+    }
+  }
+
   return;
 }
 
@@ -125,13 +218,13 @@ static void update_resource_state(void *id,
 static surf_action_t execute(void *workstation, double size)
 {
   return surf_cpu_resource->extension_public->
-      execute(((workstation_t) workstation)->cpu, size);
+      execute(((workstation_CLM03_t) workstation)->cpu, size);
 }
 
 static surf_action_t action_sleep(void *workstation, double duration)
 {
   return surf_cpu_resource->extension_public->
-      sleep(((workstation_t) workstation)->cpu, duration);
+      sleep(((workstation_CLM03_t) workstation)->cpu, duration);
 }
 
 static void action_suspend(surf_action_t action)
@@ -161,19 +254,125 @@ static int action_is_suspended(surf_action_t action)
   DIE_IMPOSSIBLE;
 }
 
+static void action_set_max_duration(surf_action_t action, double duration)
+{
+  if(action->resource_type==(surf_resource_t)surf_network_resource)
+    surf_network_resource->common_public->set_max_duration(action,duration);
+  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
+    surf_cpu_resource->common_public->set_max_duration(action,duration);
+  else  DIE_IMPOSSIBLE;
+}
+
 static surf_action_t communicate(void *workstation_src,
 				 void *workstation_dst, double size,
 				 double rate)
 {
   return surf_network_resource->extension_public->
-      communicate(((workstation_t) workstation_src)->network_card,
-		  ((workstation_t) workstation_dst)->network_card, size, rate);
+      communicate(((workstation_CLM03_t) workstation_src)->network_card,
+		  ((workstation_CLM03_t) workstation_dst)->network_card, size, rate);
 }
 
 static e_surf_cpu_state_t get_state(void *workstation)
 {
   return surf_cpu_resource->extension_public->
-      get_state(((workstation_t) workstation)->cpu);
+      get_state(((workstation_CLM03_t) workstation)->cpu);
+}
+
+static double get_speed(void *workstation, double load)
+{
+  return surf_cpu_resource->extension_public->
+      get_speed(((workstation_CLM03_t) workstation)->cpu, load);
+}
+
+static surf_action_t execute_parallel_task (int workstation_nb,
+					    void **workstation_list,
+					    double *computation_amount,
+					    double *communication_amount,
+					    double amount,
+					    double rate)
+{
+  surf_action_parallel_task_CSL05_t action = NULL;
+  int i, j, k;
+  xbt_dict_t network_link_set = xbt_dict_new();
+  xbt_dict_cursor_t cursor = NULL;
+  char *name = NULL;
+  int nb_link = 0;
+  int nb_host = 0;
+  network_link_CM02_t link;
+
+  /* Compute the number of affected resources... */
+  for(i=0; i< workstation_nb; i++) {
+    for(j=0; j< workstation_nb; j++) {
+      network_card_CM02_t card_src = ((workstation_CLM03_t*)workstation_list)[i]->network_card;
+      network_card_CM02_t card_dst = ((workstation_CLM03_t*)workstation_list)[j]->network_card;
+      int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
+      network_link_CM02_t *route = ROUTE(card_src->id, card_dst->id);
+      
+      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);
+	}
+    }
+  }
+
+  xbt_dict_foreach(network_link_set, cursor, name, link) {
+    nb_link++;
+  }
+
+  xbt_dict_free(&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_parallel_task_CSL05_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_Cas01_t) ((workstation_CLM03_t) workstation_list[i])->cpu)->constraint, 
+		 action->variable, computation_amount[i]);
+
+  for (i=0; i<workstation_nb; i++) {
+    for(j=0; j< workstation_nb; j++) {
+      network_card_CM02_t card_src = ((workstation_CLM03_t*)workstation_list)[i]->network_card;
+      network_card_CM02_t card_dst = ((workstation_CLM03_t*)workstation_list)[j]->network_card;
+      int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
+      network_link_CM02_t *route = ROUTE(card_src->id, card_dst->id);
+      
+      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 finalize(void)
@@ -186,11 +385,11 @@ static void finalize(void)
 		failed_action_set);
   xbt_swag_free(surf_workstation_resource->common_public->states.done_action_set);
 
-  xbt_free(surf_workstation_resource->common_public);
-  xbt_free(surf_workstation_resource->common_private);
-  xbt_free(surf_workstation_resource->extension_public);
+  free(surf_workstation_resource->common_public);
+  free(surf_workstation_resource->common_private);
+  free(surf_workstation_resource->extension_public);
 
-  xbt_free(surf_workstation_resource);
+  free(surf_workstation_resource);
   surf_workstation_resource = NULL;
 }
 
@@ -223,6 +422,7 @@ static void surf_workstation_resource_init_internal(void)
   surf_workstation_resource->common_public->action_get_state =
       surf_action_get_state;
   surf_workstation_resource->common_public->action_free = action_free;
+  surf_workstation_resource->common_public->action_use = action_use;
   surf_workstation_resource->common_public->action_cancel = action_cancel;
   surf_workstation_resource->common_public->action_recycle =
       action_recycle;
@@ -243,11 +443,15 @@ static void surf_workstation_resource_init_internal(void)
   surf_workstation_resource->common_public->suspend = action_suspend;
   surf_workstation_resource->common_public->resume = action_resume;
   surf_workstation_resource->common_public->is_suspended = action_is_suspended;
+  surf_workstation_resource->common_public->set_max_duration = action_set_max_duration;
 
   surf_workstation_resource->extension_public->execute = execute;
   surf_workstation_resource->extension_public->sleep = action_sleep;
   surf_workstation_resource->extension_public->get_state = get_state;
+  surf_workstation_resource->extension_public->get_speed = get_speed;
   surf_workstation_resource->extension_public->communicate = communicate;
+  surf_workstation_resource->extension_public->execute_parallel_task = 
+    execute_parallel_task;
 
   workstation_set = xbt_dict_new();