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

diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c
index 84a2a0eac4..48d24796f1 100644
--- a/src/simdag/sd_workstation.c
+++ b/src/simdag/sd_workstation.c
@@ -10,9 +10,11 @@ SD_workstation_t __SD_workstation_create(void *surf_workstation, void *data) {
   SD_CHECK_INIT_DONE();
   xbt_assert0(surf_workstation != NULL, "surf_workstation is NULL !");
 
-  SD_workstation_t workstation = xbt_new0(s_SD_workstation_t, 1);
+  SD_workstation_t 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->task_fifo = NULL;
   
   const char *name = SD_workstation_get_name(workstation);
   xbt_dict_set(sd_global->workstations, name, workstation, __SD_workstation_destroy); /* add the workstation to the dictionary */
@@ -45,7 +47,7 @@ SD_workstation_t SD_workstation_get_by_name(const char *name) {
  * \return an array of \ref SD_workstation_t containing all workstations
  * \see SD_workstation_get_number()
  */
-const SD_workstation_t*  SD_workstation_get_list(void) {
+const SD_workstation_t* SD_workstation_get_list(void) {
   SD_CHECK_INIT_DONE();
   xbt_assert0(SD_workstation_get_number() > 0, "There is no workstation!");
 
@@ -55,7 +57,7 @@ const SD_workstation_t*  SD_workstation_get_list(void) {
   int i;
 
   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) {
@@ -120,31 +122,35 @@ 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) {
   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());
+  }
+
   void *surf_src = src->surf_workstation;
   void *surf_dst = dst->surf_workstation;
 
   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,7 +219,7 @@ double SD_workstation_get_computation_time(SD_workstation_t workstation, double
 double SD_route_get_current_latency(SD_workstation_t src, SD_workstation_t dst) {
   SD_CHECK_INIT_DONE();
   xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
-  SD_link_t *links = SD_route_get_list(src, dst);
+  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;
@@ -222,7 +228,6 @@ double SD_route_get_current_latency(SD_workstation_t src, SD_workstation_t dst)
     latency += SD_link_get_current_latency(links[i]);
   }
 
-  free(links);
   return latency;
 }
 
@@ -238,7 +243,7 @@ double SD_route_get_current_latency(SD_workstation_t src, SD_workstation_t dst)
 double SD_route_get_current_bandwidth(SD_workstation_t src, SD_workstation_t dst) {
   SD_CHECK_INIT_DONE();
   xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
-  SD_link_t *links = SD_route_get_list(src, dst);
+  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;
@@ -249,7 +254,6 @@ double SD_route_get_current_bandwidth(SD_workstation_t src, SD_workstation_t dst
       min_bandwidth = bandwidth;
   }
 
-  free(links);
   return min_bandwidth;
 }
 
@@ -271,7 +275,7 @@ double SD_route_get_communication_time(SD_workstation_t src, SD_workstation_t ds
   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;
@@ -291,16 +295,92 @@ 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);
 }
 
+/**
+ * \brief Returns the access mode of this workstation.
+ *
+ * \param workstation a workstation
+ * \return the access mode for the tasks running on this workstation:
+ * SD_WORKSTATION_SHARED_ACCESS or SD_WORKSTATION_SEQUENTIAL_ACCESS
+ *
+ * \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) {
+  SD_CHECK_INIT_DONE();
+  xbt_assert0(workstation != NULL, "Invalid parameter");
+  return workstation->access_mode;
+}
+
+/**
+ * \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
+ * 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
+ * tasks wait in a FIFO.
+ *
+ * \param workstation a workstation
+ * \param access_mode the access mode you want to set to this workstation:
+ * SD_WORKSTATION_SHARED_ACCESS or SD_WORKSTATION_SEQUENTIAL_ACCESS
+ *
+ * \see SD_workstation_get_access_mode(), e_SD_workstation_access_mode_t
+ */
+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
+  }
+
+  workstation->access_mode = access_mode;
+
+  if (access_mode == SD_WORKSTATION_SHARED_ACCESS) {
+    xbt_fifo_free(workstation->task_fifo);
+    workstation->task_fifo = NULL;
+  }
+  else {
+    workstation->task_fifo = xbt_fifo_new();
+  }
+}
+
+/* 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");
+
+  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");
+  
+  return workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS &&
+    (workstation->current_task != NULL || xbt_fifo_size(workstation->task_fifo) > 0);
+}
+
 /* Destroys a workstation.
  */
 void __SD_workstation_destroy(void *workstation) {
   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 */
-  xbt_free(workstation);
+
+  SD_workstation_t w = (SD_workstation_t) workstation;
+
+  if (w->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS) {
+    xbt_fifo_free(w->task_fifo);
+  }
+  xbt_free(w);
 }