From: suter <frederic.suter@cc.in2p3.fr>
Date: Fri, 15 Jun 2012 07:36:54 +0000 (+0200)
Subject: slight modifications
X-Git-Tag: v3_8~595
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/978e85e4b0b5433f2af4e5d7eb8ac03677995089?ds=sidebyside

slight modifications
---

diff --git a/examples/simdag/sd_typed_tasks_test.c b/examples/simdag/sd_typed_tasks_test.c
index c4355e3e78..dda4a509ec 100644
--- a/examples/simdag/sd_typed_tasks_test.c
+++ b/examples/simdag/sd_typed_tasks_test.c
@@ -43,7 +43,7 @@ int main(int argc, char **argv)
  
   workstations = SD_workstation_get_list();
 
-  for (i=0;i<4;i++)
+  for (i=0;i<SD_workstation_get_number();i++)
     XBT_INFO("%s runs at %f flops", SD_workstation_get_name(workstations[i]),
 	     SD_workstation_get_power(workstations[i]));
 
@@ -54,9 +54,6 @@ int main(int argc, char **argv)
   taskD = SD_task_create_comp_par_amdahl("Task D", NULL, 1e9, 0.2);
   taskE = SD_task_create("Task E", NULL, 1e9);
 
-  double toto = (0.2 + (1 - 0.2)/4) * 1e9;
-  XBT_INFO("%f %f",toto ,toto/SD_workstation_get_power(workstations[0]));
-
   SD_task_dependency_add(NULL, NULL, taskA, taskB);
   SD_task_dependency_add(NULL, NULL, taskB, taskC);
 
@@ -68,8 +65,10 @@ int main(int argc, char **argv)
 
   for (i=0;i<4;i++){
     workstation_list[i]=workstations[i+4];
-    computation_amount[i]=toto;
+    /* Apply Amdahl's law manually assuming a 20% serial part */
+    computation_amount[i]=(0.2 + (1 - 0.2)/4) * SD_task_get_amount(taskE);
   }
+
   SD_task_schedule(taskE, 4, workstation_list,
                    computation_amount, communication_amount, -1);