X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a9afac801b6f592772dfee3a181e27d517a18ef..a6dbc279b78e4a84b3921b509f3138ed01399bca:/teshsuite/simdag/network/test_reinit_costs.c?ds=sidebyside

diff --git a/teshsuite/simdag/network/test_reinit_costs.c b/teshsuite/simdag/network/test_reinit_costs.c
index 68a2c997f3..9e946a8d04 100644
--- a/teshsuite/simdag/network/test_reinit_costs.c
+++ b/teshsuite/simdag/network/test_reinit_costs.c
@@ -1,14 +1,15 @@
+/* Computation tests                                                        */
+
+/* Copyright (c) 2007, 2009-2011, 2013-2014. 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 <stdio.h>
 #include <stdlib.h>
 
-#include "simdag/simdag.h"
-
-/*
- * SimDag
- * Computation tests
- * Copyright (C) 2007 
- * Sascha Hunold, Frederic Suter
- */
+#include "simgrid/simdag.h"
 
 /*
  * This test checks if the reinitialization of
@@ -21,81 +22,95 @@
  * 1.5
  */
 
-static SD_task_t create_empty_cost_root() {
-	double no_cost[] = { 0.0 };
-	SD_task_t root;
+static SD_task_t create_empty_cost_root()
+{
+  double no_cost[] = { 0.0 };
+  SD_task_t root;
 
-	root = SD_task_create("Root", NULL, 1.0);
-	SD_task_schedule(root, 1, SD_workstation_get_list(), no_cost, no_cost, -1.0);
+  root = SD_task_create("Root", NULL, 1.0);
+  SD_task_schedule(root, 1, SD_workstation_get_list(), no_cost, no_cost,
+                   -1.0);
 
-	return root;
+  return root;
 }
 
-static void zero_cost_test(int *argc, char *argv[]) {
-	double time;
-	SD_task_t task;
-	
-	SD_init(argc, argv);
-	SD_create_environment(argv[1]);
-	
-	task = create_empty_cost_root();
-	SD_simulate(-1.0);
-	SD_task_destroy(task);
-	
-	SD_application_reinit();
-	
-	task = create_empty_cost_root();
-	SD_simulate(-1.0);
-	SD_task_destroy(task);
-	
-	SD_simulate(-1.0);
-	
-	time = SD_get_clock();
-	printf("%g\n", time);
-	fflush(stdout);
-	
-	SD_exit();
+static void zero_cost_test(int *argc, char *argv[])
+{
+  double time;
+  SD_task_t task;
+  xbt_dynar_t ret;
+
+  SD_init(argc, argv);
+  SD_create_environment(argv[1]);
+
+  task = create_empty_cost_root();
+  ret = SD_simulate(-1.0);
+  xbt_dynar_free(&ret);
+  SD_task_destroy(task);
+
+  SD_application_reinit();
+
+  task = create_empty_cost_root();
+  ret = SD_simulate(-1.0);
+  xbt_dynar_free(&ret);
+  SD_task_destroy(task);
+
+  ret = SD_simulate(-1.0);
+  xbt_dynar_free(&ret);
+
+  time = SD_get_clock();
+  printf("%g\n", time);
+  fflush(stdout);
+
+  SD_exit();
 }
 
-static SD_task_t create_root_with_costs() {
-	double comp_cost[] = { 0.0, 0.0 };
-	double comm_cost[] = { 0.0, 1.0, 0.0, 0.0 };
-	SD_task_t root;
+static SD_task_t create_root_with_costs()
+{
+  double comp_cost[] = { 0.0, 0.0 };
+  double comm_cost[] = { 0.0, 1.0, 0.0, 0.0 };
+  SD_task_t root;
+
+  root = SD_task_create("Root", NULL, 1.0);
+  SD_task_schedule(root, 2, SD_workstation_get_list(), comp_cost,
+                   comm_cost, -1.0);
 
-	root = SD_task_create("Root", NULL, 1.0);
-	SD_task_schedule(root, 2, SD_workstation_get_list(), comp_cost, comm_cost,
-			-1.0);	
-	
-	return root;
+  return root;
 }
 
-static void zero_cost_test2(int *argc, char *argv[]) {
-	double time;
-	SD_task_t task;
-	
-	SD_init(argc, argv);
-	SD_create_environment(argv[1]);
-	
-	task = create_root_with_costs();
-	SD_simulate(-1.0);
-	SD_task_destroy(task);
-	
-	SD_application_reinit();
-	
-	task = create_empty_cost_root();
-	SD_simulate(-1.0);
-	SD_task_destroy(task);
-	
-	SD_simulate(-1.0);
-	
-	time = SD_get_clock();
-	printf("%g\n", time);
-	fflush(stdout);
-	
-	SD_exit();
+static void zero_cost_test2(int *argc, char *argv[])
+{
+  double time;
+  SD_task_t task;
+  xbt_dynar_t ret;
+
+  SD_init(argc, argv);
+  SD_create_environment(argv[1]);
+
+  task = create_root_with_costs();
+  ret = SD_simulate(-1.0);
+  xbt_dynar_free(&ret);
+  SD_task_destroy(task);
+
+  SD_application_reinit();
+
+  task = create_empty_cost_root();
+  ret =  SD_simulate(-1.0);
+  xbt_dynar_free(&ret);
+  SD_task_destroy(task);
+
+  ret = SD_simulate(-1.0);
+  xbt_dynar_free(&ret);
+
+  time = SD_get_clock();
+  printf("%g\n", time);
+  fflush(stdout);
+
+  SD_exit();
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
 
   zero_cost_test(&argc, argv);
 
@@ -103,4 +118,3 @@ int main(int argc, char **argv) {
 
   return 0;
 }
-