Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Use defined interface for accessing to lib properties.
[simgrid.git] / src / simdag / sd_workstation.c
index b38c3d9..1f15df9 100644 (file)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006-2011. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,19 +9,21 @@
 #include "xbt/dict.h"
 #include "xbt/sysdep.h"
 #include "surf/surf.h"
+#include "surf/surf_resource.h"
+
+
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_workstation, sd,
                                 "Logging specific to SimDag (workstation)");
 
 /* Creates a workstation and registers it in SD.
  */
-SD_workstation_t __SD_workstation_create(void *surf_workstation, void *data)
+SD_workstation_t __SD_workstation_create(void *surf_workstation,
+                                         void *data)
 {
 
   SD_workstation_t workstation;
   const char *name;
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(surf_workstation != NULL, "surf_workstation is NULL !");
 
   workstation = xbt_new(s_SD_workstation_t, 1);
   workstation->surf_workstation = surf_workstation;
@@ -31,9 +33,7 @@ SD_workstation_t __SD_workstation_create(void *surf_workstation, void *data)
   workstation->current_task = NULL;
 
   name = SD_workstation_get_name(workstation);
-  xbt_dict_set(sd_global->workstations, name, workstation, __SD_workstation_destroy);   /* add the workstation to the dictionary */
-  sd_global->workstation_count++;
-
+  xbt_lib_set(host_lib,name,SD_HOST_LEVEL,workstation);
   return workstation;
 }
 
@@ -47,11 +47,7 @@ SD_workstation_t __SD_workstation_create(void *surf_workstation, void *data)
  */
 SD_workstation_t SD_workstation_get_by_name(const char *name)
 {
-  SD_CHECK_INIT_DONE();
-
-  xbt_assert0(name != NULL, "Invalid parameter");
-
-  return xbt_dict_get_or_null(sd_global->workstations, name);
+  return xbt_lib_get_or_null(host_lib, name, SD_HOST_LEVEL);
 }
 
 /**
@@ -65,21 +61,21 @@ SD_workstation_t SD_workstation_get_by_name(const char *name)
 const SD_workstation_t *SD_workstation_get_list(void)
 {
 
-  xbt_dict_cursor_t cursor;
+  xbt_lib_cursor_t cursor;
   char *key;
-  void *data;
+  void **data;
   int i;
 
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(SD_workstation_get_number() > 0, "There is no workstation!");
+  xbt_assert(SD_workstation_get_number() > 0, "There is no workstation!");
 
   if (sd_global->workstation_list == NULL) {    /* this is the first time the function is called */
     sd_global->workstation_list =
-      xbt_new(SD_workstation_t, sd_global->workstation_count);
+      xbt_new(SD_workstation_t, xbt_lib_length(host_lib));
 
     i = 0;
-    xbt_dict_foreach(sd_global->workstations, cursor, key, data) {
-      sd_global->workstation_list[i++] = (SD_workstation_t) data;
+    xbt_lib_foreach(host_lib, cursor, key, data) {
+      if(data[SD_HOST_LEVEL])
+         sd_global->workstation_list[i++] = (SD_workstation_t) data[SD_HOST_LEVEL];
     }
   }
   return sd_global->workstation_list;
@@ -93,8 +89,7 @@ const SD_workstation_t *SD_workstation_get_list(void)
  */
 int SD_workstation_get_number(void)
 {
-  SD_CHECK_INIT_DONE();
-  return sd_global->workstation_count;
+  return xbt_lib_length(host_lib);
 }
 
 /**
@@ -106,8 +101,6 @@ int SD_workstation_get_number(void)
  */
 void *SD_workstation_get_data(SD_workstation_t workstation)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(workstation != NULL, "Invalid parameter");
   return workstation->data;
 }
 
@@ -123,8 +116,6 @@ void *SD_workstation_get_data(SD_workstation_t workstation)
  */
 void SD_workstation_set_data(SD_workstation_t workstation, void *data)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(workstation != NULL, "Invalid parameter");
   workstation->data = data;
 }
 
@@ -136,8 +127,6 @@ void SD_workstation_set_data(SD_workstation_t workstation, void *data)
  */
 const char *SD_workstation_get_name(SD_workstation_t workstation)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(workstation != NULL, "Invalid parameter");
   return surf_resource_name(workstation->surf_workstation);
 }
 
@@ -163,10 +152,8 @@ const char *SD_workstation_get_property_value(SD_workstation_t ws,
  */
 xbt_dict_t SD_workstation_get_properties(SD_workstation_t workstation)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0((workstation != NULL), "Invalid parameters");
-
-  return surf_workstation_model->extension.workstation.get_properties(workstation->surf_workstation);
+  return surf_workstation_model->extension.
+      workstation.get_properties(workstation->surf_workstation);
 
 }
 
