X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d73db7e7e4a9ed4b54614699d8bd6afe97b5fa4f..71855c3d4eb59aa687b05fa351bb09df42495a43:/src/simdag/sd_workstation.c

diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c
index 5472a604eb..814c09171d 100644
--- a/src/simdag/sd_workstation.c
+++ b/src/simdag/sd_workstation.c
@@ -126,9 +126,38 @@ 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_workstation_resource->common_public->get_resource_name(workstation->surf_workstation);
+  return surf_workstation_model->common_public->get_resource_name(workstation->surf_workstation);
 }
 
+/**
+ * \brief Returns the value of a given workstation property
+ *
+ * \param workstation a workstation
+ * \param name a property name
+ * \return value of a property (or NULL if property not set)
+ */
+const char* SD_workstation_get_property_value(SD_workstation_t ws, const char* name)
+{
+  return xbt_dict_get_or_null(SD_workstation_get_properties(ws), name);
+}
+
+
+/**
+ * \brief Returns a #xbt_dict_t consisting of the list of properties assigned to this workstation
+ *
+ * \param workstation a workstation
+ * \return the dictionary containing the properties associated with the workstation
+ */
+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->common_public->get_properties(workstation->surf_workstation));
+
+}
+
+
 /**
  * \brief Returns the route between two workstations
  *
@@ -157,12 +186,12 @@ const SD_link_t* SD_route_get_list(SD_workstation_t src, SD_workstation_t dst) {
   surf_src = src->surf_workstation;
   surf_dst = dst->surf_workstation;
 
-  surf_route = surf_workstation_resource->extension_public->get_route(surf_src, surf_dst);
-  route_size = surf_workstation_resource->extension_public->get_route_size(surf_src, surf_dst);
+  surf_route = surf_workstation_model->extension_public->get_route(surf_src, surf_dst);
+  route_size = surf_workstation_model->extension_public->get_route_size(surf_src, surf_dst);
 
 
   for (i = 0; i < route_size; i++) {
-    link_name = surf_workstation_resource->extension_public->get_link_name(surf_route[i]);
+    link_name = surf_workstation_model->extension_public->get_link_name(surf_route[i]);
     sd_global->recyclable_route[i] = xbt_dict_get(sd_global->links, link_name);
   }
 
@@ -179,7 +208,7 @@ 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 surf_workstation_resource->extension_public->
+  return surf_workstation_model->extension_public->
     get_route_size(src->surf_workstation, dst->surf_workstation);
 }
 
@@ -193,7 +222,7 @@ 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_resource->extension_public->get_speed(workstation->surf_workstation, 1.0);
+  return surf_workstation_model->extension_public->get_speed(workstation->surf_workstation, 1.0);
 }
 
 /**
@@ -206,7 +235,7 @@ 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_resource->extension_public->get_available_speed(workstation->surf_workstation);
+  return surf_workstation_model->extension_public->get_available_speed(workstation->surf_workstation);
 }
 
 /**
@@ -351,7 +380,7 @@ double SD_route_get_communication_time(SD_workstation_t src, SD_workstation_t ds
 /**
  * \brief Sets the access mode for the tasks that will be executed on a workstation
  *
- * By default, a workstation resource is shared, i.e. several tasks
+ * By default, a workstation model is shared, i.e. several tasks
  * can be executed at the same time on a workstation. The CPU power of
  * the workstation is shared between the running tasks on the workstation.
  * In sequential mode, only one task can use the workstation, and the other
@@ -400,9 +429,9 @@ int __SD_workstation_is_busy(SD_workstation_t workstation) {
   SD_CHECK_INIT_DONE();
   xbt_assert0(workstation != NULL, "Invalid parameter");
   
-  DEBUG4("Workstation '%s' access mode: %d, current task: %s, fifo size: %d",
+  DEBUG4("Workstation '%s' access mode: '%s', current task: %s, fifo size: %d",
 	 SD_workstation_get_name(workstation),
-	 workstation->access_mode,
+	 (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));