test of sd_test

[simgrid.git] / src / simdag / sd_workstation.c

diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c
index 00066e7..b38c3d9 100644 (file)
--- a/src/simdag/sd_workstation.c
+++ b/src/simdag/sd_workstation.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include "private.h"
 #include "simdag/simdag.h"
 #include "xbt/dict.h"
@@ -67,8 +73,6 @@ const SD_workstation_t *SD_workstation_get_list(void)
   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);
@@ -134,8 +138,7 @@ const char *SD_workstation_get_name(SD_workstation_t workstation)
 {
   SD_CHECK_INIT_DONE();
   xbt_assert0(workstation != NULL, "Invalid parameter");
-  return surf_workstation_model->get_resource_name(workstation->
-                                                   surf_workstation);
+  return surf_resource_name(workstation->surf_workstation);
 }
 
 /**
@@ -163,8 +166,7 @@ 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->get_properties
-          (workstation->surf_workstation));
+  return surf_workstation_model->extension.workstation.get_properties(workstation->surf_workstation);
 
 }
 
@@ -183,10 +185,10 @@ 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;
+  xbt_dynar_t surf_route;
   const char *link_name;
-  int i;
+  void *surf_link;
+  unsigned int cpt;
 
   SD_CHECK_INIT_DONE();
 
@@ -195,25 +197,22 @@ 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());
   }
 
-  surf_src = src->surf_workstation;
-  surf_dst = dst->surf_workstation;
+  surf_src = &src->surf_workstation;
+  surf_dst = &dst->surf_workstation;
 
-  surf_route =
-    surf_workstation_model->extension.workstation.get_route(surf_src,
-                                                            surf_dst);
-  route_size =
-    surf_workstation_model->extension.workstation.get_route_size(surf_src,
-                                                                 surf_dst);
+  surf_route = surf_workstation_model->extension.workstation.get_route(surf_src,surf_dst);
 
+  if(surf_route == NULL)
+  {
+         INFO0("PBLM1 surf_route == NULL");
+  }
 
-  for (i = 0; i < route_size; i++) {
-    link_name =
-      surf_workstation_model->extension.workstation.
-      get_link_name(surf_route[i]);
-    sd_global->recyclable_route[i] =
+  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);
   }
-
+  INFO0("FIN");
   return sd_global->recyclable_route;
 }
 
@@ -228,8 +227,8 @@ 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_model->extension.workstation.
-    get_route_size(src->surf_workstation, dst->surf_workstation);
+  return xbt_dynar_length(surf_workstation_model->extension.workstation.get_route(
+        src->surf_workstation,dst->surf_workstation));
 }
 
 /**
@@ -500,3 +499,18 @@ void __SD_workstation_destroy(void *workstation)
   }
   xbt_free(w);
 }
+
+/** 
+ * \brief Returns the kind of the task currently running on a workstation
+ * Only call this with sequential access mode set
+ * \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");
+  
+  return (workstation->current_task);
+}