X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..654cf85f8a467bd8f883956476237b670292bb3b:/src/surf/workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 4d6fd9adca..b241314578 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -8,6 +8,9 @@
 #include "xbt/dict.h"
 #include "portable.h"
 #include "surf_private.h"
+#include "surf/surf_resource.h"
+
+
 
 typedef struct workstation_CLM03 {
   s_surf_resource_t generic_resource;   /* Must remain first to add this to a trace */
@@ -27,27 +30,27 @@ static workstation_CLM03_t workstation_new(const char *name, void *cpu)
   workstation->generic_resource.name = xbt_strdup(name);
   workstation->cpu = cpu;
 
-  xbt_dict_set(surf_model_resource_set(surf_workstation_model), name,
-               workstation, surf_resource_free);
+  xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, workstation);
 
   return workstation;
 }
 
 void create_workstations(void)
 {
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_lib_cursor_t cursor = NULL;
   char *name = NULL;
-  void *cpu = NULL;
+  void **cpu = NULL;
 
-  xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, name,
-                   cpu) {
-    workstation_new(name, cpu);
+  xbt_lib_foreach(host_lib, cursor, name, cpu) {
+	  if(cpu[SURF_CPU_LEVEL])
+		  workstation_new(name, cpu[SURF_CPU_LEVEL]);
   }
 }
 
 static int ws_resource_used(void *resource_id)
 {
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
+  return -1;
 }
 
 static void ws_parallel_action_cancel(surf_action_t action)
@@ -58,6 +61,7 @@ static void ws_parallel_action_cancel(surf_action_t action)
 static int ws_parallel_action_free(surf_action_t action)
 {
   THROW_UNIMPLEMENTED;          /* This model does not implement parallel tasks */
+  return -1;
 }
 
 static int ws_action_unref(surf_action_t action)
@@ -156,6 +160,7 @@ static int ws_action_is_suspended(surf_action_t action)
   if (action->model_type == surf_cpu_model)
     return surf_cpu_model->is_suspended(action);
   DIE_IMPOSSIBLE;
+  return -1;
 }
 
 static void ws_action_set_max_duration(surf_action_t action,
@@ -179,14 +184,25 @@ static void ws_action_set_priority(surf_action_t action, double priority)
     DIE_IMPOSSIBLE;
 }
 
+#ifdef HAVE_TRACING
+static void ws_action_set_category(surf_action_t action, const char *category)
+{
+  if (action->model_type == surf_network_model)
+    surf_network_model->set_category(action, category);
+  else if (action->model_type == surf_cpu_model)
+    surf_cpu_model->set_category(action, category);
+  else
+    DIE_IMPOSSIBLE;
+}
+#endif
+
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 static int ws_get_latency_limited(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
     return surf_network_model->get_latency_limited(action);
-  INFO0
-      ("You tried to ask if a non network action is limited by latency, aborting...");
-  DIE_IMPOSSIBLE;
+  else
+    return 0;
 }
 #endif
 
@@ -197,6 +213,7 @@ static double ws_action_get_remains(surf_action_t action)
   if (action->model_type == surf_cpu_model)
     return surf_cpu_model->get_remains(action);
   DIE_IMPOSSIBLE;
