X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2995193b7e30d03c04917852c4c0b26d26646273..1d6f35064b982906e6931d6e2cfbf22ab51a10b3:/src/surf/workstation_KCCFLN05.c

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 94af7170ca..fc2e0c757a 100644
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -5,6 +5,7 @@
 /* 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. */
 
+#include "xbt/ex.h"
 #include "xbt/dict.h"
 #include "workstation_KCCFLN05_private.h"
 
@@ -16,7 +17,7 @@ static lmm_system_t maxmin_system_cpu_KCCFLN05 = NULL;
 static lmm_system_t maxmin_system_network_KCCFLN05 = NULL;
 static xbt_dict_t network_link_set = NULL;
 static int nb_workstation = 0;
-s_route_KCCFLN05_t *routing_table = NULL;
+static s_route_KCCFLN05_t *routing_table = NULL;
 #define ROUTE(i,j) routing_table[(i)+(j)*nb_workstation]
 
 /**************************************/
@@ -102,7 +103,7 @@ static void parse_workstation(void)
 
   xbt_assert0((A_cpu_state==A_cpu_state_ON)||
 	      (A_cpu_state==A_cpu_state_OFF),
-	      "Invalid state")
+	      "Invalid state");
   if (A_cpu_state==A_cpu_state_ON) state_initial = SURF_CPU_ON;
   if (A_cpu_state==A_cpu_state_OFF) state_initial = SURF_CPU_OFF;
   surf_parse_get_trace(&state_trace,A_cpu_state_file);
@@ -121,11 +122,7 @@ static void parse_workstation(void)
 
 static void *name_service(const char *name)
 {
-  void *workstation = NULL;
-
-  xbt_dict_get(workstation_set, name, &workstation);
-
-  return workstation;
+  return xbt_dict_get_or_null(workstation_set, name);
 }
 
 static const char *get_resource_name(void *resource_id)
@@ -232,7 +229,7 @@ static void parse_network_link(void)
 
   xbt_assert0((A_network_link_state==A_network_link_state_ON)||
 	      (A_network_link_state==A_network_link_state_OFF),
-	      "Invalid state")
+	      "Invalid state");
   if (A_network_link_state==A_network_link_state_ON) 
     state_initial = SURF_NETWORK_LINK_ON;
   if (A_network_link_state==A_network_link_state_OFF) 
