X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db8a1188f020fa641b311dc3ca15a9775a6df67a..688697437ee29632f93998b1d41fcc0f8cb9faee:/src/surf/workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 22c141b6d0..f55900372f 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -5,14 +5,12 @@
 /* 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_private.h"
 #include "cpu_private.h"
 #include "network_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(workstation, surf,
-				"Logging specific to the SURF workstation module");
-
 surf_workstation_resource_t surf_workstation_resource = NULL;
 
 xbt_dict_t workstation_set = NULL;
@@ -38,15 +36,16 @@ static void workstation_free(void *workstation)
 
 static void create_workstations(void)
 {
-   xbt_dict_cursor_t cursor = NULL;
+  xbt_dict_cursor_t cursor = NULL;
   char *name = NULL;
   void *cpu = NULL;
   void *nw_card = NULL;
 
   xbt_dict_foreach(cpu_set, cursor, name, cpu) {
-    nw_card = NULL;
-    xbt_dict_get(network_card_set, name, (void *) &nw_card);
-    xbt_assert1(nw_card, "No corresponding card found for %s",name);
+    nw_card = xbt_dict_get_or_null(network_card_set, name);
+    xbt_assert1(nw_card,
+		"No corresponding card found for %s",name);
+
     xbt_dict_set(workstation_set, name,
 		 workstation_new(name, cpu, nw_card), workstation_free);
   }
@@ -54,11 +53,7 @@ static void create_workstations(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)
@@ -110,7 +105,7 @@ static void action_use(surf_action_t action)
   else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
     surf_cpu_resource->common_public->action_use(action);
   else if(action->resource_type==(surf_resource_t)surf_workstation_resource)
-    return parallel_action_use(action);
+    parallel_action_use(action);
   else DIE_IMPOSSIBLE;
   return;
 }
@@ -122,7 +117,7 @@ static void action_cancel(surf_action_t action)
   else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
     surf_cpu_resource->common_public->action_cancel(action);
   else if(action->resource_type==(surf_resource_t)surf_workstation_resource)
-    return parallel_action_use(action);
+    parallel_action_use(action);
   else DIE_IMPOSSIBLE;
   return;
 }
@@ -160,8 +155,10 @@ static void update_actions_state(double now, double delta)
   surf_action_parallel_task_CSL05_t next_action = NULL;
   xbt_swag_t running_actions =
       surf_workstation_resource->common_public->states.running_action_set;
+  /* FIXME: unused
   xbt_swag_t failed_actions =
       surf_workstation_resource->common_public->states.failed_action_set;
+  */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
     surf_double_update(&(action->generic_action.remains),
@@ -262,6 +259,15 @@ static void action_set_max_duration(surf_action_t action, double duration)
     surf_cpu_resource->common_public->set_max_duration(action,duration);
   else  DIE_IMPOSSIBLE;
 }
+ 
+static void action_set_priority(surf_action_t action, double priority)
+{
+  if(action->resource_type==(surf_resource_t)surf_network_resource)
+    surf_network_resource->common_public->set_priority(action,priority);
+  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
+    surf_cpu_resource->common_public->set_priority(action,priority);
+  else  DIE_IMPOSSIBLE;
+}
 
 static surf_action_t communicate(void *workstation_src,
 				 void *workstation_dst, double size,
@@ -284,6 +290,12 @@ static double get_speed(void *workstation, double load)
       get_speed(((workstation_CLM03_t) workstation)->cpu, load);
 }
 
+static double get_available_speed(void *workstation)
+{
+  return surf_cpu_resource->extension_public->
+      get_available_speed(((workstation_CLM03_t) workstation)->cpu);
+}
+
 static surf_action_t execute_parallel_task (int workstation_nb,
 					    void **workstation_list,
 					    double *computation_amount,
@@ -375,6 +387,12 @@ static surf_action_t execute_parallel_task (int workstation_nb,
   return (surf_action_t) action;
 }
 
+static const void** get_route(void *src, void *dst) {
+  /* TODO */
+
+  return NULL;
+}
+
 static void finalize(void)
 {
   xbt_dict_free(&workstation_set);
@@ -444,14 +462,17 @@ static void surf_workstation_resource_init_internal(void)
   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->common_public->set_priority = action_set_priority;
 
   surf_workstation_resource->extension_public->execute = execute;
   surf_workstation_resource->extension_public->sleep = action_sleep;
   surf_workstation_resource->extension_public->get_state = get_state;
   surf_workstation_resource->extension_public->get_speed = get_speed;
+  surf_workstation_resource->extension_public->get_available_speed = get_available_speed;
   surf_workstation_resource->extension_public->communicate = communicate;
   surf_workstation_resource->extension_public->execute_parallel_task = 
     execute_parallel_task;
+  surf_workstation_resource->extension_public->get_route = get_route;
 
   workstation_set = xbt_dict_new();