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
Always initialize task->category...
[simgrid.git]
/
src
/
instr
/
surf_instr.c
diff --git
a/src/instr/surf_instr.c
b/src/instr/surf_instr.c
index
6f48031
..
bbc10f4
100644
(file)
--- a/
src/instr/surf_instr.c
+++ b/
src/instr/surf_instr.c
@@
-65,8
+65,7
@@
static void TRACE_surf_set_resource_variable(double date,
return;
}
}
return;
}
}
- if (IS_TRACING_PLATFORM)
- pajeSetVariable(date, variable, resource, aux);
+ pajeSetVariable(date, variable, resource, aux);
xbt_dict_set(resource_variables, xbt_strdup(key), xbt_strdup(aux),
xbt_free);
}
xbt_dict_set(resource_variables, xbt_strdup(key), xbt_strdup(aux),
xbt_free);
}
@@
-86,6
+85,10
@@
void TRACE_surf_link_declaration(void *link, char *name, double bw,
if (!IS_TRACING)
return;
if (!IS_TRACING)
return;
+ if (!link){
+ xbt_die ("link is NULL");
+ }
+
//filter out loopback
if (!strcmp(name, "loopback") || !strcmp(name, "__loopback__"))
return;
//filter out loopback
if (!strcmp(name, "loopback") || !strcmp(name, "__loopback__"))
return;
@@
-119,12
+122,16
@@
void TRACE_surf_host_declaration(const char *name, double power)
void TRACE_surf_host_set_power(double date, const char *resource,
double power)
{
void TRACE_surf_host_set_power(double date, const char *resource,
double power)
{
+ if (!IS_TRACING)
+ return;
TRACE_surf_set_resource_variable(date, "power", resource, power);
}
void TRACE_surf_link_set_bandwidth(double date, void *link,
double bandwidth)
{
TRACE_surf_set_resource_variable(date, "power", resource, power);
}
void TRACE_surf_link_set_bandwidth(double date, void *link,
double bandwidth)
{
+ if (!IS_TRACING)
+ return;
if (!TRACE_surf_link_is_traced(link))
return;
if (!TRACE_surf_link_is_traced(link))
return;
@@
-135,6
+142,8
@@
void TRACE_surf_link_set_bandwidth(double date, void *link,
void TRACE_surf_link_set_latency(double date, void *link, double latency)
{
void TRACE_surf_link_set_latency(double date, void *link, double latency)
{
+ if (!IS_TRACING)
+ return;
if (!TRACE_surf_link_is_traced(link))
return;
if (!TRACE_surf_link_is_traced(link))
return;
@@
-237,8
+246,8
@@
void TRACE_surf_save_onelink(void)
char resource[100];
snprintf(resource, 100, "%p", link);
char resource[100];
snprintf(resource, 100, "%p", link);
- pajeNewEvent(0
.1
, "source", resource, src);
- pajeNewEvent(0
.1
, "destination", resource, dst);
+ pajeNewEvent(0, "source", resource, src);
+ pajeNewEvent(0, "destination", resource, dst);
}
}
}
}
}
}
@@
-260,9
+269,9
@@
void TRACE_surf_action(surf_action_t surf_action, const char *category)
return;
if (!IS_TRACING_PLATFORM)
return;
return;
if (!IS_TRACING_PLATFORM)
return;
- if (!category)
{
-
xbt_die("invalid tracing category")
;
- }
+ if (!category)
+
return
;
+
surf_action->category = xbt_new(char, strlen(category) + 1);
strncpy(surf_action->category, category, strlen(category) + 1);
}
surf_action->category = xbt_new(char, strlen(category) + 1);
strncpy(surf_action->category, category, strlen(category) + 1);
}