X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/178d9ca3560ec4b1e756970b888b4e36212ce670..504b4d20dd2db9ea1eaa9c4b390b2a412d7c9779:/src/simdag/sd_workstation.c

diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c
index 48d24796f1..b7e97e8ecd 100644
--- a/src/simdag/sd_workstation.c
+++ b/src/simdag/sd_workstation.c
@@ -4,19 +4,26 @@
 #include "xbt/sysdep.h"
 #include "surf/surf.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 workstation;
+  const char *name;
   SD_CHECK_INIT_DONE();
   xbt_assert0(surf_workstation != NULL, "surf_workstation is NULL !");
 
-  SD_workstation_t workstation = xbt_new(s_SD_workstation_t, 1);
+  workstation = xbt_new(s_SD_workstation_t, 1);
   workstation->surf_workstation = surf_workstation;
   workstation->data = data; /* user data */
-  SD_workstation_set_access_mode(workstation, SD_WORKSTATION_SHARED_ACCESS); /* default mode is shared */
+  workstation->access_mode = SD_WORKSTATION_SHARED_ACCESS; /* default mode is shared */
   workstation->task_fifo = NULL;
+  workstation->current_task = NULL;
   
-  const char *name = SD_workstation_get_name(workstation);
+  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++;
 
@@ -48,14 +55,17 @@ SD_workstation_t SD_workstation_get_by_name(const char *name) {
  * \see SD_workstation_get_number()
  */
 const SD_workstation_t* SD_workstation_get_list(void) {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(SD_workstation_get_number() > 0, "There is no workstation!");
 
   xbt_dict_cursor_t cursor;
   char *key;
   void *data;
   int i;
 
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(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);
   
@@ -116,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 certain workstation property
+ *
+ * \param workstation a workstation
+ * \param name a property name
+ * \return value of a property
+ */
+const char* SD_workstation_get_property_value(SD_workstation_t ws, char* name)
+{
+  return xbt_dict_get_or_null(SD_workstation_get_properties(ws), name);
+}
+
+
+/**
+ * \brief Returns a xbt_dynar_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_cpu_properties(workstation->surf_workstation));
+
 }
 
+
 /**
  * \brief Returns the route between two workstations
  *
@@ -130,6 +169,13 @@ const char* SD_workstation_get_name(SD_workstation_t workstation) {
  * \see SD_route_get_size(), SD_link_t
  */
 const SD_link_t* SD_route_get_list(SD_workstation_t src, SD_workstation_t dst) {
+  void *surf_src;
+  void *surf_dst;
+  const void **surf_route;
+  int route_size;
+  const char *link_name;
+  int i;
+  
   SD_CHECK_INIT_DONE();
 
   if (sd_global->recyclable_route == NULL) {
@@ -137,16 +183,15 @@ const SD_link_t* SD_route_get_list(SD_workstation_t src, SD_workstation_t dst) {
     sd_global->recyclable_route = xbt_new(SD_link_t, SD_link_get_number());
   }
 
-  void *surf_src = src->surf_workstation;
-  void *surf_dst = dst->surf_workstation;
+  surf_src = src->surf_workstation;
+  surf_dst = dst->surf_workstation;
+
+  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);
 
-  const void **surf_route = surf_workstation_resource->extension_public->get_route(surf_src, surf_dst);
-  int route_size = surf_workstation_resource->extension_public->get_route_size(surf_src, surf_dst);
 
-  const char *link_name;
-  int i;
   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);
   }
 
@@ -163,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);
 }
 
@@ -177,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);
 }
 
 /**
@@ -190,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);
 }
 
 /**
@@ -217,12 +262,17 @@ double SD_workstation_get_computation_time(SD_workstation_t workstation, double
  * \see SD_route_get_current_bandwidth()
  */
 double SD_route_get_current_latency(SD_workstation_t src, SD_workstation_t dst) {
+
+  const SD_link_t *links;
+  int nb_links;
+  double latency ;
+  int i;
+
   SD_CHECK_INIT_DONE();
   xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
-  const SD_link_t *links = SD_route_get_list(src, dst);
-  int nb_links = SD_route_get_size(src, dst);
-  double latency = 0.0;
-  int i;
+  links = SD_route_get_list(src, dst);
+  nb_links = SD_route_get_size(src, dst);
+  latency = 0.0;
   
   for (i = 0; i < nb_links; i++) {
     latency += SD_link_get_current_latency(links[i]);
@@ -241,12 +291,20 @@ double SD_route_get_current_latency(SD_workstation_t src, SD_workstation_t dst)
  * \see SD_route_get_current_latency()
  */
 double SD_route_get_current_bandwidth(SD_workstation_t src, SD_workstation_t dst) {
+
+  const SD_link_t *links;
+  int nb_links;
+  double bandwidth;
+  double min_bandwidth;
+  int i;
+
   SD_CHECK_INIT_DONE();
   xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
-  const SD_link_t *links = SD_route_get_list(src, dst);
-  int nb_links = SD_route_get_size(src, dst);
-  double bandwidth, min_bandwidth = -1.0;
-  int i;
+
+  links = SD_route_get_list(src, dst);
+  nb_links = SD_route_get_size(src, dst);
+  bandwidth = min_bandwidth = -1.0;
+
   
   for (i = 0; i < nb_links; i++) {
     bandwidth = SD_link_get_current_bandwidth(links[i]);
@@ -269,17 +327,22 @@ double SD_route_get_current_bandwidth(SD_workstation_t src, SD_workstation_t dst
  */
 double SD_route_get_communication_time(SD_workstation_t src, SD_workstation_t dst,
 						   double communication_amount) {
+
+
   /* total time = latency + transmission time of the slowest link
      transmission time of a link = communication amount / link bandwidth */
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
-  xbt_assert0(communication_amount >= 0, "communication_amount must be greater than or equal to zero");
 
   const SD_link_t *links;
   int nb_links;
   double bandwidth, min_bandwidth;
   double latency;
   int i;
+
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
+  xbt_assert0(communication_amount >= 0, "communication_amount must be greater than or equal to zero");
+
+
   
   if (communication_amount == 0.0)
     return 0.0;
@@ -317,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
@@ -366,6 +429,12 @@ 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));
+
   return workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS &&
     (workstation->current_task != NULL || xbt_fifo_size(workstation->task_fifo) > 0);
 }
@@ -373,11 +442,14 @@ int __SD_workstation_is_busy(SD_workstation_t workstation) {
 /* Destroys a workstation.
  */
 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 */
 
-  SD_workstation_t w = (SD_workstation_t) workstation;
+  w = (SD_workstation_t) workstation;
 
   if (w->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS) {
     xbt_fifo_free(w->task_fifo);