+  return -1.0;
 }
 
 static surf_action_t ws_communicate(void *workstation_src,
@@ -236,6 +253,7 @@ static surf_action_t ws_execute_parallel_task(int workstation_nb,
                                               double amount, double rate)
 {
   THROW_UNIMPLEMENTED;          /* This model does not implement parallel tasks */
+  return NULL;
 }
 
 
@@ -243,7 +261,7 @@ static surf_action_t ws_execute_parallel_task(int workstation_nb,
 static xbt_dynar_t ws_get_route(void *src, void *dst)
 {
   return surf_network_model->extension.
-      network.get_route(surf_resource_name(src), surf_resource_name(src));
+      network.get_route(surf_resource_name(src), surf_resource_name(dst));
 }
 
 static double ws_get_link_bandwidth(const void *link)
@@ -258,7 +276,7 @@ static double ws_get_link_latency(const void *link)
 
 static int ws_link_shared(const void *link)
 {
-  return surf_network_model->extension.network.get_link_latency(link);
+  return surf_network_model->extension.network.link_shared(link);
 }
 
 static void ws_finalize(void)
@@ -272,6 +290,36 @@ static xbt_dict_t ws_get_properties(const void *ws)
   return surf_resource_properties(((workstation_CLM03_t) ws)->cpu);
 }
 
+static surf_action_t ws_action_open(void *workstation, const char* path, const char* mode)
+{
+  return surf_cpu_model->extension.cpu.
+      sleep(((workstation_CLM03_t) workstation)->cpu, 1);
+}
+
+static surf_action_t ws_action_close(void *workstation, surf_file_t fp)
+{
+  return surf_cpu_model->extension.cpu.
+      sleep(((workstation_CLM03_t) workstation)->cpu, 2);
+}
+
+static surf_action_t ws_action_read(void *workstation, void* ptr, size_t size, size_t nmemb, surf_file_t stream)
+{
+  return surf_cpu_model->extension.cpu.
+      sleep(((workstation_CLM03_t) workstation)->cpu, 3);
+}
+
+static surf_action_t ws_action_write(void *workstation, const void* ptr, size_t size, size_t nmemb, surf_file_t stream)
+{
+  return surf_cpu_model->extension.cpu.
+      sleep(((workstation_CLM03_t) workstation)->cpu, 4);
+}
+
+static surf_action_t ws_action_stat(void *workstation, int fd, void* buf)
+{
+  return surf_cpu_model->extension.cpu.
+      sleep(((workstation_CLM03_t) workstation)->cpu, 5);
+}
+
 static void surf_workstation_model_init_internal(void)
 {
   surf_workstation_model = surf_model_init();
@@ -295,6 +343,9 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->is_suspended = ws_action_is_suspended;
   surf_workstation_model->set_max_duration = ws_action_set_max_duration;
   surf_workstation_model->set_priority = ws_action_set_priority;
+#ifdef HAVE_TRACING
+  surf_workstation_model->set_category = ws_action_set_category;
+#endif
   surf_workstation_model->get_remains = ws_action_get_remains;
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   surf_workstation_model->get_latency_limited = ws_get_latency_limited;
@@ -321,38 +372,30 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->extension.workstation.get_properties =
       ws_get_properties;
 
+  surf_workstation_model->extension.workstation.open = ws_action_open;
+  surf_workstation_model->extension.workstation.close = ws_action_close;
+  surf_workstation_model->extension.workstation.read = ws_action_read;
+  surf_workstation_model->extension.workstation.write = ws_action_write;
+  surf_workstation_model->extension.workstation.stat = ws_action_stat;
 }
 
-/********************************************************************/
-/* The model used in MSG and presented at CCGrid03                  */
-/********************************************************************/
-/* @InProceedings{Casanova.CLM_03, */
-/*   author = {Henri Casanova and Arnaud Legrand and Loris Marchal}, */
-/*   title = {Scheduling Distributed Applications: the SimGrid Simulation Framework}, */
-/*   booktitle = {Proceedings of the third IEEE International Symposium on Cluster Computing and the Grid (CCGrid'03)}, */
-/*   publisher = {"IEEE Computer Society Press"}, */
-/*   month = {may}, */
-/*   year = {2003} */
-/* } */
-void surf_workstation_model_init_CLM03(const char *filename)
+void surf_workstation_model_init_current_default(void)
 {
   surf_workstation_model_init_internal();
-  surf_cpu_model_init_Cas01_im(filename);
-  surf_network_model_init_LegrandVelho(filename);
-  update_model_description(surf_workstation_model_description,
-                           "CLM03", surf_workstation_model);
+  xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", 1);
+  surf_cpu_model_init_Cas01();
+  surf_network_model_init_LegrandVelho();
+
   xbt_dynar_push(model_list, &surf_workstation_model);
+  sg_platf_postparse_add_cb(create_workstations);
 }
 
-void surf_workstation_model_init_compound(const char *filename)
+void surf_workstation_model_init_compound()
 {
 
-  xbt_assert0(surf_cpu_model, "No CPU model defined yet!");
-  xbt_assert0(surf_network_model, "No network model defined yet!");
+  xbt_assert(surf_cpu_model, "No CPU model defined yet!");
+  xbt_assert(surf_network_model, "No network model defined yet!");
   surf_workstation_model_init_internal();
-
-  update_model_description(surf_workstation_model_description,
-                           "compound", surf_workstation_model);
-
   xbt_dynar_push(model_list, &surf_workstation_model);
+  sg_platf_postparse_add_cb(create_workstations);
 }