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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
teshsuite
/
simdag
/
availability
/
availability_test.c
diff --git
a/teshsuite/simdag/availability/availability_test.c
b/teshsuite/simdag/availability/availability_test.c
index
1fb03f4
..
02a7020
100644
(file)
--- a/
teshsuite/simdag/availability/availability_test.c
+++ b/
teshsuite/simdag/availability/availability_test.c
@@
-1,9
+1,15
@@
+/* Copyright (c) 2013-2015. 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 <string.h>
#include <stddef.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stddef.h>
#include <unistd.h>
-#include <sim
dag
/simdag.h>
+#include <sim
grid
/simdag.h>
#include <xbt/log.h>
#include <xbt/ex.h>
#include <signal.h>
#include <xbt/log.h>
#include <xbt/ex.h>
#include <signal.h>
@@
-63,12
+69,11
@@
static void scheduleDAX(xbt_dynar_t dax)
SD_task_t task;
const SD_workstation_t *ws_list = SD_workstation_get_list();
SD_task_t task;
const SD_workstation_t *ws_list = SD_workstation_get_list();
- int totalHosts = SD_workstation_get_
number
();
+ int totalHosts = SD_workstation_get_
count
();
qsort((void *) ws_list, totalHosts, sizeof(SD_workstation_t),
name_compare_hosts);
qsort((void *) ws_list, totalHosts, sizeof(SD_workstation_t),
name_compare_hosts);
- int count = SD_workstation_get_number();
- //fprintf(stdout, "No. workstations: %d, %d\n", count, (dax != NULL));
+ //fprintf(stdout, "No. workstations: %d, %d\n", totalHosts, (dax != NULL));
xbt_dynar_foreach(dax, cursor, task) {
if (SD_task_get_kind(task) == SD_TASK_COMP_SEQ) {
xbt_dynar_foreach(dax, cursor, task) {
if (SD_task_get_kind(task) == SD_TASK_COMP_SEQ) {
@@
-79,8
+84,8
@@
static void scheduleDAX(xbt_dynar_t dax)
SD_task_schedulel(task, 1, ws_list[0]);
} else {
fprintf(stdout, "Scheduling %s to node: %s\n", SD_task_get_name(task),
SD_task_schedulel(task, 1, ws_list[0]);
} else {
fprintf(stdout, "Scheduling %s to node: %s\n", SD_task_get_name(task),
- SD_workstation_get_name(ws_list[(cursor) %
count
]));
- SD_task_schedulel(task, 1, ws_list[(cursor) %
count
]);
+ SD_workstation_get_name(ws_list[(cursor) %
totalHosts
]));
+ SD_task_schedulel(task, 1, ws_list[(cursor) %
totalHosts
]);
}
}
}
}
}
}
@@
-149,11
+154,11
@@
static xbt_dynar_t initDynamicThrottling(int *argc, char *argv[])
*/
static void garbageCollector(xbt_dynar_t dax)
{
*/
static void garbageCollector(xbt_dynar_t dax)
{
- SD_task_t task;
- unsigned int cursor;
- xbt_dynar_foreach(dax, cursor, task) {
+ while (!xbt_dynar_is_empty(dax)) {
+ SD_task_t task = xbt_dynar_pop_as(dax, SD_task_t);
SD_task_destroy(task);
}
SD_task_destroy(task);
}
+ xbt_dynar_free(&dax);
SD_exit();
}
SD_exit();
}