Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
The interaction between the parser and the surf modules makes more sense now.
[simgrid.git] / src / surf / workstation.c
index 0bfebdb..379cf32 100644 (file)
@@ -5,24 +5,25 @@
 /* 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 "portable.h"
 #include "workstation_private.h"
 #include "cpu_private.h"
 #include "network_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(workstation, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
                                "Logging specific to the SURF workstation module");
 
-surf_workstation_resource_t surf_workstation_resource = NULL;
-
+surf_workstation_model_t surf_workstation_model = NULL;
 xbt_dict_t workstation_set = NULL;
 
-static workstation_t workstation_new(const char *name,
-                                    void *cpu, void *card)
+static workstation_CLM03_t workstation_new(const char *name,
+                                          void *cpu, void *card)
 {
-  workstation_t workstation = xbt_new0(s_workstation_t, 1);
+  workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1);
 
-  workstation->resource = (surf_resource_t) surf_workstation_resource;
+  workstation->model = (surf_model_t) surf_workstation_model;
   workstation->name = xbt_strdup(name);
   workstation->cpu = cpu;
   workstation->network_card = card;
@@ -32,11 +33,11 @@ static workstation_t workstation_new(const char *name,
 
 static void workstation_free(void *workstation)
 {
-  xbt_free(((workstation_t)workstation)->name);
-  xbt_free(workstation);
+  free(((workstation_CLM03_t) workstation)->name);
+  free(workstation);
 }
 
-static void create_workstations(void)
+void create_workstations(void)
 {
   xbt_dict_cursor_t cursor = NULL;
   char *name = NULL;
@@ -44,9 +45,9 @@ static void create_workstations(void)
   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_assert0(nw_card, "No corresponding card found");
+    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,44 +55,95 @@ 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)
 {
-  return ((workstation_t) resource_id)->name;
+  return ((workstation_CLM03_t) resource_id)->name;
 }
 
 static int resource_used(void *resource_id)
 {
-  xbt_assert0(0,
-             "Workstation is a virtual resource. I should not be there!");
+  THROW_IMPOSSIBLE;  /* This model does not implement parallel tasks */
+}
+
+static void parallel_action_cancel(surf_action_t action)
+{
+  THROW_UNIMPLEMENTED;  /* This model does not implement parallel tasks */
+}
+
+static int parallel_action_free(surf_action_t action)
+{
+  THROW_UNIMPLEMENTED;  /* This model does not implement parallel tasks */
+}
+
+static void parallel_action_use(surf_action_t action)
+{
+  THROW_UNIMPLEMENTED;  /* This model does not implement parallel tasks */
+}
+
+static int action_free(surf_action_t action)
+{
+  if (action->model_type == (surf_model_t) surf_network_model)
+    return surf_network_model->common_public->action_free(action);
+  else if (action->model_type == (surf_model_t) surf_cpu_model)
+    return surf_cpu_model->common_public->action_free(action);
+  else if (action->model_type ==
+          (surf_model_t) surf_workstation_model)
+    return parallel_action_free(action);
+  else
+    DIE_IMPOSSIBLE;
   return 0;
 }
 
-static void action_free(surf_action_t action)
+static void action_use(surf_action_t action)
 {
+  if (action->model_type == (surf_model_t) surf_network_model)
+    surf_network_model->common_public->action_use(action);
+  else if (action->model_type == (surf_model_t) surf_cpu_model)
+    surf_cpu_model->common_public->action_use(action);
+  else if (action->model_type ==
+          (surf_model_t) surf_workstation_model)
+    parallel_action_use(action);
+  else
+    DIE_IMPOSSIBLE;
   return;
 }
 
 static void action_cancel(surf_action_t action)
 {
+  if (action->model_type == (surf_model_t) surf_network_model)
+    surf_network_model->common_public->action_cancel(action);
+  else if (action->model_type == (surf_model_t) surf_cpu_model)
+    surf_cpu_model->common_public->action_cancel(action);
+  else if (action->model_type ==
+          (surf_model_t) surf_workstation_model)
+    parallel_action_cancel(action);
+  else
+    DIE_IMPOSSIBLE;
   return;
 }
 
 static void action_recycle(surf_action_t action)
 {
+  DIE_IMPOSSIBLE;
   return;
 }
 
 static void action_change_state(surf_action_t action,
                                e_surf_action_state_t state)
 {
-  surf_action_change_state(action, state);
+  if (action->model_type == (surf_model_t) surf_network_model)
+    surf_network_model->common_public->action_change_state(action,
+                                                             state);
+  else if (action->model_type == (surf_model_t) surf_cpu_model)
+    surf_cpu_model->common_public->action_change_state(action, state);
+  else if (action->model_type ==
+          (surf_model_t) surf_workstation_model)
+    surf_action_change_state(action, state);
+  else
+    DIE_IMPOSSIBLE;
   return;
 }
 
