move comments around so that they don't induce a syntax error in the generated config...

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

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index bd39c5e..3e0aa33 100644 (file)
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -389,6 +389,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;
@@ -545,6 +550,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 +569,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;
@@ -818,10 +821,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 +881,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 +970,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;