X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c4998db54add422f8b4fbb7410a75d032ef2ff9..91ea4da00049eca05c7063cd3fe4b22ac5269fcd:/src/simdag/sd_workstation.c

diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c
index a66d29fc5f..8205c4c68f 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_new0(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,16 +55,19 @@ 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_new0(SD_workstation_t, sd_global->workstation_count);
+    sd_global->workstation_list = xbt_new(SD_workstation_t, sd_global->workstation_count);
   
     i = 0;
     xbt_dict_foreach(sd_global->workstations, cursor, key, data) {
@@ -122,31 +132,41 @@ const char* SD_workstation_get_name(SD_workstation_t workstation) {
 /**
  * \brief Returns the route between two workstations
  *
- * Use SD_route_get_size() to know the array size. Don't forget to free the array after use.
+ * Use SD_route_get_size() to know the array size.
  *
  * \param src a workstation
  * \param dst another 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
  */
-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;
+  const void **surf_route;
+  int route_size;
+  const char *link_name;
+  int i;
+  
   SD_CHECK_INIT_DONE();
 
-  void *surf_src = src->surf_workstation;
-  void *surf_dst = dst->surf_workstation;
+  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_resource->extension_public->get_route(surf_src, surf_dst);
+  route_size = surf_workstation_resource->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);
 
-  SD_link_t* route = xbt_new0(SD_link_t, route_size);
-  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]);
-    route[i] = xbt_dict_get(sd_global->links, link_name);
+    sd_global->recyclable_route[i] = xbt_dict_get(sd_global->links, link_name);
   }
 
-  return route;
+  return sd_global->recyclable_route;
 }
 
 /**
@@ -213,18 +233,22 @@ 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");
-  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]);
   }
 
-  free(links);
   return latency;
 }
 
@@ -238,12 +262,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");
-  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]);
@@ -251,7 +283,6 @@ double SD_route_get_current_bandwidth(SD_workstation_t src, SD_workstation_t dst
       min_bandwidth = bandwidth;
   }
 
-  free(links);
   return min_bandwidth;
 }
 
@@ -267,17 +298,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");
 
-  SD_link_t *links;
+  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;
@@ -293,7 +329,6 @@ double SD_route_get_communication_time(SD_workstation_t src, SD_workstation_t ds
     if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
       min_bandwidth = bandwidth;
   }
-  xbt_free(links);
 
   return latency + (communication_amount / min_bandwidth);
 }
@@ -365,6 +400,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);
 }
@@ -372,11 +413,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);