A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright notices
[simgrid.git]
/
teshsuite
/
simdag
/
network
/
test_reinit_costs.c
diff --git
a/teshsuite/simdag/network/test_reinit_costs.c
b/teshsuite/simdag/network/test_reinit_costs.c
index
1fbd3da
..
bc73a2a
100644
(file)
--- a/
teshsuite/simdag/network/test_reinit_costs.c
+++ b/
teshsuite/simdag/network/test_reinit_costs.c
@@
-1,6
+1,6
@@
/* Computation tests */
/* Computation tests */
-/* Copyright (c) 2007, 2009
, 2010
. The SimGrid Team.
+/* Copyright (c) 2007, 2009
-2011, 2013-2015
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-9,7
+9,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "sim
dag
/simdag.h"
+#include "sim
grid
/simdag.h"
/*
* This test checks if the reinitialization of
/*
* This test checks if the reinitialization of
@@
-38,21
+38,25
@@
static void zero_cost_test(int *argc, char *argv[])
{
double time;
SD_task_t task;
{
double time;
SD_task_t task;
+ xbt_dynar_t ret;
SD_init(argc, argv);
SD_create_environment(argv[1]);
task = create_empty_cost_root();
SD_init(argc, argv);
SD_create_environment(argv[1]);
task = create_empty_cost_root();
- SD_simulate(-1.0);
+ ret = SD_simulate(-1.0);
+ xbt_dynar_free(&ret);
SD_task_destroy(task);
SD_application_reinit();
task = create_empty_cost_root();
SD_task_destroy(task);
SD_application_reinit();
task = create_empty_cost_root();
- SD_simulate(-1.0);
+ ret = SD_simulate(-1.0);
+ xbt_dynar_free(&ret);
SD_task_destroy(task);
SD_task_destroy(task);
- SD_simulate(-1.0);
+ ret = SD_simulate(-1.0);
+ xbt_dynar_free(&ret);
time = SD_get_clock();
printf("%g\n", time);
time = SD_get_clock();
printf("%g\n", time);
@@
-68,8
+72,8
@@
static SD_task_t create_root_with_costs()
SD_task_t root;
root = SD_task_create("Root", NULL, 1.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);
+ SD_task_schedule(root, 2, SD_workstation_get_list(), comp_cost,
+
comm_cost,
-1.0);
return root;
}
return root;
}
@@
-78,21
+82,25
@@
static void zero_cost_test2(int *argc, char *argv[])
{
double time;
SD_task_t task;
{
double time;
SD_task_t task;
+ xbt_dynar_t ret;
SD_init(argc, argv);
SD_create_environment(argv[1]);
task = create_root_with_costs();
SD_init(argc, argv);
SD_create_environment(argv[1]);
task = create_root_with_costs();
- SD_simulate(-1.0);
+ ret = SD_simulate(-1.0);
+ xbt_dynar_free(&ret);
SD_task_destroy(task);
SD_application_reinit();
task = create_empty_cost_root();
SD_task_destroy(task);
SD_application_reinit();
task = create_empty_cost_root();
- SD_simulate(-1.0);
+ ret = SD_simulate(-1.0);
+ xbt_dynar_free(&ret);
SD_task_destroy(task);
SD_task_destroy(task);
- SD_simulate(-1.0);
+ ret = SD_simulate(-1.0);
+ xbt_dynar_free(&ret);
time = SD_get_clock();
printf("%g\n", time);
time = SD_get_clock();
printf("%g\n", time);