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
permission change
[simgrid.git]
/
src
/
instr
/
instr_interface.c
diff --git
a/src/instr/instr_interface.c
b/src/instr/instr_interface.c
index e18be1f617eb2e2bdc688eb71e79efaf08d15a18..a8e97d3409b23063100742e32284a1f710be4a4b 100644
(file)
--- a/
src/instr/instr_interface.c
+++ b/
src/instr/instr_interface.c
@@
-1,14
+1,15
@@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010
-2014
. 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
-
* under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid_config.h"
#ifdef HAVE_TRACING
#include "instr/instr_private.h"
#include "simgrid_config.h"
#ifdef HAVE_TRACING
#include "instr/instr_private.h"
-#include "surf/network_private.h"
+#include "surf/surf.h"
+#include "surf/surf_private.h"
typedef enum {
INSTR_US_DECLARE,
typedef enum {
INSTR_US_DECLARE,
@@
-374,7
+375,7
@@
static void instr_user_srcdst_variable(double time,
unsigned int i;
void *link;
xbt_dynar_foreach (route, i, link) {
unsigned int i;
void *link;
xbt_dynar_foreach (route, i, link) {
- char *link_name = (
(link_CM02_t)link)->lmm_resource.generic_resource.name
;
+ char *link_name = (
char*)surf_resource_name(link)
;
instr_user_variable (time, link_name, variable, father_type, value, what, NULL, user_link_variables);
}
}
instr_user_variable (time, link_name, variable, father_type, value, what, NULL, user_link_variables);
}
}