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
Remove useless comments.
[simgrid.git]
/
src
/
surf
/
trace_mgr.c
diff --git
a/src/surf/trace_mgr.c
b/src/surf/trace_mgr.c
index
e16eccc
..
d349c22
100644
(file)
--- a/
src/surf/trace_mgr.c
+++ b/
src/surf/trace_mgr.c
@@
-9,6
+9,9
@@
#include "trace_mgr_private.h"
#include <stdlib.h>
#include "trace_mgr_private.h"
#include <stdlib.h>
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trace, surf,
+ "Logging specific to the SURF trace module");
+
static xbt_dict_t trace_list = NULL;
static void _tmgr_trace_free(void *trace)
{
static xbt_dict_t trace_list = NULL;
static void _tmgr_trace_free(void *trace)
{
@@
-38,8
+41,6
@@
tmgr_trace_t tmgr_trace_new(const char *filename)
FILE *f = NULL;
int linecount = 0;
char line[256];
FILE *f = NULL;
int linecount = 0;
char line[256];
- xbt_heap_float_t current_time = 0.0, previous_time = 0.0;
- xbt_maxmin_float_t value = -1.0;
xbt_heap_float_t periodicity = -1.0; /* No periodicity by default */
s_tmgr_event_t event;
tmgr_event_t last_event = NULL;
xbt_heap_float_t periodicity = -1.0; /* No periodicity by default */
s_tmgr_event_t event;
tmgr_event_t last_event = NULL;
@@
-50,11
+51,9
@@
tmgr_trace_t tmgr_trace_new(const char *filename)
return trace;
}
return trace;
}
- /* Parsing et création de la trace */
-
if ((f = fopen(filename, "r")) == NULL) {
if ((f = fopen(filename, "r")) == NULL) {
-
fprintf(stderr,
"Cannot open file '%s'\n", filename);
-
return NULL
;
+
CRITICAL1(
"Cannot open file '%s'\n", filename);
+
xbt_abort()
;
}
trace = xbt_new0(s_tmgr_trace_t, 1);
}
trace = xbt_new0(s_tmgr_trace_t, 1);
@@
-68,13
+67,9
@@
tmgr_trace_t tmgr_trace_new(const char *filename)
if (sscanf(line, "PERIODICITY " XBT_HEAP_FLOAT_T "\n", &(periodicity))
== 1) {
if (periodicity <= 0) {
if (sscanf(line, "PERIODICITY " XBT_HEAP_FLOAT_T "\n", &(periodicity))
== 1) {
if (periodicity <= 0) {
- fprintf(stderr,
- "%s,%d: Syntax error. Periodicity has to be positive\n",
- filename, linecount);
- abort();
-/* xbt_dynar_free(&(trace->event_list)); */
-/* xbt_free(trace); */
-/* return NULL; */
+ CRITICAL2("%s,%d: Syntax error. Periodicity has to be positive\n",
+ filename, linecount);
+ xbt_abort();
}
continue;
}
}
continue;
}
@@
-82,19
+77,15
@@
tmgr_trace_t tmgr_trace_new(const char *filename)
if (sscanf
(line, XBT_HEAP_FLOAT_T " " XBT_MAXMIN_FLOAT_T "\n", &event.delta,
&event.value) != 2) {
if (sscanf
(line, XBT_HEAP_FLOAT_T " " XBT_MAXMIN_FLOAT_T "\n", &event.delta,
&event.value) != 2) {
- fprintf(stderr, "%s,%d: Syntax error\n", filename, linecount);
- abort();
-/* xbt_dynar_free(&(trace->event_list)); */
-/* xbt_free(trace); */
-/* return NULL; */
+ CRITICAL2("%s,%d: Syntax error\n", filename, linecount);
+ xbt_abort();
}
if (last_event) {
if ((last_event->delta = event.delta - last_event->delta) <= 0) {
}
if (last_event) {
if ((last_event->delta = event.delta - last_event->delta) <= 0) {
- fprintf(stderr,
- "%s,%d: Invalid trace value, events have to be sorted\n",
- filename, linecount);
- abort();
+ CRITICAL2("%s,%d: Invalid trace value, events have to be sorted\n",
+ filename, linecount);
+ xbt_abort();
}
}
xbt_dynar_push(trace->event_list, &event);
}
}
xbt_dynar_push(trace->event_list, &event);
@@
-142,7
+133,7
@@
tmgr_trace_event_t tmgr_history_add_trace(tmgr_history_t history, tmgr_trace_t t
trace_event->resource = resource;
if (trace_event->idx >= xbt_dynar_length(trace->event_list))
trace_event->resource = resource;
if (trace_event->idx >= xbt_dynar_length(trace->event_list))
- abort();
+
xbt_
abort();
xbt_heap_push(history->heap, trace_event, start_time);
xbt_heap_push(history->heap, trace_event, start_time);
@@
-192,3
+183,8
@@
tmgr_trace_event_t tmgr_history_get_next_event_leq(tmgr_history_t history,
return trace_event;
}
return trace_event;
}
+
+void tmgr_finalize(void)
+{
+ xbt_dict_free(&trace_list);
+}