@@ -254,7 +251,7 @@ static void route_new(int src_id, int dst_id, char **links, int nb_link,
   route->size= nb_link;
   link_list = route->links = xbt_new0(network_link_KCCFLN05_t, nb_link);
   for (i = 0; i < nb_link; i++) {
-    xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
+    link_list[i] = xbt_dict_get_or_null(network_link_set, links[i]);
     free(links[i]);
   }
   free(links);
@@ -354,33 +351,44 @@ static void update_network_KCCFLN05_state(void *id,
 /*************** actions **************/
 /**************************************/
 /*************** network **************/
-static void action_network_KCCFLN05_free(surf_action_t action)
+static int action_network_KCCFLN05_free(surf_action_t action)
 {
   int cpt;
   surf_action_t act = NULL;
   workstation_KCCFLN05_t src = ((surf_action_network_KCCFLN05_t) action)->src;
   workstation_KCCFLN05_t dst = ((surf_action_network_KCCFLN05_t) action)->dst;
 
-  xbt_swag_remove(action, action->state_set);
-  if(((surf_action_network_KCCFLN05_t)action)->variable)
-    lmm_variable_free(maxmin_system_network_KCCFLN05, 
-		    ((surf_action_network_KCCFLN05_t) action)->variable);
-
-  xbt_dynar_foreach (src->outgoing_communications,cpt,act) {
-    if(act==action) {
-      xbt_dynar_remove_at(src->outgoing_communications, cpt, &act);
-      break;
+  action->using--;
+  if(!action->using) {
+
+    xbt_swag_remove(action, action->state_set);
+    if(((surf_action_network_KCCFLN05_t)action)->variable)
+      lmm_variable_free(maxmin_system_network_KCCFLN05, 
+			((surf_action_network_KCCFLN05_t) action)->variable);
+    
+    xbt_dynar_foreach (src->outgoing_communications,cpt,act) {
+      if(act==action) {
+	xbt_dynar_remove_at(src->outgoing_communications, cpt, &act);
+	break;
+      }
     }
-  }
-
-  xbt_dynar_foreach (dst->incomming_communications,cpt,act) {
-    if(act==action) {
-      xbt_dynar_remove_at(dst->incomming_communications, cpt, &act);
-      break;
+    
+    xbt_dynar_foreach (dst->incomming_communications,cpt,act) {
+      if(act==action) {
+	xbt_dynar_remove_at(dst->incomming_communications, cpt, &act);
+	break;
+      }
     }
+    
+    free(action);
+    return 1;
   }
+  return 0;
+}
 
-  free(action);
+static void action_network_KCCFLN05_use(surf_action_t action)
+{
+  action->using++;
 }
 
 static double share_network_KCCFLN05_resources(double now)
@@ -400,12 +408,12 @@ static void action_network_KCCFLN05_change_state(surf_action_t action,
   workstation_KCCFLN05_t src = ((surf_action_network_KCCFLN05_t) action)->src;
   workstation_KCCFLN05_t dst = ((surf_action_network_KCCFLN05_t) action)->dst;
 
-  if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
-    if(((surf_action_network_KCCFLN05_t)action)->variable) {
-      lmm_variable_disable(maxmin_system_network_KCCFLN05, 
-			   ((surf_action_network_KCCFLN05_t)action)->variable);
-      ((surf_action_network_KCCFLN05_t)action)->variable = NULL;
-    }
+/*   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
+/*     if(((surf_action_network_KCCFLN05_t)action)->variable) { */
+/*       lmm_variable_disable(maxmin_system_network_KCCFLN05,  */
+/* 			   ((surf_action_network_KCCFLN05_t)action)->variable); */
+/*       ((surf_action_network_KCCFLN05_t)action)->variable = NULL; */
+/*     } */
 
   xbt_dynar_foreach (src->outgoing_communications,cpt,act) {
     if(act==action) {
@@ -430,9 +438,10 @@ static void update_actions_network_KCCFLN05_state(double now, double delta)
   surf_action_network_KCCFLN05_t next_action = NULL;
   xbt_swag_t running_actions =
       surf_network_resource->common_public->states.running_action_set;
+  /* FIXME: unused
   xbt_swag_t failed_actions =
       surf_network_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);
@@ -463,8 +472,11 @@ static surf_action_t communicate_KCCFLN05(void *src, void *dst, double size,
   route_KCCFLN05_t route = &ROUTE(card_src->id, card_dst->id);
   int i;
 
+  xbt_assert2(route->size,"You're trying to send data from %s to %s but there is no connexion between these two cards.", card_src->name, card_dst->name);
+
   action = xbt_new0(s_surf_action_network_KCCFLN05_t, 1);
 
+  action->generic_action.using = 1;
   action->generic_action.cost = size;
   action->generic_action.remains = size;
   action->generic_action.max_duration = NO_MAX_DURATION;
@@ -502,6 +514,17 @@ static surf_action_t communicate_KCCFLN05(void *src, void *dst, double size,
   return (surf_action_t) action;
 }
 
+static surf_action_t execute_parallel_task_KCCFLN05 (int workstation_nb,
+						     void **workstation_list,
+						     double *computation_amount,
+						     double *communication_amount,
+						     double amount,
+						     double rate)
+{
+  DIE_IMPOSSIBLE;
+  return NULL;
+}
+
 static void network_KCCFLN05_action_suspend(surf_action_t action)
 {
   lmm_update_variable_weight(maxmin_system_network_KCCFLN05,
@@ -519,36 +542,44 @@ static int network_KCCFLN05_action_is_suspended(surf_action_t action)
   return (lmm_get_variable_weight(((surf_action_network_KCCFLN05_t) action)->variable) == 0.0);
 }
 
+static void network_KCCFLN05_action_set_max_duration(surf_action_t action, double duration)
+{
+  action->max_duration = duration;
+}
+
 /***************** CPU ****************/
-static void action_cpu_KCCFLN05_free(surf_action_t action)
+static int action_cpu_KCCFLN05_free(surf_action_t action)
+{
+  action->using--;
+  if(!action->using) {
+    xbt_swag_remove(action, action->state_set);
+    if(((surf_action_cpu_KCCFLN05_t)action)->variable)
+      lmm_variable_free(maxmin_system_cpu_KCCFLN05, ((surf_action_cpu_KCCFLN05_t)action)->variable);
+    free(action);
+    return 1;
+  }
+  return 0;
+}
+
+static void action_cpu_KCCFLN05_use(surf_action_t action)
 {
-  xbt_swag_remove(action, action->state_set);
-  if(((surf_action_cpu_KCCFLN05_t)action)->variable)
-    lmm_variable_free(maxmin_system_cpu_KCCFLN05, ((surf_action_cpu_KCCFLN05_t)action)->variable);
-  free(action);
+  action->using++;
 }
 
 static void action_cpu_KCCFLN05_change_state(surf_action_t action,
 				e_surf_action_state_t state)
 {
-  if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
-    if(((surf_action_cpu_KCCFLN05_t)action)->variable) {
-      lmm_variable_disable(maxmin_system_cpu_KCCFLN05, 
-			   ((surf_action_cpu_KCCFLN05_t)action)->variable);
-      ((surf_action_cpu_KCCFLN05_t)action)->variable = NULL;
-    }
+/*   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
+/*     if(((surf_action_cpu_KCCFLN05_t)action)->variable) { */
+/*       lmm_variable_disable(maxmin_system_cpu_KCCFLN05,  */
+/* 			   ((surf_action_cpu_KCCFLN05_t)action)->variable); */
+/*       ((surf_action_cpu_KCCFLN05_t)action)->variable = NULL; */
+/*     } */
 
   surf_action_change_state(action, state);
   return;
 }
 
-/* #define WARNING(format, ...) (fprintf(stderr, "[%s , %s : %d] ", __FILE__, __FUNCTION__, __LINE__),\ */
-/*                               fprintf(stderr, format, ## __VA_ARGS__), \ */
-/*                               fprintf(stderr, "\n")) */
-/* #define VOIRP(expr) WARNING("  {" #expr " = %p }", expr) */
-/* #define VOIRD(expr) WARNING("  {" #expr " = %d }", expr) */
-/* #define VOIRG(expr) WARNING("  {" #expr " = %lg }", expr) */
-
 static double share_cpu_KCCFLN05_resources(double now)
 {
   s_surf_action_cpu_KCCFLN05_t s_cpu_action;
@@ -625,8 +656,10 @@ static void update_actions_cpu_KCCFLN05_state(double now, double delta)
   surf_action_cpu_KCCFLN05_t next_action = NULL;
   xbt_swag_t running_actions =
       surf_cpu_resource->common_public->states.running_action_set;
+  /*
   xbt_swag_t failed_actions =
       surf_cpu_resource->common_public->states.failed_action_set;
+  */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
     surf_double_update(&(action->generic_action.remains),
@@ -669,6 +702,7 @@ static surf_action_t execute_KCCFLN05(void *cpu, double size)
 
   action = xbt_new0(s_surf_action_cpu_KCCFLN05_t, 1);
 
+  action->generic_action.using = 1;
   action->generic_action.cost = size;
   action->generic_action.remains = size;
   action->generic_action.max_duration = NO_MAX_DURATION;
@@ -709,6 +743,11 @@ static int cpu_KCCFLN05_action_is_suspended(surf_action_t action)
   return (lmm_get_variable_weight(((surf_action_cpu_KCCFLN05_t) action)->variable) == 0.0);
 }
 
+static void cpu_KCCFLN05_action_set_max_duration(surf_action_t action, double duration)
+{
+  action->max_duration = duration;
+}
+
 /************* workstation ************/
 static void action_change_state(surf_action_t action,
 				e_surf_action_state_t state)
@@ -721,12 +760,22 @@ static void action_change_state(surf_action_t action,
   return;
 }
 
-static void action_free(surf_action_t action)
+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 DIE_IMPOSSIBLE;
+  return 1;
+}
+
+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 DIE_IMPOSSIBLE;
   return;
 }
@@ -782,6 +831,16 @@ 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;
+}
+
+
 /**************************************/
 /********* Module  creation ***********/
 /**************************************/
@@ -835,6 +894,7 @@ static void cpu_KCCFLN05_resource_init_internal(void)
   surf_cpu_resource->common_public->action_get_state =
       surf_action_get_state;
   surf_cpu_resource->common_public->action_free = action_cpu_KCCFLN05_free;
+  surf_cpu_resource->common_public->action_use = action_cpu_KCCFLN05_use;
   surf_cpu_resource->common_public->action_cancel = NULL;
   surf_cpu_resource->common_public->action_recycle = NULL;
   surf_cpu_resource->common_public->action_change_state = action_cpu_KCCFLN05_change_state;
@@ -923,6 +983,7 @@ static void network_KCCFLN05_resource_init_internal(void)
   surf_network_resource->common_public->action_get_state =
       surf_action_get_state;
   surf_network_resource->common_public->action_free = action_network_KCCFLN05_free;
+  surf_network_resource->common_public->action_use = action_network_KCCFLN05_use;
   surf_network_resource->common_public->action_cancel = NULL;
   surf_network_resource->common_public->action_recycle = NULL;
   surf_network_resource->common_public->action_change_state = action_network_KCCFLN05_change_state;
@@ -945,7 +1006,6 @@ static void network_KCCFLN05_resource_init_internal(void)
 
   network_link_set = xbt_dict_new();
 
-
   maxmin_system_network_KCCFLN05 = lmm_system_new();
 }
 
@@ -992,6 +1052,7 @@ static void workstation_KCCFLN05_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 = NULL;
   surf_workstation_resource->common_public->action_recycle = NULL;
   surf_workstation_resource->common_public->action_change_state = action_change_state;
@@ -1008,11 +1069,15 @@ static void workstation_KCCFLN05_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_KCCFLN05;
 /*FIXME*//*  surf_workstation_resource->extension_public->sleep = action_sleep; */
   surf_workstation_resource->extension_public->get_state = get_state;
   surf_workstation_resource->extension_public->communicate = communicate_KCCFLN05;
+  surf_workstation_resource->extension_public->execute_parallel_task = 
+    execute_parallel_task_KCCFLN05;
+
 }
 
 /**************************************/