ONGOING work on exceptions plus minor cleanups.

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

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index bd39c5e..1d9eda7 100644 (file)
--- 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]
 
 /**************************************/
@@ -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)
@@ -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(network_link_set, links[i]);
     free(links[i]);
   }
   free(links);
@@ -389,6 +386,11 @@ static int action_network_KCCFLN05_free(surf_action_t action)
   return 0;
 }
 
+static void action_network_KCCFLN05_use(surf_action_t action)
+{
+  action->using++;
+}
+
 static double share_network_KCCFLN05_resources(double now)
 {
  s_surf_action_network_KCCFLN05_t action;
@@ -436,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);
@@ -509,6 +512,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,
@@ -545,6 +559,11 @@ static int action_cpu_KCCFLN05_free(surf_action_t action)
   return 0;
 }
 
+static void action_cpu_KCCFLN05_use(surf_action_t action)
+{
+  action->using++;
+}
+
 static void action_cpu_KCCFLN05_change_state(surf_action_t action,
                                e_surf_action_state_t state)
 {
@@ -559,13 +578,6 @@ static void action_cpu_KCCFLN05_change_state(surf_action_t action,
   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;
@@ -642,8 +654,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),
@@ -818,10 +832,10 @@ static int action_is_suspended(surf_action_t action)
 static void action_set_max_duration(surf_action_t action, double duration)
 {
   if(action->resource_type==(surf_resource_t)surf_network_resource) 
-    return surf_network_resource->common_public->set_max_duration(action,duration);
-  if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
-    return surf_cpu_resource->common_public->set_max_duration(action,duration);
-  DIE_IMPOSSIBLE;
+    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;
 }
 
 
@@ -878,6 +892,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;
@@ -966,6 +981,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;
@@ -988,7 +1004,6 @@ static void network_KCCFLN05_resource_init_internal(void)
 
   network_link_set = xbt_dict_new();
 
-
   maxmin_system_network_KCCFLN05 = lmm_system_new();
 }
 
@@ -1058,6 +1073,9 @@ static void workstation_KCCFLN05_resource_init_internal(void)
 /*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;
+
 }
 
 /**************************************/