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 d2a00e1..b38c3d9 100644 (file)
--- a/src/simdag/sd_workstation.c
+++ b/src/simdag/sd_workstation.c
@@ -73,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!");
 
   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);
   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);


@@ -199,19 +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());
   }
 
     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);
+  surf_route = surf_workstation_model->extension.workstation.get_route(surf_src,surf_dst);
+
+  if(surf_route == NULL)
+  {
+         INFO0("PBLM1 surf_route == NULL");
+  }

 
   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);
   }
 
   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;
 }
 
   return sd_global->recyclable_route;
 }