enabling warnings as errors raised some problems due to the change of

return type of SD_simulate

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

diff --git a/examples/simdag/dax/dax_test.c b/examples/simdag/dax/dax_test.c
index 23591d6..464531d 100644 (file)
--- a/examples/simdag/dax/dax_test.c
+++ b/examples/simdag/dax/dax_test.c
@@ -26,7 +26,7 @@ static int name_compare_hosts(const void *n1, const void *n2)
 }
 
 int main(int argc, char **argv) {
 }
 
 int main(int argc, char **argv) {

-  xbt_dynar_t dax;
+  xbt_dynar_t dax, changed;

   unsigned int cursor;
   SD_task_t task;
 
   unsigned int cursor;
   SD_task_t task;
 


@@ -86,8 +86,8 @@ int main(int argc, char **argv) {
   }
 
   INFO0("------------------- Run the schedule ---------------------------");
   }
 
   INFO0("------------------- Run the schedule ---------------------------");

-  SD_task_t *changed = SD_simulate(-1);
-  free(changed);
+  changed = SD_simulate(-1);
+  xbt_dynar_free_container(&changed);

   INFO0("------------------- Produce the trace file---------------------------");
   INFO1("Producing the trace of the run into %s",tracefilename);
   FILE*out = fopen(tracefilename,"w");
   INFO0("------------------- Produce the trace file---------------------------");
   INFO1("Producing the trace of the run into %s",tracefilename);
   FILE*out = fopen(tracefilename,"w");

diff --git a/examples/simdag/sd_test.c b/examples/simdag/sd_test.c
index e5bf6d4..1aa17d1 100644 (file)
--- a/examples/simdag/sd_test.c
+++ b/examples/simdag/sd_test.c
@@ -16,6 +16,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test,
 int main(int argc, char **argv)
 {
   int i;
 int main(int argc, char **argv)
 {
   int i;

+  unsigned int ctr;

   const char *platform_file;
   const SD_workstation_t *workstations;
   const char *name1;
   const char *platform_file;
   const SD_workstation_t *workstations;
   const char *name1;


@@ -176,7 +177,7 @@ int main(int argc, char **argv)
                    computation_amount, communication_amount, rate);
 
   changed_tasks = SD_simulate(-1.0);
                    computation_amount, communication_amount, rate);
 
   changed_tasks = SD_simulate(-1.0);

-  xbt_dynar_foreach(changed_tasks, i, task){
+  xbt_dynar_foreach(changed_tasks, ctr, task){

                  INFO3("Task '%s' start time: %f, finish time: %f",
           SD_task_get_name(task),
           SD_task_get_start_time(task),
                  INFO3("Task '%s' start time: %f, finish time: %f",
           SD_task_get_name(task),
           SD_task_get_start_time(task),

diff --git a/examples/simdag/sd_test2.c b/examples/simdag/sd_test2.c
index 99e04dc..0184860 100644 (file)
--- a/examples/simdag/sd_test2.c
+++ b/examples/simdag/sd_test2.c
@@ -25,7 +25,7 @@ static int nameCompareHosts(const void *n1, const void *n2)
 int main(int argc, char **argv)
 {
   int i, j;
 int main(int argc, char **argv)
 {
   int i, j;

-  SD_task_t *changed_tasks;
+  xbt_dynar_t changed_tasks;

   int n_hosts;
   const SD_workstation_t *hosts;
   SD_task_t taskInit;
   int n_hosts;
   const SD_workstation_t *hosts;
   SD_task_t taskInit;


@@ -198,7 +198,7 @@ int main(int argc, char **argv)
 
   INFO1("Simulation time: %f", SD_get_clock());
 
 
   INFO1("Simulation time: %f", SD_get_clock());
 

-  free(changed_tasks);
+  xbt_dynar_free_container(&changed_tasks);

 
   free(ParComp_wocomm_table);
   free(IntraRedist_cost);
 
   free(ParComp_wocomm_table);
   free(IntraRedist_cost);