Typos : a lot of mecanism -> mechanism and functional -> functionnal

[simgrid.git] / src / surf / workstation_KCCFLN05.c

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 1514f84..94af717 100644 (file)
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -26,10 +26,10 @@ s_route_KCCFLN05_t *routing_table = NULL;
 /************ workstation creation *********/
 static void workstation_free(void *workstation)
 {
-  xbt_free(((workstation_KCCFLN05_t)workstation)->name);
+  free(((workstation_KCCFLN05_t)workstation)->name);
   xbt_dynar_free(&(((workstation_KCCFLN05_t)workstation)->incomming_communications));
   xbt_dynar_free(&(((workstation_KCCFLN05_t)workstation)->outgoing_communications));
-  xbt_free(workstation);
+  free(workstation);
 }
 
 static workstation_KCCFLN05_t workstation_new(const char *name,
@@ -185,8 +185,8 @@ static void create_routing_table(void)
 
 static void network_link_free(void *nw_link)
 {
-  xbt_free(((network_link_KCCFLN05_t)nw_link)->name);
-  xbt_free(nw_link);
+  free(((network_link_KCCFLN05_t)nw_link)->name);
+  free(nw_link);
 }
 
 static network_link_KCCFLN05_t network_link_new(char *name,
@@ -255,9 +255,9 @@ static void route_new(int src_id, int dst_id, char **links, int 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]));
-    xbt_free(links[i]);
+    free(links[i]);
   }
-  xbt_free(links);
+  free(links);
   route->impact_on_src=impact_on_src;
   route->impact_on_dst=impact_on_src;
   route->impact_on_src_with_other_recv=impact_on_src_with_other_recv; 
@@ -362,7 +362,8 @@ static void action_network_KCCFLN05_free(surf_action_t action)
   workstation_KCCFLN05_t dst = ((surf_action_network_KCCFLN05_t) action)->dst;
 
   xbt_swag_remove(action, action->state_set);
-  lmm_variable_free(maxmin_system_network_KCCFLN05, 
+  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) {
@@ -379,7 +380,7 @@ static void action_network_KCCFLN05_free(surf_action_t action)
     }
   }
 
-  xbt_free(action);
+  free(action);
 }
 
 static double share_network_KCCFLN05_resources(double now)
@@ -394,11 +395,31 @@ static double share_network_KCCFLN05_resources(double now)
 static void action_network_KCCFLN05_change_state(surf_action_t action,
                                                 e_surf_action_state_t state)
 {
+  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;
+
   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
     if(((surf_action_network_KCCFLN05_t)action)->variable) {
-      lmm_variable_disable(maxmin_system, ((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) {
+      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;
+    }
+  }
   surf_action_change_state(action, state);
   return;
 }
@@ -430,10 +451,6 @@ static void update_actions_network_KCCFLN05_state(double now, double delta)
     }
   }
 
-/*   xbt_swag_foreach_safe(action, next_action, failed_actions) { */
-/*     lmm_variable_disable(maxmin_system_network_KCCFLN05, action->variable); */
-/*   } */
-
   return;
 }
 
@@ -506,8 +523,9 @@ static int network_KCCFLN05_action_is_suspended(surf_action_t action)
 static void action_cpu_KCCFLN05_free(surf_action_t action)
 {
   xbt_swag_remove(action, action->state_set);
-  lmm_variable_free(maxmin_system_cpu_KCCFLN05, ((surf_action_cpu_KCCFLN05_t)action)->variable);
-  xbt_free(action);
+  if(((surf_action_cpu_KCCFLN05_t)action)->variable)
+    lmm_variable_free(maxmin_system_cpu_KCCFLN05, ((surf_action_cpu_KCCFLN05_t)action)->variable);
+  free(action);
 }
 
 static void action_cpu_KCCFLN05_change_state(surf_action_t action,
@@ -515,7 +533,8 @@ static void action_cpu_KCCFLN05_change_state(surf_action_t action,
 {
   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
     if(((surf_action_cpu_KCCFLN05_t)action)->variable) {
-      lmm_variable_disable(maxmin_system, ((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;
     }
 
@@ -540,6 +559,11 @@ static double share_cpu_KCCFLN05_resources(double now)
   int cpt;
   surf_action_network_KCCFLN05_t action;
 
+  if(surf_get_clock()>=475.895) 
+    {
+      W=0.0;
+    }
+
   for(cnst = lmm_get_first_active_constraint(maxmin_system_cpu_KCCFLN05);
       cnst;
       cnst= lmm_get_next_active_constraint(maxmin_system_cpu_KCCFLN05, cnst))
@@ -635,10 +659,6 @@ static void update_actions_cpu_KCCFLN05_state(double now, double delta)
     }
   }
 
-/*   xbt_swag_foreach_safe(action, next_action, failed_actions) { */
-/*     lmm_variable_disable(maxmin_system_cpu_KCCFLN05, action->variable); */
-/*   } */
-
   return;
 }
 
@@ -774,11 +794,11 @@ static void cpu_KCCFLN05_finalize(void)
   xbt_swag_free(surf_cpu_resource->common_public->states.
                failed_action_set);
   xbt_swag_free(surf_cpu_resource->common_public->states.done_action_set);
-  xbt_free(surf_cpu_resource->common_public);
-  xbt_free(surf_cpu_resource->common_private);
-  xbt_free(surf_cpu_resource->extension_public);
+  free(surf_cpu_resource->common_public);
+  free(surf_cpu_resource->common_private);
+  free(surf_cpu_resource->extension_public);
 
-  xbt_free(surf_cpu_resource);
+  free(surf_cpu_resource);
   surf_cpu_resource = NULL;
 
   if (maxmin_system_cpu_KCCFLN05) {
@@ -856,17 +876,17 @@ static void network_KCCFLN05_finalize(void)
                failed_action_set);
   xbt_swag_free(surf_network_resource->common_public->states.
                done_action_set);
-  xbt_free(surf_network_resource->common_public);
-  xbt_free(surf_network_resource->common_private);
-  xbt_free(surf_network_resource->extension_public);
+  free(surf_network_resource->common_public);
+  free(surf_network_resource->common_private);
+  free(surf_network_resource->extension_public);
 
-  xbt_free(surf_network_resource);
+  free(surf_network_resource);
   surf_network_resource = NULL;
 
   for (i = 0; i < nb_workstation; i++) 
     for (j = 0; j < nb_workstation; j++) 
-      xbt_free(ROUTE(i,j).links);
-  xbt_free(routing_table);
+      free(ROUTE(i,j).links);
+  free(routing_table);
   routing_table = NULL;
   nb_workstation = 0;
 
@@ -936,11 +956,11 @@ static void workstation_KCCFLN05_finalize(void)
   xbt_swag_free(surf_workstation_resource->common_public->states.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;
 }