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
manage links in a different way (to help tracing gtnets fullduplex behavior)
[simgrid.git]
/
src
/
surf
/
trace_mgr.c
diff --git
a/src/surf/trace_mgr.c
b/src/surf/trace_mgr.c
index
7cc1226
..
03827df
100644
(file)
--- a/
src/surf/trace_mgr.c
+++ b/
src/surf/trace_mgr.c
@@
-1,6
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2007, 2009, 2010. 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. */
/* 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. */
@@
-101,6
+100,7
@@
tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
tmgr_trace_t tmgr_trace_new(const char *filename)
{
tmgr_trace_t tmgr_trace_new(const char *filename)
{
+ char *tstr = NULL;
FILE *f = NULL;
tmgr_trace_t trace = NULL;
FILE *f = NULL;
tmgr_trace_t trace = NULL;
@@
-119,7
+119,7
@@
tmgr_trace_t tmgr_trace_new(const char *filename)
xbt_assert2(f!=NULL, "Cannot open file '%s' (path=%s)", filename,
xbt_str_join(surf_path,":"));
xbt_assert2(f!=NULL, "Cannot open file '%s' (path=%s)", filename,
xbt_str_join(surf_path,":"));
-
char *
tstr = xbt_str_from_file(f);
+ tstr = xbt_str_from_file(f);
fclose(f);
trace = tmgr_trace_new_from_string(filename, tstr, 0.);
xbt_free(tstr);
fclose(f);
trace = tmgr_trace_new_from_string(filename, tstr, 0.);
xbt_free(tstr);