@@ -181,7 +168,8 @@ xbt_dict_t SD_workstation_get_properties(SD_workstation_t workstation)
  * \return a new array of \ref SD_link_t representating the route between these two workstations
  * \see SD_route_get_size(), SD_link_t
  */
-const SD_link_t *SD_route_get_list(SD_workstation_t src, SD_workstation_t dst)
+const SD_link_t *SD_route_get_list(SD_workstation_t src,
+                                   SD_workstation_t dst)
 {
   void *surf_src;
   void *surf_dst;
@@ -190,29 +178,22 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, SD_workstation_t dst)
   void *surf_link;
   unsigned int cpt;
 
-  SD_CHECK_INIT_DONE();
-
   if (sd_global->recyclable_route == NULL) {
     /* first run */
     sd_global->recyclable_route = xbt_new(SD_link_t, SD_link_get_number());
   }
 
-  surf_src = &src->surf_workstation;
-  surf_dst = &dst->surf_workstation;
-
-  surf_route = surf_workstation_model->extension.workstation.get_route(surf_src,surf_dst);
-
-  if(surf_route == NULL)
-  {
-         INFO0("PBLM1 surf_route == NULL");
-  }
+  surf_src = src->surf_workstation;
+  surf_dst = dst->surf_workstation;
+  surf_route =
+      surf_workstation_model->extension.workstation.get_route(surf_src,
+                                                              surf_dst);
 
   xbt_dynar_foreach(surf_route, cpt, surf_link) {
     link_name = surf_resource_name(surf_link);
     sd_global->recyclable_route[cpt] =
-      xbt_dict_get(sd_global->links, link_name);
+        xbt_lib_get_or_null(link_lib, link_name, SD_LINK_LEVEL);
   }
-  INFO0("FIN");
   return sd_global->recyclable_route;
 }
 
@@ -226,9 +207,9 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, SD_workstation_t dst)
  */
 int SD_route_get_size(SD_workstation_t src, SD_workstation_t dst)
 {
-  SD_CHECK_INIT_DONE();
-  return xbt_dynar_length(surf_workstation_model->extension.workstation.get_route(
-        src->surf_workstation,dst->surf_workstation));
+  return xbt_dynar_length(surf_workstation_model->extension.
+                          workstation.get_route(src->surf_workstation,
+                                                dst->surf_workstation));
 }
 
 /**
@@ -240,10 +221,8 @@ int SD_route_get_size(SD_workstation_t src, SD_workstation_t dst)
  */
 double SD_workstation_get_power(SD_workstation_t workstation)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(workstation != NULL, "Invalid parameter");
   return surf_workstation_model->extension.workstation.
-    get_speed(workstation->surf_workstation, 1.0);
+      get_speed(workstation->surf_workstation, 1.0);
 }
 
 /**
@@ -255,10 +234,8 @@ double SD_workstation_get_power(SD_workstation_t workstation)
  */
 double SD_workstation_get_available_power(SD_workstation_t workstation)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(workstation != NULL, "Invalid parameter");
   return surf_workstation_model->extension.
-    workstation.get_available_speed(workstation->surf_workstation);
+      workstation.get_available_speed(workstation->surf_workstation);
 }
 
 /**
@@ -271,9 +248,7 @@ double SD_workstation_get_available_power(SD_workstation_t workstation)
 double SD_workstation_get_computation_time(SD_workstation_t workstation,
                                            double computation_amount)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(workstation != NULL, "Invalid parameter");
-  xbt_assert0(computation_amount >= 0,
+  xbt_assert(computation_amount >= 0,
               "computation_amount must be greater than or equal to zero");
   return computation_amount / SD_workstation_get_power(workstation);
 }
@@ -296,8 +271,6 @@ double SD_route_get_current_latency(SD_workstation_t src,
   double latency;
   int i;
 
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
   links = SD_route_get_list(src, dst);
   nb_links = SD_route_get_size(src, dst);
   latency = 0.0;
@@ -328,9 +301,6 @@ double SD_route_get_current_bandwidth(SD_workstation_t src,
   double min_bandwidth;
   int i;
 
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
-
   links = SD_route_get_list(src, dst);
   nb_links = SD_route_get_size(src, dst);
   bandwidth = min_bandwidth = -1.0;
@@ -370,9 +340,7 @@ double SD_route_get_communication_time(SD_workstation_t src,
   double latency;
   int i;
 
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
-  xbt_assert0(communication_amount >= 0,
+  xbt_assert(communication_amount >= 0,
               "communication_amount must be greater than or equal to zero");
 
 
@@ -404,11 +372,9 @@ double SD_route_get_communication_time(SD_workstation_t src,
  *
  * \see SD_workstation_set_access_mode(), e_SD_workstation_access_mode_t
  */
