Ansi C declaration of variables.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5782 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/teshsuite/simdag/basic0.c b/teshsuite/simdag/basic0.c
index e99a309..c33e6ad 100644 (file)
--- a/teshsuite/simdag/basic0.c
+++ b/teshsuite/simdag/basic0.c
@@ -3,6 +3,17 @@
 #include "simdag/simdag.h"
 
 int main(int argc, char **argv) {
+
+  SD_task_t taskInit;
+  SD_task_t taskA;
+  SD_task_t taskB;
+
+   /* scheduling parameters */
+
+  double communication_amount1[] = { 0, 100000000, 0, 0 };
+  double communication_amount2[] = { 0, 1, 0, 0 };
+  const double no_cost[] = {0.0, 0.0};
+
   /* initialisation of SD */
   SD_init(&argc, argv);
 
@@ -10,16 +21,12 @@ int main(int argc, char **argv) {
   SD_create_environment(argv[1]);
 
   /* creation of the tasks and their dependencies */
-  SD_task_t taskInit = SD_task_create("Init",NULL,1.0);
-  SD_task_t taskA = SD_task_create("Task Comm 1", NULL, 1.0);
-  SD_task_t taskB = SD_task_create("Task Comm 2", NULL, 1.0);
+  taskInit = SD_task_create("Init",NULL,1.0);
+  taskA = SD_task_create("Task Comm 1", NULL, 1.0);
+  taskB = SD_task_create("Task Comm 2", NULL, 1.0);
   
 
-  /* scheduling parameters */
-
-  double communication_amount1[] = { 0, 100000000, 0, 0 };
-  double communication_amount2[] = { 0, 1, 0, 0 };
-  const double no_cost[] = {0.0, 0.0};
+ 
   
   /* let's launch the simulation! */
 

diff --git a/teshsuite/simdag/basic1.c b/teshsuite/simdag/basic1.c
index 48a5ef1..908116e 100644 (file)
--- a/teshsuite/simdag/basic1.c
+++ b/teshsuite/simdag/basic1.c
@@ -3,6 +3,17 @@
 #include "simdag/simdag.h"
 
 int main(int argc, char **argv) {
+
+       SD_task_t taskInit;
+    SD_task_t taskA;
+    SD_task_t taskB;
+
+       double communication_amount1 = 1000000000;
+    double communication_amount2 = 1000000000;
+    double no_cost = 0.0;
+
+       const SD_workstation_t* workstation;
+
     /* initialisation of SD */
     SD_init(&argc, argv);
 
@@ -10,17 +21,15 @@ int main(int argc, char **argv) {
     SD_create_environment(argv[1]);
 
     /* creation of the tasks and their dependencies */
-    SD_task_t taskInit = SD_task_create("Init",NULL,1.0);
-    SD_task_t taskA = SD_task_create("Task Comm A", NULL, 1.0);
-    SD_task_t taskB = SD_task_create("Task Comm B", NULL, 1.0);
+    taskInit = SD_task_create(NULL,NULL,1.0);
+    taskA = SD_task_create("Task Comm A", NULL, 1.0);
+    taskB = SD_task_create("Task Comm B", NULL, 1.0);
 
 
     /* scheduling parameters */
 
-    const SD_workstation_t* workstation = SD_workstation_get_list();
-    double communication_amount1 = 1000000000;
-    double communication_amount2 = 1000000000;
-    double no_cost = 0.0;
+    
+       workstation = SD_workstation_get_list();
 
     /* let's launch the simulation! */
     SD_task_schedule(taskInit, 1, SD_workstation_get_list(), &no_cost, &no_cost, -1.0);

diff --git a/teshsuite/simdag/basic2.c b/teshsuite/simdag/basic2.c
index b823b88..b57f3dd 100644 (file)
--- a/teshsuite/simdag/basic2.c
+++ b/teshsuite/simdag/basic2.c
@@ -3,6 +3,17 @@
 #include "simdag/simdag.h"
 
 int main(int argc, char **argv) {
+
+       SD_task_t taskInit;
+    SD_task_t taskA;
+    SD_task_t taskB;
+
+       const SD_workstation_t* workstation;
+
+       double communication_amount1 = 1000000000;
+    double communication_amount2 = 100000000;
+    double no_cost = 0.0;
+
     /* initialisation of SD */
     SD_init(&argc, argv);
 
@@ -10,17 +21,14 @@ int main(int argc, char **argv) {
     SD_create_environment(argv[1]);
 
     /* creation of the tasks and their dependencies */
-    SD_task_t taskInit = SD_task_create("Init",NULL,1.0);
-    SD_task_t taskA = SD_task_create("Task Comm A", NULL, 1.0);
-    SD_task_t taskB = SD_task_create("Task Comm B", NULL, 1.0);
+    taskInit = SD_task_create(NULL,NULL,1.0);
+    taskA = SD_task_create("Task Comm A", NULL, 1.0);
+    taskB = SD_task_create("Task Comm B", NULL, 1.0);
 
 
     /* scheduling parameters */
 
-    const SD_workstation_t* workstation = SD_workstation_get_list();
-    double communication_amount1 = 1000000000;
-    double communication_amount2 = 100000000;
-    double no_cost = 0.0;
+    workstation = SD_workstation_get_list();
 
     /* let's launch the simulation! */
     SD_task_schedule(taskInit, 1, SD_workstation_get_list(), &no_cost, &no_cost, -1.0);

diff --git a/teshsuite/simdag/basic3.c b/teshsuite/simdag/basic3.c
index ce879bd..eb05f3c 100644 (file)
--- a/teshsuite/simdag/basic3.c
+++ b/teshsuite/simdag/basic3.c
@@ -3,6 +3,15 @@
 #include "simdag/simdag.h"
 
 int main(int argc, char **argv) {
+
+       SD_task_t taskInit;
+    SD_task_t taskA;
+    SD_task_t taskFin;
+
+       /* scheduling parameters */
+
+    double no_cost[] = { 0.0, 0.0, 0.0, 0.0 };
+
     /* initialisation of SD */
     SD_init(&argc, argv);
 
@@ -10,14 +19,9 @@ int main(int argc, char **argv) {
     SD_create_environment(argv[1]);
 
     /* creation of the tasks and their dependencies */
-    SD_task_t taskInit = SD_task_create("Task Init",NULL,1.0);
-    SD_task_t taskA = SD_task_create("Task A", NULL, 1.0);
-    SD_task_t taskFin = SD_task_create("Task Fin", NULL, 1.0);
-
-
-    /* scheduling parameters */
-
-    double no_cost[] = { 0.0, 0.0, 0.0, 0.0 };
+    taskInit = SD_task_create("Task Init",NULL,1.0);
+    taskA = SD_task_create("Task A", NULL, 1.0);
+    taskFin = SD_task_create("Task Fin", NULL, 1.0);
 
     /* let's launch the simulation! */
     SD_task_schedule(taskInit, 1, SD_workstation_get_list(), no_cost, no_cost, -1.0);

diff --git a/teshsuite/simdag/basic4.c b/teshsuite/simdag/basic4.c
index 1155970..3ab8374 100644 (file)
--- a/teshsuite/simdag/basic4.c
+++ b/teshsuite/simdag/basic4.c
@@ -3,6 +3,18 @@
 #include "simdag/simdag.h"
 
 int main(int argc, char **argv) {
+       /* creation of the tasks and their dependencies */
+    
+       SD_task_t taskInit;
+    SD_task_t taskA;
+    SD_task_t taskFin;
+
+
+    /* scheduling parameters */
+
+    double no_cost[] = { 0., 0., 0., 0. };
+    double amount[] = { 0., 1., 0., 0.};
+
     /* initialisation of SD */
     SD_init(&argc, argv);
 
@@ -10,15 +22,10 @@ int main(int argc, char **argv) {
     SD_create_environment(argv[1]);
 
     /* creation of the tasks and their dependencies */
-    SD_task_t taskInit = SD_task_create("Task Init",NULL,1.0);
-    SD_task_t taskA = SD_task_create("Task A", NULL, 1.0);
-    SD_task_t taskFin = SD_task_create("Task Fin", NULL, 1.0);
-
-
-    /* scheduling parameters */
+    taskInit = SD_task_create("Task Init",NULL,1.0);
+    taskA = SD_task_create("Task A", NULL, 1.0);
+    taskFin = SD_task_create("Task Fin", NULL, 1.0);
 
-    double no_cost[] = { 0., 0., 0., 0. };
-    double amount[] = { 0., 1., 0., 0.};
 
     /* let's launch the simulation! */
     SD_task_schedule(taskInit, 1, SD_workstation_get_list(), no_cost, no_cost, -1.0);

diff --git a/teshsuite/simdag/basic5.c b/teshsuite/simdag/basic5.c
index d64d43c..5fd8468 100644 (file)
--- a/teshsuite/simdag/basic5.c
+++ b/teshsuite/simdag/basic5.c
@@ -3,16 +3,11 @@
 #include "simdag/simdag.h"
 
 int main(int argc, char **argv) {
-    /* initialisation of SD */
-    SD_init(&argc, argv);
 
-    /* creation of the environment */
-    SD_create_environment(argv[1]);
-
-    /* creation of the tasks and their dependencies */
-    SD_task_t taskInit = SD_task_create("Task Init",NULL,1.0);
-    SD_task_t taskA = SD_task_create("Task A", NULL, 1.0);
-    SD_task_t taskB = SD_task_create("Task B", NULL, 1.0);
+       /* creation of the tasks and their dependencies */
+    SD_task_t taskInit;
+    SD_task_t taskA;
+    SD_task_t taskB;
 
 
     /* scheduling parameters */
@@ -21,6 +16,17 @@ int main(int argc, char **argv) {
     double amount[] = { 0., 100000., 0., 0.};
     double comput[] = { 10000000. };
 
+    /* initialisation of SD */
+    SD_init(&argc, argv);
+
+    /* creation of the environment */
+    SD_create_environment(argv[1]);
+
+    /* creation of the tasks and their dependencies */
+    taskInit = SD_task_create("Task Init",NULL,1.0);
+    taskA = SD_task_create("Task A", NULL, 1.0);
+    taskB = SD_task_create("Task B", NULL, 1.0);
+
     /* let's launch the simulation! */
     SD_task_schedule(taskInit, 1, SD_workstation_get_list(), no_cost, no_cost, -1.0);
     SD_task_schedule(taskA, 2, SD_workstation_get_list(), no_cost, amount, -1.0);