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
hierarchical OOP tree
[simgrid.git]
/
src
/
instr
/
instr_TI_trace.cpp
diff --git
a/src/instr/instr_TI_trace.cpp
b/src/instr/instr_TI_trace.cpp
index
3d567cf
..
45e9e87
100644
(file)
--- a/
src/instr/instr_TI_trace.cpp
+++ b/
src/instr/instr_TI_trace.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2015. 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. */
@@
-22,22
+21,22
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_TI_trace, instr_trace, "tracing event syst
extern FILE *tracing_file;
double prefix=0.0;
extern FILE *tracing_file;
double prefix=0.0;
-xbt_dict_t tracing_files =
NULL
;
+xbt_dict_t tracing_files =
nullptr
;
extern s_instr_trace_writer_t active_writer;
extern s_instr_trace_writer_t active_writer;
-void TRACE_TI_init(
void
)
+void TRACE_TI_init()
{
{
- active_writer.print_PushState
=
print_TIPushState;
- active_writer.print_CreateContainer
=
print_TICreateContainer;
- active_writer.print_DestroyContainer
=
print_TIDestroyContainer;
+ active_writer.print_PushState
= &
print_TIPushState;
+ active_writer.print_CreateContainer
= &
print_TICreateContainer;
+ active_writer.print_DestroyContainer
= &
print_TIDestroyContainer;
}
}
-void TRACE_TI_start(
void
)
+void TRACE_TI_start()
{
char *filename = TRACE_get_filename();
tracing_file = fopen(filename, "w");
{
char *filename = TRACE_get_filename();
tracing_file = fopen(filename, "w");
- if (tracing_file ==
NULL
) {
+ if (tracing_file ==
nullptr
) {
THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename);
}
THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename);
}
@@
-50,7
+49,7
@@
void TRACE_TI_start(void)
dump_comment_file(TRACE_get_comment_file());
}
dump_comment_file(TRACE_get_comment_file());
}
-void TRACE_TI_end(
void
)
+void TRACE_TI_end()
{
xbt_dict_free(&tracing_files);
fclose(tracing_file);
{
xbt_dict_free(&tracing_files);
fclose(tracing_file);
@@
-61,17
+60,18
@@
void TRACE_TI_end(void)
void print_TICreateContainer(paje_event_t event)
{
//if we are in the mode with only one file
void print_TICreateContainer(paje_event_t event)
{
//if we are in the mode with only one file
- static FILE *temp =
NULL
;
+ static FILE *temp =
nullptr
;
- if (tracing_files ==
NULL
) {
- tracing_files = xbt_dict_new_homogeneous(
NULL
);
+ if (tracing_files ==
nullptr
) {
+ tracing_files = xbt_dict_new_homogeneous(
nullptr
);
//generate unique run id with time
prefix = xbt_os_time();
}
//generate unique run id with time
prefix = xbt_os_time();
}
- if (!xbt_cfg_get_boolean("tracing/smpi/format/ti
_one_file") || temp == NULL
) {
+ if (!xbt_cfg_get_boolean("tracing/smpi/format/ti
-one-file") || temp == nullptr
) {
char *folder_name = bprintf("%s_files", TRACE_get_filename());
char *folder_name = bprintf("%s_files", TRACE_get_filename());
- char *filename = bprintf("%s/%f_%s.txt", folder_name, prefix, ((createContainer_t) event->data)->container->name);
+ char *filename = bprintf("%s/%f_%s.txt", folder_name, prefix,
+ static_cast<CreateContainerEvent*>(event)->container->name);
#ifdef WIN32
_mkdir(folder_name);
#else
#ifdef WIN32
_mkdir(folder_name);
#else
@@
-85,35
+85,35
@@
void print_TICreateContainer(paje_event_t event)
xbt_free(filename);
}
xbt_free(filename);
}
- xbt_dict_set(tracing_files, ((
createContainer_t) event->data)->container->name, (void *) temp, NULL
);
+ xbt_dict_set(tracing_files, ((
CreateContainerEvent*) event)->container->name, (void *) temp, nullptr
);
}
void print_TIDestroyContainer(paje_event_t event)
{
}
void print_TIDestroyContainer(paje_event_t event)
{
- if (!xbt_cfg_get_boolean("tracing/smpi/format/ti
_one_
file")|| xbt_dict_length(tracing_files) == 1) {
- FILE* f = (FILE*)xbt_dict_get_or_null(tracing_files, ((
destroyContainer_t) event->data
)->container->name);
+ if (!xbt_cfg_get_boolean("tracing/smpi/format/ti
-one-
file")|| xbt_dict_length(tracing_files) == 1) {
+ FILE* f = (FILE*)xbt_dict_get_or_null(tracing_files, ((
DestroyContainerEvent *) event
)->container->name);
fclose(f);
}
fclose(f);
}
- xbt_dict_remove(tracing_files, ((
destroyContainer_t) event->data
)->container->name);
+ xbt_dict_remove(tracing_files, ((
DestroyContainerEvent*) event
)->container->name);
}
void print_TIPushState(paje_event_t event)
{
int i;
}
void print_TIPushState(paje_event_t event)
{
int i;
- //char* function=
NULL
;
- if (((
pushState_t) event->data)->extra == NULL
)
+ //char* function=
nullptr
;
+ if (((
PushStateEvent*) event->data)->extra == nullptr
)
return;
return;
- instr_extra_data extra = (instr_extra_data) (((
pushState_t
) event->data)->extra);
+ instr_extra_data extra = (instr_extra_data) (((
PushStateEvent*
) event->data)->extra);
- char *process_id =
NULL
;
+ char *process_id =
nullptr
;
//FIXME: dirty extract "rank-" from the name, as we want the bare process id here
//FIXME: dirty extract "rank-" from the name, as we want the bare process id here
- if (strstr(((
pushState_t) event->data)->container->name, "rank-") == NULL
)
- process_id = xbt_strdup(((
pushState_t
) event->data)->container->name);
+ if (strstr(((
PushStateEvent*) event->data)->container->name, "rank-") == nullptr
)
+ process_id = xbt_strdup(((
PushStateEvent*
) event->data)->container->name);
else
else
- process_id = xbt_strdup(((
pushState_t
) event->data)->container->name + 5);
+ process_id = xbt_strdup(((
PushStateEvent*
) event->data)->container->name + 5);
- FILE* trace_file = (FILE* )xbt_dict_get(tracing_files, ((
pushState_t) event->data
)->container->name);
+ FILE* trace_file = (FILE* )xbt_dict_get(tracing_files, ((
PushStateEvent*) event
)->container->name);
switch (extra->type) {
case TRACING_INIT:
switch (extra->type) {
case TRACING_INIT:
@@
-216,13
+216,13
@@
void print_TIPushState(paje_event_t event)
case TRACING_ISSEND:
default:
XBT_WARN ("Call from %s impossible to translate into replay command : Not implemented (yet)",
case TRACING_ISSEND:
default:
XBT_WARN ("Call from %s impossible to translate into replay command : Not implemented (yet)",
- ((
pushState_t
) event->data)->value->name);
+ ((
PushStateEvent*
) event->data)->value->name);
break;
}
break;
}
- if (extra->recvcounts !=
NULL
)
+ if (extra->recvcounts !=
nullptr
)
xbt_free(extra->recvcounts);
xbt_free(extra->recvcounts);
- if (extra->sendcounts !=
NULL
)
+ if (extra->sendcounts !=
nullptr
)
xbt_free(extra->sendcounts);
xbt_free(process_id);
xbt_free(extra);
xbt_free(extra->sendcounts);
xbt_free(process_id);
xbt_free(extra);