X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0501f8c994f9488d43010fb5989f284ae7de8ff6..b5ded4c27fcbc0e3487b182cdacdb321ba4ab85d:/src/surf/workstation_KCCFLN05.c

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 4845325546..9b51404504 100644
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -16,6 +16,7 @@ static int nb_workstation = 0;
 static s_route_KCCFLN05_t *routing_table = NULL;
 #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;
 
 /*xbt_dict_t network_link_set = NULL;*/
 
@@ -251,10 +252,10 @@ static void update_actions_state(double now, double delta)
     deltap = delta;
     if (action->latency > 0) {
       if (action->latency > deltap) {
-	surf_double_update(&(action->latency), deltap);
+	double_update(&(action->latency), deltap);
 	deltap = 0.0;
       } else {
-	surf_double_update(&(deltap), action->latency);
+	double_update(&(deltap), action->latency);
 	action->latency = 0.0;
       }
       if ((action->latency == 0.0) && !(action->suspended)) {
@@ -265,10 +266,14 @@ static void update_actions_state(double now, double delta)
 				     action->lat_current);
       }
     }
-    surf_double_update(&(action->generic_action.remains),
+    DEBUG3("Action (%p) : remains (%g) updated by %g.",
+	   action, action->generic_action.remains,
+	   lmm_variable_getvalue(action->variable) * deltap);
+    double_update(&(action->generic_action.remains),
 		       lmm_variable_getvalue(action->variable) * deltap);
+
     if (action->generic_action.max_duration != NO_MAX_DURATION)
-      surf_double_update(&(action->generic_action.max_duration), delta);
+      double_update(&(action->generic_action.max_duration), delta);
 
     /*   if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
 
@@ -374,6 +379,9 @@ static void finalize(void)
 
   xbt_dict_free(&network_link_set);
   xbt_dict_free(&workstation_set);
+  if (parallel_task_network_link_set != NULL) {
+    xbt_dict_free(&parallel_task_network_link_set);
+  }
   xbt_swag_free(surf_workstation_resource->common_public->states.
 		ready_action_set);
   xbt_swag_free(surf_workstation_resource->common_public->states.
@@ -557,19 +565,13 @@ static surf_action_t execute_parallel_task(int workstation_nb,
 {
   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;
+  if (parallel_task_network_link_set == NULL) {
+    parallel_task_network_link_set = xbt_dict_new_ext(workstation_nb * workstation_nb * 10);
   }
-  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++) {
@@ -580,20 +582,24 @@ static surf_action_t execute_parallel_task(int workstation_nb,
       
       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_set(parallel_task_network_link_set, route[k]->name, route[k], NULL);
 	}
     }
   }
+  nb_link = xbt_dict_length(parallel_task_network_link_set);
+  xbt_dict_reset(parallel_task_network_link_set);
 
-  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)
+
+  if(nb_link + nb_host == 0) /* was workstation_nb... */
     return NULL;
 
   action = xbt_new0(s_surf_action_workstation_KCCFLN05_t, 1);
+  DEBUG3("Creating a parallel task (%p) with %d cpus and %d links.",
+	 action, nb_host,  nb_link);
   action->generic_action.using = 1;
   action->generic_action.cost = amount;
   action->generic_action.remains = amount;
@@ -950,7 +956,7 @@ static void parse_file(const char *file)
     if(!ROUTE(i,i).size) {
       if(!loopback)
 	loopback = network_link_new(xbt_strdup("__MSG_loopback__"), 
-				   498.00, NULL, 0.000015, NULL, 
+				   498000000, NULL, 0.000015, NULL, 
 				   SURF_NETWORK_LINK_ON, NULL,
 				   SURF_NETWORK_LINK_FATPIPE);
       ROUTE(i,i).size=1;
@@ -1043,3 +1049,15 @@ void surf_workstation_resource_init_KCCFLN05(const char *filename)
 
   xbt_dynar_push(resource_list, &surf_workstation_resource);
 }
+
+void surf_workstation_resource_init_KCCFLN05_proportionnal(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 (proportionnal)";
+  use_sdp_solver=1;
+  xbt_dynar_push(resource_list, &surf_workstation_resource);
+}