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
[trace] fix comment
[simgrid.git]
/
src
/
instr
/
instr_paje_trace.c
diff --git
a/src/instr/instr_paje_trace.c
b/src/instr/instr_paje_trace.c
index
4a60ed3
..
916e18a
100644
(file)
--- a/
src/instr/instr_paje_trace.c
+++ b/
src/instr/instr_paje_trace.c
@@
-27,7
+27,7
@@
typedef enum {
PAJE_PopState,
PAJE_StartLink,
PAJE_EndLink,
PAJE_PopState,
PAJE_StartLink,
PAJE_EndLink,
- PAJE_NewEvent
,
+ PAJE_NewEvent
} e_event_type;
typedef struct paje_event *paje_event_t;
} e_event_type;
typedef struct paje_event *paje_event_t;
@@
-155,7
+155,9
@@
void TRACE_paje_start(void)
{
char *filename = TRACE_get_filename();
tracing_file = fopen(filename, "w");
{
char *filename = TRACE_get_filename();
tracing_file = fopen(filename, "w");
- xbt_assert (tracing_file != NULL, "Tracefile %s could not be opened for writing.", filename);
+ if (tracing_file == NULL){
+ THROWF (system_error, 1, "Tracefile %s could not be opened for writing.", filename);
+ }
XBT_DEBUG("Filename %s is open for writing", filename);
XBT_DEBUG("Filename %s is open for writing", filename);
@@
-169,6
+171,7
@@
void TRACE_paje_end(void)
{
fclose(tracing_file);
char *filename = TRACE_get_filename();
{
fclose(tracing_file);
char *filename = TRACE_get_filename();
+ xbt_dynar_free (&buffer);
XBT_DEBUG("Filename %s is closed", filename);
}
XBT_DEBUG("Filename %s is closed", filename);
}
@@
-208,36
+211,36
@@
void TRACE_paje_create_header(void)
fprintf(tracing_file, "\
%%EventDef PajeDefineContainerType %d \n\
%% Alias string \n\
fprintf(tracing_file, "\
%%EventDef PajeDefineContainerType %d \n\
%% Alias string \n\
-%%
Container
Type string \n\
+%% Type string \n\
%% Name string \n\
%%EndEventDef \n\
%%EventDef PajeDefineVariableType %d \n\
%% Alias string \n\
%% Name string \n\
%%EndEventDef \n\
%%EventDef PajeDefineVariableType %d \n\
%% Alias string \n\
-%%
Container
Type string \n\
+%% Type string \n\
%% Name string \n\
%% Color color \n\
%%EndEventDef \n\
%%EventDef PajeDefineStateType %d \n\
%% Alias string \n\
%% Name string \n\
%% Color color \n\
%%EndEventDef \n\
%%EventDef PajeDefineStateType %d \n\
%% Alias string \n\
-%%
Container
Type string \n\
+%% Type string \n\
%% Name string \n\
%%EndEventDef \n\
%%EventDef PajeDefineEventType %d \n\
%% Alias string \n\
%% Name string \n\
%%EndEventDef \n\
%%EventDef PajeDefineEventType %d \n\
%% Alias string \n\
-%%
Container
Type string \n\
+%% Type string \n\
%% Name string \n\
%% Color color \n\
%%EndEventDef \n\
%%EventDef PajeDefineLinkType %d \n\
%% Alias string \n\
%% Name string \n\
%% Color color \n\
%%EndEventDef \n\
%%EventDef PajeDefineLinkType %d \n\
%% Alias string \n\
-%%
Container
Type string \n\
-%% S
ource
ContainerType string \n\
-%%
Dest
ContainerType string \n\
+%% Type string \n\
+%% S
tart
ContainerType string \n\
+%%
End
ContainerType string \n\
%% Name string \n\
%%EndEventDef \n\
%%EventDef PajeDefineEntityValue %d \n\
%% Alias string \n\
%% Name string \n\
%%EndEventDef \n\
%%EventDef PajeDefineEntityValue %d \n\
%% Alias string \n\
-%%
Entity
Type string \n\
+%% Type string \n\
%% Name string \n\
%% Color color \n\
%%EndEventDef \n\
%% Name string \n\
%% Color color \n\
%%EndEventDef \n\
@@
-293,7
+296,7
@@
void TRACE_paje_create_header(void)
%% Type string \n\
%% Container string \n\
%% Value string \n\
%% Type string \n\
%% Container string \n\
%% Value string \n\
-%% S
ource
Container string \n\
+%% S
tart
Container string \n\
%% Key string \n\
%%EndEventDef\n\
%%EventDef PajeEndLink %d \n\
%% Key string \n\
%%EndEventDef\n\
%%EventDef PajeEndLink %d \n\
@@
-301,7
+304,7
@@
void TRACE_paje_create_header(void)
%% Type string \n\
%% Container string \n\
%% Value string \n\
%% Type string \n\
%% Container string \n\
%% Value string \n\
-%%
Dest
Container string \n\
+%%
End
Container string \n\
%% Key string \n\
%%EndEventDef\n\
%%EventDef PajeNewEvent %d \n\
%% Key string \n\
%%EndEventDef\n\
%%EventDef PajeNewEvent %d \n\
@@
-337,7
+340,8
@@
static void insert_into_buffer (paje_event_t tbi)
tbi->free (tbi);
return;
}
tbi->free (tbi);
return;
}
- XBT_DEBUG("%s: insert event_type=%d, timestamp=%f, buffersize=%ld)", __FUNCTION__, tbi->event_type, tbi->timestamp, xbt_dynar_length(buffer));
+ XBT_DEBUG("%s: insert event_type=%d, timestamp=%f, buffersize=%lu)",
+ __FUNCTION__, (int)tbi->event_type, tbi->timestamp, xbt_dynar_length(buffer));
unsigned int i;
for (i = xbt_dynar_length(buffer); i > 0; i--) {
unsigned int i;
for (i = xbt_dynar_length(buffer); i > 0; i--) {
@@
-349,15
+353,15
@@
static void insert_into_buffer (paje_event_t tbi)
if (i == 0)
XBT_DEBUG("%s: inserted at beginning", __FUNCTION__);
else
if (i == 0)
XBT_DEBUG("%s: inserted at beginning", __FUNCTION__);
else
- XBT_DEBUG("%s: inserted at%s %
d
", __FUNCTION__,
+ XBT_DEBUG("%s: inserted at%s %
u
", __FUNCTION__,
(i == xbt_dynar_length(buffer) - 1 ? " end, pos =" : ""), i);
}
static void print_pajeDefineContainerType(paje_event_t event)
{
(i == xbt_dynar_length(buffer) - 1 ? " end, pos =" : ""), i);
}
static void print_pajeDefineContainerType(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
fprintf(tracing_file, "%d %s %s %s\n",
fprintf(tracing_file, "%d %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
((defineContainerType_t)event->data)->type->id,
((defineContainerType_t)event->data)->type->father->id,
((defineContainerType_t)event->data)->type->name);
((defineContainerType_t)event->data)->type->id,
((defineContainerType_t)event->data)->type->father->id,
((defineContainerType_t)event->data)->type->name);
@@
-365,9
+369,9
@@
static void print_pajeDefineContainerType(paje_event_t event)
static void print_pajeDefineVariableType(paje_event_t event)
{
static void print_pajeDefineVariableType(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
- event->event_type,
+
(int)
event->event_type,
((defineVariableType_t)event->data)->type->id,
((defineVariableType_t)event->data)->type->father->id,
((defineVariableType_t)event->data)->type->name,
((defineVariableType_t)event->data)->type->id,
((defineVariableType_t)event->data)->type->father->id,
((defineVariableType_t)event->data)->type->name,
@@
-376,9
+380,9
@@
static void print_pajeDefineVariableType(paje_event_t event)
static void print_pajeDefineStateType(paje_event_t event)
{
static void print_pajeDefineStateType(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
fprintf(tracing_file, "%d %s %s %s\n",
fprintf(tracing_file, "%d %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
((defineStateType_t)event->data)->type->id,
((defineStateType_t)event->data)->type->father->id,
((defineStateType_t)event->data)->type->name);
((defineStateType_t)event->data)->type->id,
((defineStateType_t)event->data)->type->father->id,
((defineStateType_t)event->data)->type->name);
@@
-386,9
+390,9
@@
static void print_pajeDefineStateType(paje_event_t event)
static void print_pajeDefineEventType(paje_event_t event)
{
static void print_pajeDefineEventType(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
- event->event_type,
+
(int)
event->event_type,
((defineEventType_t)event->data)->type->id,
((defineEventType_t)event->data)->type->father->id,
((defineEventType_t)event->data)->type->name,
((defineEventType_t)event->data)->type->id,
((defineEventType_t)event->data)->type->father->id,
((defineEventType_t)event->data)->type->name,
@@
-397,9
+401,9
@@
static void print_pajeDefineEventType(paje_event_t event)
static void print_pajeDefineLinkType(paje_event_t event)
{
static void print_pajeDefineLinkType(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
fprintf(tracing_file, "%d %s %s %s %s %s\n",
fprintf(tracing_file, "%d %s %s %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
((defineLinkType_t)event->data)->type->id,
((defineLinkType_t)event->data)->type->father->id,
((defineLinkType_t)event->data)->source->id,
((defineLinkType_t)event->data)->type->id,
((defineLinkType_t)event->data)->type->father->id,
((defineLinkType_t)event->data)->source->id,
@@
-409,9
+413,9
@@
static void print_pajeDefineLinkType(paje_event_t event)
static void print_pajeDefineEntityValue (paje_event_t event)
{
static void print_pajeDefineEntityValue (paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
- event->event_type,
+
(int)
event->event_type,
((defineEntityValue_t)event->data)->value->id,
((defineEntityValue_t)event->data)->value->father->id,
((defineEntityValue_t)event->data)->value->name,
((defineEntityValue_t)event->data)->value->id,
((defineEntityValue_t)event->data)->value->father->id,
((defineEntityValue_t)event->data)->value->name,
@@
-420,17
+424,17
@@
static void print_pajeDefineEntityValue (paje_event_t event)
static void print_pajeCreateContainer(paje_event_t event)
{
static void print_pajeCreateContainer(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s \"%s\"\n",
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s \"%s\"\n",
- event->event_type,
+
(int)
event->event_type,
((createContainer_t)event->data)->container->id,
((createContainer_t)event->data)->container->type->id,
((createContainer_t)event->data)->container->father->id,
((createContainer_t)event->data)->container->name);
}else{
fprintf(tracing_file, "%d %lf %s %s %s \"%s\"\n",
((createContainer_t)event->data)->container->id,
((createContainer_t)event->data)->container->type->id,
((createContainer_t)event->data)->container->father->id,
((createContainer_t)event->data)->container->name);
}else{
fprintf(tracing_file, "%d %lf %s %s %s \"%s\"\n",
- event->event_type,
+
(int)
event->event_type,
event->timestamp,
((createContainer_t)event->data)->container->id,
((createContainer_t)event->data)->container->type->id,
event->timestamp,
((createContainer_t)event->data)->container->id,
((createContainer_t)event->data)->container->type->id,
@@
-441,15
+445,15
@@
static void print_pajeCreateContainer(paje_event_t event)
static void print_pajeDestroyContainer(paje_event_t event)
{
static void print_pajeDestroyContainer(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s\n",
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s\n",
- event->event_type,
+
(int)
event->event_type,
((destroyContainer_t)event->data)->container->type->id,
((destroyContainer_t)event->data)->container->id);
}else{
fprintf(tracing_file, "%d %lf %s %s\n",
((destroyContainer_t)event->data)->container->type->id,
((destroyContainer_t)event->data)->container->id);
}else{
fprintf(tracing_file, "%d %lf %s %s\n",
- event->event_type,
+
(int)
event->event_type,
event->timestamp,
((destroyContainer_t)event->data)->container->type->id,
((destroyContainer_t)event->data)->container->id);
event->timestamp,
((destroyContainer_t)event->data)->container->type->id,
((destroyContainer_t)event->data)->container->id);
@@
-458,16
+462,16
@@
static void print_pajeDestroyContainer(paje_event_t event)
static void print_pajeSetVariable(paje_event_t event)
{
static void print_pajeSetVariable(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %f\n",
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %f\n",
- event->event_type,
+
(int)
event->event_type,
((setVariable_t)event->data)->type->id,
((setVariable_t)event->data)->container->id,
((setVariable_t)event->data)->value);
}else{
fprintf(tracing_file, "%d %lf %s %s %f\n",
((setVariable_t)event->data)->type->id,
((setVariable_t)event->data)->container->id,
((setVariable_t)event->data)->value);
}else{
fprintf(tracing_file, "%d %lf %s %s %f\n",
- event->event_type,
+
(int)
event->event_type,
event->timestamp,
((setVariable_t)event->data)->type->id,
((setVariable_t)event->data)->container->id,
event->timestamp,
((setVariable_t)event->data)->type->id,
((setVariable_t)event->data)->container->id,
@@
-477,16
+481,16
@@
static void print_pajeSetVariable(paje_event_t event)
static void print_pajeAddVariable(paje_event_t event)
{
static void print_pajeAddVariable(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %f\n",
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %f\n",
- event->event_type,
+
(int)
event->event_type,
((addVariable_t)event->data)->type->id,
((addVariable_t)event->data)->container->id,
((addVariable_t)event->data)->value);
}else{
fprintf(tracing_file, "%d %lf %s %s %f\n",
((addVariable_t)event->data)->type->id,
((addVariable_t)event->data)->container->id,
((addVariable_t)event->data)->value);
}else{
fprintf(tracing_file, "%d %lf %s %s %f\n",
- event->event_type,
+
(int)
event->event_type,
event->timestamp,
((addVariable_t)event->data)->type->id,
((addVariable_t)event->data)->container->id,
event->timestamp,
((addVariable_t)event->data)->type->id,
((addVariable_t)event->data)->container->id,
@@
-496,16
+500,16
@@
static void print_pajeAddVariable(paje_event_t event)
static void print_pajeSubVariable(paje_event_t event)
{
static void print_pajeSubVariable(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %f\n",
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %f\n",
- event->event_type,
+
(int)
event->event_type,
((subVariable_t)event->data)->type->id,
((subVariable_t)event->data)->container->id,
((subVariable_t)event->data)->value);
}else{
fprintf(tracing_file, "%d %lf %s %s %f\n",
((subVariable_t)event->data)->type->id,
((subVariable_t)event->data)->container->id,
((subVariable_t)event->data)->value);
}else{
fprintf(tracing_file, "%d %lf %s %s %f\n",
- event->event_type,
+
(int)
event->event_type,
event->timestamp,
((subVariable_t)event->data)->type->id,
((subVariable_t)event->data)->container->id,
event->timestamp,
((subVariable_t)event->data)->type->id,
((subVariable_t)event->data)->container->id,
@@
-515,16
+519,16
@@
static void print_pajeSubVariable(paje_event_t event)
static void print_pajeSetState(paje_event_t event)
{
static void print_pajeSetState(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s\n",
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
((setState_t)event->data)->type->id,
((setState_t)event->data)->container->id,
((setState_t)event->data)->value->id);
}else{
fprintf(tracing_file, "%d %lf %s %s %s\n",
((setState_t)event->data)->type->id,
((setState_t)event->data)->container->id,
((setState_t)event->data)->value->id);
}else{
fprintf(tracing_file, "%d %lf %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
event->timestamp,
((setState_t)event->data)->type->id,
((setState_t)event->data)->container->id,
event->timestamp,
((setState_t)event->data)->type->id,
((setState_t)event->data)->container->id,
@@
-534,16
+538,16
@@
static void print_pajeSetState(paje_event_t event)
static void print_pajePushState(paje_event_t event)
{
static void print_pajePushState(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s\n",
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
((pushState_t)event->data)->type->id,
((pushState_t)event->data)->container->id,
((pushState_t)event->data)->value->id);
}else{
fprintf(tracing_file, "%d %lf %s %s %s\n",
((pushState_t)event->data)->type->id,
((pushState_t)event->data)->container->id,
((pushState_t)event->data)->value->id);
}else{
fprintf(tracing_file, "%d %lf %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
event->timestamp,
((pushState_t)event->data)->type->id,
((pushState_t)event->data)->container->id,
event->timestamp,
((pushState_t)event->data)->type->id,
((pushState_t)event->data)->container->id,
@@
-553,15
+557,15
@@
static void print_pajePushState(paje_event_t event)
static void print_pajePopState(paje_event_t event)
{
static void print_pajePopState(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s\n",
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s\n",
- event->event_type,
+
(int)
event->event_type,
((popState_t)event->data)->type->id,
((popState_t)event->data)->container->id);
}else{
fprintf(tracing_file, "%d %lf %s %s\n",
((popState_t)event->data)->type->id,
((popState_t)event->data)->container->id);
}else{
fprintf(tracing_file, "%d %lf %s %s\n",
- event->event_type,
+
(int)
event->event_type,
event->timestamp,
((popState_t)event->data)->type->id,
((popState_t)event->data)->container->id);
event->timestamp,
((popState_t)event->data)->type->id,
((popState_t)event->data)->container->id);
@@
-570,10
+574,10
@@
static void print_pajePopState(paje_event_t event)
static void print_pajeStartLink(paje_event_t event)
{
static void print_pajeStartLink(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
((startLink_t)event->data)->type->id,
((startLink_t)event->data)->container->id,
((startLink_t)event->data)->value,
((startLink_t)event->data)->type->id,
((startLink_t)event->data)->container->id,
((startLink_t)event->data)->value,
@@
-581,7
+585,7
@@
static void print_pajeStartLink(paje_event_t event)
((startLink_t)event->data)->key);
}else {
fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",
((startLink_t)event->data)->key);
}else {
fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
event->timestamp,
((startLink_t)event->data)->type->id,
((startLink_t)event->data)->container->id,
event->timestamp,
((startLink_t)event->data)->type->id,
((startLink_t)event->data)->container->id,
@@
-593,10
+597,10
@@
static void print_pajeStartLink(paje_event_t event)
static void print_pajeEndLink(paje_event_t event)
{
static void print_pajeEndLink(paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
((endLink_t)event->data)->type->id,
((endLink_t)event->data)->container->id,
((endLink_t)event->data)->value,
((endLink_t)event->data)->type->id,
((endLink_t)event->data)->container->id,
((endLink_t)event->data)->value,
@@
-604,7
+608,7
@@
static void print_pajeEndLink(paje_event_t event)
((endLink_t)event->data)->key);
}else {
fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",
((endLink_t)event->data)->key);
}else {
fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
event->timestamp,
((endLink_t)event->data)->type->id,
((endLink_t)event->data)->container->id,
event->timestamp,
((endLink_t)event->data)->type->id,
((endLink_t)event->data)->container->id,
@@
-616,16
+620,16
@@
static void print_pajeEndLink(paje_event_t event)
static void print_pajeNewEvent (paje_event_t event)
{
static void print_pajeNewEvent (paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s\n",
if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
((newEvent_t)event->data)->type->id,
((newEvent_t)event->data)->container->id,
((newEvent_t)event->data)->value->id);
}else{
fprintf(tracing_file, "%d %lf %s %s %s\n",
((newEvent_t)event->data)->type->id,
((newEvent_t)event->data)->container->id,
((newEvent_t)event->data)->value->id);
}else{
fprintf(tracing_file, "%d %lf %s %s %s\n",
- event->event_type,
+
(int)
event->event_type,
event->timestamp,
((newEvent_t)event->data)->type->id,
((newEvent_t)event->data)->container->id,
event->timestamp,
((newEvent_t)event->data)->type->id,
((newEvent_t)event->data)->container->id,
@@
-635,13
+639,18
@@
static void print_pajeNewEvent (paje_event_t event)
static void free_paje_event (paje_event_t event)
{
static void free_paje_event (paje_event_t event)
{
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
- if (event->event_type == PAJE_StartLink){
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event->event_type, event->timestamp);
+ switch (event->event_type){
+ case PAJE_StartLink:
xbt_free (((startLink_t)(event->data))->value);
xbt_free (((startLink_t)(event->data))->key);
xbt_free (((startLink_t)(event->data))->value);
xbt_free (((startLink_t)(event->data))->key);
- }else if (event->event_type == PAJE_EndLink){
+ break;
+ case PAJE_EndLink:
xbt_free (((endLink_t)(event->data))->value);
xbt_free (((endLink_t)(event->data))->key);
xbt_free (((endLink_t)(event->data))->value);
xbt_free (((endLink_t)(event->data))->key);
+ break;
+ default:
+ break;
}
xbt_free (event->data);
xbt_free (event);
}
xbt_free (event->data);
xbt_free (event);
@@
-657,7
+666,7
@@
void new_pajeDefineContainerType(type_t type)
event->data = xbt_new0(s_defineContainerType_t, 1);
((defineContainerType_t)(event->data))->type = type;
event->data = xbt_new0(s_defineContainerType_t, 1);
((defineContainerType_t)(event->data))->type = type;
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
//print it
event->print (event);
//print it
event->print (event);
@@
-674,7
+683,7
@@
void new_pajeDefineVariableType(type_t type)
event->data = xbt_new0(s_defineVariableType_t, 1);
((defineVariableType_t)(event->data))->type = type;
event->data = xbt_new0(s_defineVariableType_t, 1);
((defineVariableType_t)(event->data))->type = type;
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
//print it
event->print (event);
//print it
event->print (event);
@@
-691,7
+700,7
@@
void new_pajeDefineStateType(type_t type)
event->data = xbt_new0(s_defineStateType_t, 1);
((defineStateType_t)(event->data))->type = type;
event->data = xbt_new0(s_defineStateType_t, 1);
((defineStateType_t)(event->data))->type = type;
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
//print it
event->print (event);
//print it
event->print (event);
@@
-708,7
+717,7
@@
void new_pajeDefineEventType(type_t type)
event->data = xbt_new0(s_defineEventType_t, 1);
((defineEventType_t)(event->data))->type = type;
event->data = xbt_new0(s_defineEventType_t, 1);
((defineEventType_t)(event->data))->type = type;
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
//print it
event->print (event);
//print it
event->print (event);
@@
-727,7
+736,7
@@
void new_pajeDefineLinkType(type_t type, type_t source, type_t dest)
((defineLinkType_t)(event->data))->source = source;
((defineLinkType_t)(event->data))->dest = dest;
((defineLinkType_t)(event->data))->source = source;
((defineLinkType_t)(event->data))->dest = dest;
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
//print it
event->print (event);
//print it
event->print (event);
@@
-744,7
+753,7
@@
void new_pajeDefineEntityValue (val_t value)
event->data = xbt_new0(s_defineEntityValue_t, 1);
((defineEntityValue_t)(event->data))->value = value;
event->data = xbt_new0(s_defineEntityValue_t, 1);
((defineEntityValue_t)(event->data))->value = value;
- XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__,
(int)
event->event_type);
//print it
event->print (event);
//print it
event->print (event);
@@
-761,7
+770,7
@@
void new_pajeCreateContainer (container_t container)
event->data = xbt_new0(s_createContainer_t, 1);
((createContainer_t)(event->data))->container = container;
event->data = xbt_new0(s_createContainer_t, 1);
((createContainer_t)(event->data))->container = container;
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
//print it
event->print (event);
//print it
event->print (event);
@@
-778,7
+787,7
@@
void new_pajeDestroyContainer (container_t container)
event->data = xbt_new0(s_destroyContainer_t, 1);
((destroyContainer_t)(event->data))->container = container;
event->data = xbt_new0(s_destroyContainer_t, 1);
((destroyContainer_t)(event->data))->container = container;
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
//print it
event->print (event);
//print it
event->print (event);
@@
-797,7
+806,7
@@
void new_pajeSetVariable (double timestamp, container_t container, type_t type,
((setVariable_t)(event->data))->container = container;
((setVariable_t)(event->data))->value = value;
((setVariable_t)(event->data))->container = container;
((setVariable_t)(event->data))->value = value;
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
insert_into_buffer (event);
}
insert_into_buffer (event);
}
@@
-815,7
+824,7
@@
void new_pajeAddVariable (double timestamp, container_t container, type_t type,
((addVariable_t)(event->data))->container = container;
((addVariable_t)(event->data))->value = value;
((addVariable_t)(event->data))->container = container;
((addVariable_t)(event->data))->value = value;
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
insert_into_buffer (event);
}
insert_into_buffer (event);
}
@@
-832,7
+841,7
@@
void new_pajeSubVariable (double timestamp, container_t container, type_t type,
((subVariable_t)(event->data))->container = container;
((subVariable_t)(event->data))->value = value;
((subVariable_t)(event->data))->container = container;
((subVariable_t)(event->data))->value = value;
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
insert_into_buffer (event);
}
insert_into_buffer (event);
}
@@
-849,7
+858,7
@@
void new_pajeSetState (double timestamp, container_t container, type_t type, val
((setState_t)(event->data))->container = container;
((setState_t)(event->data))->value = value;
((setState_t)(event->data))->container = container;
((setState_t)(event->data))->value = value;
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
insert_into_buffer (event);
}
insert_into_buffer (event);
}
@@
-867,7
+876,7
@@
void new_pajePushState (double timestamp, container_t container, type_t type, va
((pushState_t)(event->data))->container = container;
((pushState_t)(event->data))->value = value;
((pushState_t)(event->data))->container = container;
((pushState_t)(event->data))->value = value;
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
insert_into_buffer (event);
}
insert_into_buffer (event);
}
@@
-884,7
+893,7
@@
void new_pajePopState (double timestamp, container_t container, type_t type)
((popState_t)(event->data))->type = type;
((popState_t)(event->data))->container = container;
((popState_t)(event->data))->type = type;
((popState_t)(event->data))->container = container;
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
insert_into_buffer (event);
}
insert_into_buffer (event);
}
@@
-903,7
+912,7
@@
void new_pajeStartLink (double timestamp, container_t container, type_t type, co
((startLink_t)(event->data))->value = xbt_strdup(value);
((startLink_t)(event->data))->key = xbt_strdup(key);
((startLink_t)(event->data))->value = xbt_strdup(value);
((startLink_t)(event->data))->key = xbt_strdup(key);
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
insert_into_buffer (event);
}
insert_into_buffer (event);
}
@@
-922,7
+931,7
@@
void new_pajeEndLink (double timestamp, container_t container, type_t type, cont
((endLink_t)(event->data))->value = xbt_strdup(value);
((endLink_t)(event->data))->key = xbt_strdup(key);
((endLink_t)(event->data))->value = xbt_strdup(value);
((endLink_t)(event->data))->key = xbt_strdup(key);
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
insert_into_buffer (event);
}
insert_into_buffer (event);
}
@@
-939,7
+948,7
@@
void new_pajeNewEvent (double timestamp, container_t container, type_t type, val
((newEvent_t)(event->data))->container = container;
((newEvent_t)(event->data))->value = value;
((newEvent_t)(event->data))->container = container;
((newEvent_t)(event->data))->value = value;
- XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__,
(int)
event->event_type, event->timestamp);
insert_into_buffer (event);
}
insert_into_buffer (event);
}