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 git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
[simgrid.git]
/
src
/
instr
/
jedule
/
jedule_sd_binding.c
diff --git
a/src/instr/jedule/jedule_sd_binding.c
b/src/instr/jedule/jedule_sd_binding.c
index
8cf0f77
..
fd6c9bc
100644
(file)
--- a/
src/instr/jedule/jedule_sd_binding.c
+++ b/
src/instr/jedule/jedule_sd_binding.c
@@
-12,6
+12,7
@@
#include "xbt/dynar.h"
#include "surf/surf_private.h"
#include "xbt/dynar.h"
#include "surf/surf_private.h"
+#include "surf/surf_resource.h"
#include "surf/surf.h"
#include "instr/jedule/jedule_sd_binding.h"
#include "surf/surf.h"
#include "instr/jedule/jedule_sd_binding.h"
@@
-56,22
+57,22
@@
void jedule_log_sd_event(SD_task_t task) {
static void create_hierarchy(AS_t current_comp,
jed_simgrid_container_t current_container) {
xbt_dict_cursor_t cursor = NULL;
static void create_hierarchy(AS_t current_comp,
jed_simgrid_container_t current_container) {
xbt_dict_cursor_t cursor = NULL;
+ unsigned int dynar_cursor;
char *key;
AS_t elem;
network_element_t network_elem;
char *key;
AS_t elem;
network_element_t network_elem;
- if(
xbt_dict_length(current_comp->routing_sons) == 0
) {
+ if(
xbt_dict_is_empty(current_comp->routing_sons)
) {
// I am no AS
// add hosts to jedule platform
xbt_dynar_t hosts;
hosts = xbt_dynar_new(sizeof(char*), NULL);
// I am no AS
// add hosts to jedule platform
xbt_dynar_t hosts;
hosts = xbt_dynar_new(sizeof(char*), NULL);
- xbt_dict_foreach(current_comp->to_index, cursor, key, network_elem) {
+ xbt_dynar_foreach(current_comp->index_network_elm,
+ dynar_cursor, network_elem) {
char *hostname;
char *hostname;
- XBT_DEBUG("key %s value %p\n", key, network_elem);
- //xbt_dynar_push_as(hosts, char*, key);
- hostname = strdup(key);
+ hostname = strdup(network_elem->name);
xbt_dynar_push(hosts, &hostname);
}
xbt_dynar_push(hosts, &hostname);
}