-e_SD_workstation_access_mode_t SD_workstation_get_access_mode(SD_workstation_t
-                                                              workstation)
+e_SD_workstation_access_mode_t
+SD_workstation_get_access_mode(SD_workstation_t workstation)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(workstation != NULL, "Invalid parameter");
   return workstation->access_mode;
 }
 
@@ -431,9 +397,6 @@ void SD_workstation_set_access_mode(SD_workstation_t workstation,
                                     e_SD_workstation_access_mode_t
                                     access_mode)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(workstation != NULL, "Invalid parameter");
-
   if (access_mode == workstation->access_mode) {
     return;                     // nothing is changed
   }
@@ -449,36 +412,35 @@ void SD_workstation_set_access_mode(SD_workstation_t workstation,
 }
 
 /* Returns whether a task can start now on a workstation.
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              *//*
-                                                                                                                                                                                                                                                                                                                                                                                                   int __SD_workstation_can_start(SD_workstation_t workstation, SD_task_t task) {
-                                                                                                                                                                                                                                                                                                                                                                                                   SD_CHECK_INIT_DONE();
-                                                                                                                                                                                                                                                                                                                                                                                                   xbt_assert0(workstation != NULL && task != NULL, "Invalid parameter");
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              *//*
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   int __SD_workstation_can_start(SD_workstation_t workstation, SD_task_t task) {
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   SD_CHECK_INIT_DONE();
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   xbt_assert(workstation != NULL && task != NULL, "Invalid parameter");
 
-                                                                                                                                                                                                                                                                                                                                                                                                   return !__SD_workstation_is_busy(workstation) &&
-                                                                                                                                                                                                                                                                                                                                                                                                   (xbt_fifo_size(workstation->task_fifo) == 0) || xbt_fifo_get_first_item(workstation->task_fifo) == task);
-                                                                                                                                                                                                                                                                                                                                                                                                   }
-                                                                                                                                                                                                                                                                                                                                                                                                 */
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   return !__SD_workstation_is_busy(workstation) &&
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   (xbt_fifo_size(workstation->task_fifo) == 0) || xbt_fifo_get_first_item(workstation->task_fifo) == task);
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   }
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 */
 
 /* Returns whether a workstation is busy. A workstation is busy is it is
  * in sequential mode and a task is running on it or the fifo is not empty.
  */
 int __SD_workstation_is_busy(SD_workstation_t workstation)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(workstation != NULL, "Invalid parameter");
-
-  DEBUG4
-    ("Workstation '%s' access mode: '%s', current task: %s, fifo size: %d",
-     SD_workstation_get_name(workstation),
-     (workstation->access_mode ==
-      SD_WORKSTATION_SHARED_ACCESS) ? "SHARED" : "FIFO",
-     (workstation->current_task ? SD_task_get_name(workstation->current_task)
-      : "none"),
-     (workstation->task_fifo ? xbt_fifo_size(workstation->task_fifo) : 0));
+  XBT_DEBUG
+      ("Workstation '%s' access mode: '%s', current task: %s, fifo size: %d",
+       SD_workstation_get_name(workstation),
+       (workstation->access_mode ==
+        SD_WORKSTATION_SHARED_ACCESS) ? "SHARED" : "FIFO",
+       (workstation->current_task ?
+        SD_task_get_name(workstation->current_task)
+        : "none"),
+       (workstation->task_fifo ? xbt_fifo_size(workstation->task_fifo) :
+        0));
 
   return workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS &&
-    (workstation->current_task != NULL
-     || xbt_fifo_size(workstation->task_fifo) > 0);
+      (workstation->current_task != NULL
+       || xbt_fifo_size(workstation->task_fifo) > 0);
 }
 
 /* Destroys a workstation.
@@ -488,8 +450,6 @@ void __SD_workstation_destroy(void *workstation)
 
   SD_workstation_t w;
 
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(workstation != NULL, "Invalid parameter");
   /* workstation->surf_workstation is freed by surf_exit and workstation->data is freed by the user */
 
   w = (SD_workstation_t) workstation;
@@ -506,11 +466,9 @@ void __SD_workstation_destroy(void *workstation)
  * \param workstation a workstation */
 SD_task_t SD_workstation_get_current_task(SD_workstation_t workstation)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(workstation != NULL, "Invalid parameter");
-  xbt_assert0(workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS, 
-             "Access mode must be set to SD_WORKSTATION_SEQUENTIAL_ACCESS"
-             " to use this function");
-  
+  xbt_assert(workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS,
+              "Access mode must be set to SD_WORKSTATION_SEQUENTIAL_ACCESS"
+              " to use this function");
+
   return (workstation->current_task);
 }