@@ -100,7 +152,6 @@ static double share_resources(double now)
   return -1.0;
 }
 
-
 static void update_actions_state(double now, double delta)
 {
   return;
@@ -110,139 +161,254 @@ static void update_resource_state(void *id,
                                  tmgr_trace_event_t event_type,
                                  double value)
 {
-  return;
+  THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
 }
 
 static surf_action_t execute(void *workstation, double size)
 {
-  return surf_cpu_resource->extension_public->
-      execute(((workstation_t) workstation)->cpu, size);
+  return surf_cpu_model->extension_public->
+      execute(((workstation_CLM03_t) workstation)->cpu, size);
 }
 
 static surf_action_t action_sleep(void *workstation, double duration)
 {
-  return surf_cpu_resource->extension_public->
-      sleep(((workstation_t) workstation)->cpu, duration);
+  return surf_cpu_model->extension_public->
+      sleep(((workstation_CLM03_t) workstation)->cpu, duration);
 }
 
 static void action_suspend(surf_action_t action)
 {
-  if(action->resource_type==(surf_resource_t)surf_network_resource) 
-    surf_network_resource->common_public->suspend(action);
-  else if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
-    surf_cpu_resource->common_public->suspend(action);
-  else DIE_IMPOSSIBLE;
+  if (action->model_type == (surf_model_t) surf_network_model)
+    surf_network_model->common_public->suspend(action);
+  else if (action->model_type == (surf_model_t) surf_cpu_model)
+    surf_cpu_model->common_public->suspend(action);
+  else
+    DIE_IMPOSSIBLE;
 }
 
 static void action_resume(surf_action_t action)
 {
-  if(action->resource_type==(surf_resource_t)surf_network_resource)
-    surf_network_resource->common_public->resume(action);
-  else if(action->resource_type==(surf_resource_t)surf_cpu_resource)
-    surf_cpu_resource->common_public->resume(action);
-  else DIE_IMPOSSIBLE;
+  if (action->model_type == (surf_model_t) surf_network_model)
+    surf_network_model->common_public->resume(action);
+  else if (action->model_type == (surf_model_t) surf_cpu_model)
+    surf_cpu_model->common_public->resume(action);
+  else
+    DIE_IMPOSSIBLE;
 }
 
 static int action_is_suspended(surf_action_t action)
 {
-  if(action->resource_type==(surf_resource_t)surf_network_resource) 
-    return surf_network_resource->common_public->is_suspended(action);
-  if(action->resource_type==(surf_resource_t)surf_cpu_resource) 
-    return surf_cpu_resource->common_public->is_suspended(action);
+  if (action->model_type == (surf_model_t) surf_network_model)
+    return surf_network_model->common_public->is_suspended(action);
+  if (action->model_type == (surf_model_t) surf_cpu_model)
+    return surf_cpu_model->common_public->is_suspended(action);
   DIE_IMPOSSIBLE;
 }
 
+static void action_set_max_duration(surf_action_t action, double duration)
+{
+  if (action->model_type == (surf_model_t) surf_network_model)
+    surf_network_model->common_public->set_max_duration(action,
+                                                          duration);
+  else if (action->model_type == (surf_model_t) surf_cpu_model)
+    surf_cpu_model->common_public->set_max_duration(action, duration);
+  else
+    DIE_IMPOSSIBLE;
+}
+
+static void action_set_priority(surf_action_t action, double priority)
+{
+  if (action->model_type == (surf_model_t) surf_network_model)
+    surf_network_model->common_public->set_priority(action, priority);
+  else if (action->model_type == (surf_model_t) surf_cpu_model)
+    surf_cpu_model->common_public->set_priority(action, priority);
+  else
+    DIE_IMPOSSIBLE;
+}
+
 static surf_action_t communicate(void *workstation_src,
                                 void *workstation_dst, double size,
                                 double rate)
 {
-  return surf_network_resource->extension_public->
-      communicate(((workstation_t) workstation_src)->network_card,
-                 ((workstation_t) workstation_dst)->network_card, size, rate);
+  return surf_network_model->extension_public->
+      communicate(((workstation_CLM03_t) workstation_src)->network_card,
+                 ((workstation_CLM03_t) workstation_dst)->network_card,
+                 size, rate);
 }
 
 static e_surf_cpu_state_t get_state(void *workstation)
 {
-  return surf_cpu_resource->extension_public->
-      get_state(((workstation_t) workstation)->cpu);
+  return surf_cpu_model->extension_public->
+      get_state(((workstation_CLM03_t) workstation)->cpu);
+}
+
+static double get_speed(void *workstation, double load)
+{
+  return surf_cpu_model->extension_public->
+      get_speed(((workstation_CLM03_t) workstation)->cpu, load);
+}
+
+static double get_available_speed(void *workstation)
+{
+  return surf_cpu_model->extension_public->
+      get_available_speed(((workstation_CLM03_t) workstation)->cpu);
+}
+
+static xbt_dict_t get_properties(void *workstation)
+{
+  return surf_cpu_model->common_public->
+      get_properties(((workstation_CLM03_t) workstation)->cpu);
+}
+
+static surf_action_t execute_parallel_task(int workstation_nb,
+                                          void **workstation_list,
+                                          double *computation_amount,
+                                          double *communication_amount,
+                                          double amount,
+                                          double rate)
+{
+  THROW_UNIMPLEMENTED;  /* This model does not implement parallel tasks */
+}
+
+
+/* returns an array of network_link_CM02_t */
+static const void **get_route(void *src, void *dst)
+{
+  workstation_CLM03_t workstation_src = (workstation_CLM03_t) src;
+  workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst;
+  return surf_network_model->extension_public->
+      get_route(workstation_src->network_card,
+               workstation_dst->network_card);
+}
+
+static int get_route_size(void *src, void *dst)
+{
+  workstation_CLM03_t workstation_src = (workstation_CLM03_t) src;
+  workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst;
+  return surf_network_model->extension_public->
+      get_route_size(workstation_src->network_card,
+                    workstation_dst->network_card);
+}
+
+static const char *get_link_name(const void *link)
+{
+  return surf_network_model->extension_public->get_link_name(link);
+}
+
+static double get_link_bandwidth(const void *link)
+{
+  return surf_network_model->extension_public->get_link_bandwidth(link);
+}
+
+static double get_link_latency(const void *link)
+{
+  return surf_network_model->extension_public->get_link_latency(link);
 }
 
 static void finalize(void)
 {
   xbt_dict_free(&workstation_set);
-  xbt_swag_free(surf_workstation_resource->common_public->states.ready_action_set);
-  xbt_swag_free(surf_workstation_resource->common_public->states.
+  xbt_swag_free(surf_workstation_model->common_public->states.
+               ready_action_set);
+  xbt_swag_free(surf_workstation_model->common_public->states.
                running_action_set);
-  xbt_swag_free(surf_workstation_resource->common_public->states.
+  xbt_swag_free(surf_workstation_model->common_public->states.
                failed_action_set);
-  xbt_swag_free(surf_workstation_resource->common_public->states.done_action_set);
+  xbt_swag_free(surf_workstation_model->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_model->common_public);
+  free(surf_workstation_model->common_private);
+  free(surf_workstation_model->extension_public);
 
-  xbt_free(surf_workstation_resource);
-  surf_workstation_resource = NULL;
+  free(surf_workstation_model);
+  surf_workstation_model = NULL;
 }
 
-static void surf_workstation_resource_init_internal(void)
+static void surf_workstation_model_init_internal(void)
 {
   s_surf_action_t action;
 
-  surf_workstation_resource = xbt_new0(s_surf_workstation_resource_t, 1);
+  surf_workstation_model = xbt_new0(s_surf_workstation_model_t, 1);
 
-  surf_workstation_resource->common_private =
-      xbt_new0(s_surf_resource_private_t, 1);
-  surf_workstation_resource->common_public =
-      xbt_new0(s_surf_resource_public_t, 1);
-/*   surf_workstation_resource->extension_private = xbt_new0(s_surf_workstation_resource_extension_private_t,1); */
-  surf_workstation_resource->extension_public =
-      xbt_new0(s_surf_workstation_resource_extension_public_t, 1);
+  surf_workstation_model->common_private =
+      xbt_new0(s_surf_model_private_t, 1);
+  surf_workstation_model->common_public =
+      xbt_new0(s_surf_model_public_t, 1);
+/*   surf_workstation_model->extension_private = xbt_new0(s_surf_workstation_model_extension_private_t,1); */
+  surf_workstation_model->extension_public =
+      xbt_new0(s_surf_workstation_model_extension_public_t, 1);
 
-  surf_workstation_resource->common_public->states.ready_action_set =
+  surf_workstation_model->common_public->states.ready_action_set =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_workstation_resource->common_public->states.running_action_set =
+  surf_workstation_model->common_public->states.running_action_set =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_workstation_resource->common_public->states.failed_action_set =
+  surf_workstation_model->common_public->states.failed_action_set =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_workstation_resource->common_public->states.done_action_set =
+  surf_workstation_model->common_public->states.done_action_set =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
-  surf_workstation_resource->common_public->name_service = name_service;
-  surf_workstation_resource->common_public->get_resource_name =
+  surf_workstation_model->common_public->name_service = name_service;
+  surf_workstation_model->common_public->get_resource_name =
       get_resource_name;
-  surf_workstation_resource->common_public->action_get_state =
+  surf_workstation_model->common_public->action_get_state =
       surf_action_get_state;
-  surf_workstation_resource->common_public->action_free = action_free;
-  surf_workstation_resource->common_public->action_cancel = action_cancel;
-  surf_workstation_resource->common_public->action_recycle =
+  surf_workstation_model->common_public->action_get_start_time =
+      surf_action_get_start_time;
+  surf_workstation_model->common_public->action_get_finish_time =
+      surf_action_get_finish_time;
+  surf_workstation_model->common_public->action_free = action_free;
+  surf_workstation_model->common_public->action_use = action_use;
+  surf_workstation_model->common_public->action_cancel = action_cancel;
+  surf_workstation_model->common_public->action_recycle =
       action_recycle;
-  surf_workstation_resource->common_public->action_change_state =
+  surf_workstation_model->common_public->action_change_state =
       action_change_state;
-  surf_workstation_resource->common_public->action_set_data = surf_action_set_data;
-  surf_workstation_resource->common_public->name = "Workstation";
+  surf_workstation_model->common_public->action_set_data =
+      surf_action_set_data;
+  surf_workstation_model->common_public->name = "Workstation";
 
-  surf_workstation_resource->common_private->resource_used = resource_used;
-  surf_workstation_resource->common_private->share_resources =
+  surf_workstation_model->common_private->resource_used = resource_used;
+  surf_workstation_model->common_private->share_resources =
       share_resources;
-  surf_workstation_resource->common_private->update_actions_state =
+  surf_workstation_model->common_private->update_actions_state =
       update_actions_state;
-  surf_workstation_resource->common_private->update_resource_state =
+  surf_workstation_model->common_private->update_resource_state =
       update_resource_state;
-  surf_workstation_resource->common_private->finalize = finalize;
-
-  surf_workstation_resource->common_public->suspend = action_suspend;
-  surf_workstation_resource->common_public->resume = action_resume;
-  surf_workstation_resource->common_public->is_suspended = action_is_suspended;
-
-  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->communicate = communicate;
-
+  surf_workstation_model->common_private->finalize = finalize;
+
+  surf_workstation_model->common_public->suspend = action_suspend;
+  surf_workstation_model->common_public->resume = action_resume;
+  surf_workstation_model->common_public->is_suspended =
+      action_is_suspended;
+  surf_workstation_model->common_public->set_max_duration =
+      action_set_max_duration;
+  surf_workstation_model->common_public->set_priority =
+      action_set_priority;
+
+  surf_workstation_model->extension_public->execute = execute;
+  surf_workstation_model->extension_public->sleep = action_sleep;
+  surf_workstation_model->extension_public->get_state = get_state;
+  surf_workstation_model->extension_public->get_speed = get_speed;
+  surf_workstation_model->extension_public->get_available_speed =
+      get_available_speed;
+
+  /*manage the properties of the workstation*/
+  surf_workstation_model->common_public->get_properties = get_properties;
+
+  surf_workstation_model->extension_public->communicate = communicate;
+  surf_workstation_model->extension_public->execute_parallel_task =
+      execute_parallel_task;
+  surf_workstation_model->extension_public->get_route = get_route;
+  surf_workstation_model->extension_public->get_route_size =
+      get_route_size;
+  surf_workstation_model->extension_public->get_link_name =
+      get_link_name;
+  surf_workstation_model->extension_public->get_link_bandwidth =
+      get_link_bandwidth;
+  surf_workstation_model->extension_public->get_link_latency =
+      get_link_latency;
   workstation_set = xbt_dict_new();
-
-  xbt_assert0(maxmin_system, "surf_init has to be called first!");
 }
 
 /********************************************************************/
@@ -256,26 +422,29 @@ static void surf_workstation_resource_init_internal(void)
 /*   month = {may}, */
 /*   year = {2003} */
 /* } */
-void surf_workstation_resource_init_CLM03(const char *filename)
-{
-/*   int i ; */
-/*   surf_resource_t resource =  NULL; */
-
-  surf_workstation_resource_init_internal();
-  surf_cpu_resource_init_Cas01(filename);
-  surf_network_resource_init_CM02(filename);
-  create_workstations();
-  xbt_dynar_push(resource_list, &surf_workstation_resource);
-/*   xbt_dynar_foreach(resource_list, i, resource) { */
-/*     if(resource==surf_cpu_resource) { */
-/*       xbt_dynar_remove_at(resource_list, i, NULL); */
-/*       i--;  */
-/*       continue; */
-/*     } */
-/*     if(resource==surf_network_resource) { */
-/*       xbt_dynar_remove_at(resource_list, i, NULL); */
-/*       i--;  */
-/*       continue; */
-/*     } */
-/*   } */
+void surf_workstation_model_init_CLM03(const char *filename)
+{
+  surf_workstation_model_init_internal();
+  surf_cpu_model_init_Cas01(filename);
+  surf_network_model_init_CM02(filename);
+  update_model_description(surf_workstation_model_description,
+                             surf_workstation_model_description_size,
+                             "CLM03",
+                             (surf_model_t) surf_workstation_model);
+  xbt_dynar_push(model_list, &surf_workstation_model);
+}
+
+void surf_workstation_model_init_compound(const char *filename)
+{
+
+  xbt_assert0(surf_cpu_model, "No CPU model defined yet!");
+  xbt_assert0(surf_network_model, "No network model defined yet!");
+  surf_workstation_model_init_internal();
+
+  update_model_description(surf_workstation_model_description,
+                             surf_workstation_model_description_size,
+                             "compound",
+                             (surf_model_t) surf_workstation_model);
+
+  xbt_dynar_push(model_list, &surf_workstation_model);
 }