#ifdef HAVE_TRACING
-#define INSTR_PAJE_ASSERT(str) {xbt_assert1(str!=NULL&&strlen(str)>0, "'%s' is NULL or length is zero", #str);}
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "Paje tracing event system");
+typedef enum {
+ PAJE_DefineContainerType,
+ PAJE_DefineVariableType,
+ PAJE_DefineStateType,
+ PAJE_DefineEventType,
+ PAJE_DefineLinkType,
+ PAJE_DefineEntityValue,
+ PAJE_CreateContainer,
+ PAJE_DestroyContainer,
+ PAJE_SetVariable,
+ PAJE_AddVariable,
+ PAJE_SubVariable,
+ PAJE_SetState,
+ PAJE_PushState,
+ PAJE_PopState,
+ PAJE_StartLink,
+ PAJE_EndLink,
+ PAJE_NewEvent,
+} e_event_type;
+
+typedef struct paje_event *paje_event_t;
+typedef struct paje_event {
+ double timestamp;
+ e_event_type event_type;
+ void (*print) (paje_event_t event);
+ void (*free) (paje_event_t event);
+ void *data;
+} s_paje_event_t;
+
+typedef struct s_defineContainerType *defineContainerType_t;
+typedef struct s_defineContainerType {
+ type_t type;
+}s_defineContainerType_t;
+
+typedef struct s_defineVariableType *defineVariableType_t;
+typedef struct s_defineVariableType {
+ type_t type;
+}s_defineVariableType_t;
+
+typedef struct s_defineStateType *defineStateType_t;
+typedef struct s_defineStateType {
+ type_t type;
+}s_defineStateType_t;
+
+typedef struct s_defineEventType *defineEventType_t;
+typedef struct s_defineEventType {
+ type_t type;
+}s_defineEventType_t;
+
+typedef struct s_defineLinkType *defineLinkType_t;
+typedef struct s_defineLinkType {
+ type_t type;
+ type_t source;
+ type_t dest;
+}s_defineLinkType_t;
+
+typedef struct s_defineEntityValue *defineEntityValue_t;
+typedef struct s_defineEntityValue {
+ val_t value;
+}s_defineEntityValue_t;
+
+typedef struct s_createContainer *createContainer_t;
+typedef struct s_createContainer {
+ container_t container;
+}s_createContainer_t;
+
+typedef struct s_destroyContainer *destroyContainer_t;
+typedef struct s_destroyContainer {
+ container_t container;
+}s_destroyContainer_t;
+
+typedef struct s_setVariable *setVariable_t;
+typedef struct s_setVariable {
+ container_t container;
+ type_t type;
+ double value;
+}s_setVariable_t;
+
+typedef struct s_addVariable *addVariable_t;
+typedef struct s_addVariable {
+ container_t container;
+ type_t type;
+ double value;
+}s_addVariable_t;
+
+typedef struct s_subVariable *subVariable_t;
+typedef struct s_subVariable {
+ container_t container;
+ type_t type;
+ double value;
+}s_subVariable_t;
+
+typedef struct s_setState *setState_t;
+typedef struct s_setState {
+ container_t container;
+ type_t type;
+ val_t value;
+}s_setState_t;
+
+typedef struct s_pushState *pushState_t;
+typedef struct s_pushState {
+ container_t container;
+ type_t type;
+ val_t value;
+}s_pushState_t;
+
+typedef struct s_popState *popState_t;
+typedef struct s_popState {
+ container_t container;
+ type_t type;
+}s_popState_t;
+
+typedef struct s_startLink *startLink_t;
+typedef struct s_startLink {
+ container_t container;
+ type_t type;
+ container_t sourceContainer;
+ char *value;
+ char *key;
+}s_startLink_t;
+
+typedef struct s_endLink *endLink_t;
+typedef struct s_endLink {
+ container_t container;
+ type_t type;
+ container_t destContainer;
+ char *value;
+ char *key;
+}s_endLink_t;
+
+typedef struct s_newEvent *newEvent_t;
+typedef struct s_newEvent {
+ container_t container;
+ type_t type;
+ val_t value;
+}s_newEvent_t;
+
static FILE *tracing_file = NULL;
-static int pajeDefineContainerTypeId = 0;
-static int pajeDefineStateTypeId = 1;
-static int pajeDefineEntityValueId = 2;
-static int pajeDefineEventTypeId = 3;
-static int pajeDefineLinkTypeId = 4;
-static int pajeCreateContainerId = 5;
-static int pajeSetStateId = 6;
-#define UNUSED007 7
-static int pajePopStateId = 8;
-static int pajeDestroyContainerId = 9;
-#define UNUSED006 10
-#define UNUSED003 11
-static int pajeStartLinkId = 12;
-static int pajeEndLinkId = 13;
-#define UNUSED000 14
-#define UNUSED004 15
-#define UNUSED008 16
-#define UNUSED009 17
-#define UNUSED005 18
-static int pajePushStateId = 19;
-static int pajeDefineEventTypeWithColorId = 20;
-static int pajeDefineVariableTypeWithColorId = 21;
-static int pajeSetVariableId = 22;
-static int pajeAddVariableId = 23;
-static int pajeSubVariableId = 24;
-static int pajeDefineVariableTypeId = 25;
-static int pajeStartLinkWithVolumeId = 26;
-static int pajeNewEventId = 27;
-
-#define TRACE_LINE_SIZE 1000
+static xbt_dynar_t buffer = NULL;
void TRACE_paje_start(void)
{
char *filename = TRACE_get_filename();
tracing_file = fopen(filename, "w");
- xbt_assert1 (tracing_file != NULL, "Tracefile %s could not be opened for writing.", filename);
+ xbt_assert (tracing_file != NULL, "Tracefile %s could not be opened for writing.", filename);
- DEBUG1("Filename %s is open for writing", filename);
+ XBT_DEBUG("Filename %s is open for writing", filename);
/* output header */
TRACE_paje_create_header();
+
+ buffer = xbt_dynar_new (sizeof(paje_event_t), NULL);
}
void TRACE_paje_end(void)
{
fclose(tracing_file);
char *filename = TRACE_get_filename();
- DEBUG1("Filename %s is closed", filename);
+ XBT_DEBUG("Filename %s is closed", filename);
+}
+
+double TRACE_last_timestamp_to_dump = 0;
+//dumps the trace file until the timestamp TRACE_last_timestamp_to_dump
+void TRACE_paje_dump_buffer (int force)
+{
+ XBT_DEBUG("%s: dump until %f. starts", __FUNCTION__, TRACE_last_timestamp_to_dump);
+ if (force){
+ paje_event_t event;
+ unsigned int i;
+ xbt_dynar_foreach(buffer, i, event){
+ event->print (event);
+ event->free (event);
+ }
+ xbt_dynar_free (&buffer);
+ buffer = xbt_dynar_new (sizeof(paje_event_t), NULL);
+ }else{
+ paje_event_t event;
+ while (xbt_dynar_length (buffer) > 0){
+ double head_timestamp = (*(paje_event_t*)xbt_dynar_get_ptr(buffer, 0))->timestamp;
+ if (head_timestamp > TRACE_last_timestamp_to_dump){
+ break;
+ }
+ xbt_dynar_remove_at (buffer, 0, &event);
+ event->print (event);
+ event->free (event);
+ }
+ }
+ XBT_DEBUG("%s: ends", __FUNCTION__);
}
void TRACE_paje_create_header(void)
{
- DEBUG0 ("Define paje header");
+ XBT_DEBUG ("Define paje header");
fprintf(tracing_file, "\
%%EventDef PajeDefineContainerType %d \n\
%% Alias string \n\
%% ContainerType string \n\
%% Name string \n\
%%EndEventDef \n\
-%%EventDef PajeDefineStateType %d \n\
+%%EventDef PajeDefineVariableType %d \n\
%% Alias string \n\
%% ContainerType string \n\
%% Name string \n\
+%% Color color \n\
%%EndEventDef \n\
-%%EventDef PajeDefineEntityValue %d \n\
+%%EventDef PajeDefineStateType %d \n\
%% Alias string \n\
-%% EntityType string \n\
+%% ContainerType string \n\
%% Name string \n\
%%EndEventDef \n\
%%EventDef PajeDefineEventType %d \n\
%% Name string \n\
%% Color color \n\
%%EndEventDef \n\
-%%EventDef PajeDefineEventType %d \n\
-%% Alias string \n\
-%% EntityType string \n\
-%% Name string \n\
-%%EndEventDef \n\
%%EventDef PajeDefineLinkType %d \n\
%% Alias string \n\
%% ContainerType string \n\
%% DestContainerType string \n\
%% Name string \n\
%%EndEventDef \n\
+%%EventDef PajeDefineEntityValue %d \n\
+%% Alias string \n\
+%% EntityType string \n\
+%% Name string \n\
+%% Color color \n\
+%%EndEventDef \n\
%%EventDef PajeCreateContainer %d \n\
%% Time date \n\
%% Alias string \n\
%% Type string \n\
%% Container string \n\
%%EndEventDef \n\
-%%EventDef PajeSetState %d \n\
+%%EventDef PajeSetVariable %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
%% Value string \n\
%%EndEventDef\n\
-%%EventDef PajePopState %d \n\
-%% Time date \n\
-%% EntityType string \n\
-%% Container string \n\
-%%EndEventDef\n\
-%%EventDef PajeStartLink %d \n\
+%%EventDef PajeAddVariable %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
%% Value string \n\
-%% SourceContainer string \n\
-%% Key string \n\
%%EndEventDef\n\
-%%EventDef PajeEndLink %d \n\
+%%EventDef PajeSubVariable %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
%% Value string \n\
-%% DestContainer string \n\
-%% Key string \n\
%%EndEventDef\n\
-%%EventDef PajePushState %d \n\
+%%EventDef PajeSetState %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
%% Value string \n\
%%EndEventDef\n\
-%%EventDef PajeSetVariable %d \n\
+%%EventDef PajePushState %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
%% Value string \n\
%%EndEventDef\n\
-%%EventDef PajeAddVariable %d \n\
+%%EventDef PajePopState %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
-%% Value string \n\
%%EndEventDef\n\
-%%EventDef PajeSubVariable %d \n\
+%%EventDef PajeStartLink %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
%% Value string \n\
+%% SourceContainer string \n\
+%% Key string \n\
%%EndEventDef\n\
-%%EventDef PajeDefineVariableType %d \n\
-%% Alias string \n\
-%% ContainerType string \n\
-%% Name string \n\
-%%EndEventDef \n\
-%%EventDef PajeDefineVariableType %d \n\
-%% Alias string \n\
-%% ContainerType string \n\
-%% Name string \n\
-%% Color color \n\
-%%EndEventDef \n\
-%%EventDef PajeStartLink %d \n\
+%%EventDef PajeEndLink %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
%% Value string \n\
-%% SourceContainer string \n\
+%% DestContainer string \n\
%% Key string \n\
-%% Volume string \n\
%%EndEventDef\n\
%%EventDef PajeNewEvent %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
%% Value string \n\
-%%EndEventDef\n", pajeDefineContainerTypeId, pajeDefineStateTypeId, pajeDefineEntityValueId, pajeDefineEventTypeWithColorId, pajeDefineEventTypeId, pajeDefineLinkTypeId, pajeCreateContainerId, pajeDestroyContainerId, pajeSetStateId, pajePopStateId, pajeStartLinkId, pajeEndLinkId, pajePushStateId, pajeSetVariableId, pajeAddVariableId, pajeSubVariableId, pajeDefineVariableTypeId, pajeDefineVariableTypeWithColorId, pajeStartLinkWithVolumeId, pajeNewEventId);
+%%EndEventDef\n",
+ PAJE_DefineContainerType,
+ PAJE_DefineVariableType,
+ PAJE_DefineStateType,
+ PAJE_DefineEventType,
+ PAJE_DefineLinkType,
+ PAJE_DefineEntityValue,
+ PAJE_CreateContainer,
+ PAJE_DestroyContainer,
+ PAJE_SetVariable,
+ PAJE_AddVariable,
+ PAJE_SubVariable,
+ PAJE_SetState,
+ PAJE_PushState,
+ PAJE_PopState,
+ PAJE_StartLink,
+ PAJE_EndLink,
+ PAJE_NewEvent);
}
-/* internal to this file */
-static void __pajeCreateContainer(char *output, int len, int eventid,
- double time, const char *alias,
- const char *type, const char *container,
- const char *name)
+/* internal do the instrumentation module */
+static void insert_into_buffer (paje_event_t tbi)
{
- if (time == 0){
- snprintf(output, len, "%d 0 %s %s %s %s", eventid,
- alias, type, container, name);
- }else{
- snprintf(output, len, "%d %lf %s %s %s %s", eventid, time,
- alias, type, container, name);
+ if (TRACE_buffer() == 0){
+ tbi->print (tbi);
+ 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));
-static void __pajeSetState(char *output, int len, int eventid, double time,
- const char *entityType, const char *container,
- const char *value)
-{
- if (time == 0){
- snprintf(output, len, "%d 0 %s %s %s", eventid, entityType,
- container, value);
+ unsigned int i;
+ unsigned long len = xbt_dynar_length(buffer);
+ if (len == 0){
+ xbt_dynar_push (buffer, &tbi);
+ XBT_DEBUG("%s: inserted at beginning", __FUNCTION__);
}else{
- snprintf(output, len, "%d %lf %s %s %s", eventid, time, entityType,
- container, value);
+ //check if last event has the same timestamp that tbi event
+ paje_event_t e2 = *(paje_event_t*)xbt_dynar_get_ptr (buffer, len-1);
+ if (e2->timestamp == tbi->timestamp){
+ //insert at the end
+ XBT_DEBUG("%s: inserted at end, pos = %ld", __FUNCTION__, len);
+ xbt_dynar_insert_at (buffer, len, &tbi);
+ return;
+ }
+ int inserted = 0;
+ for (i = 0; i < len; i++){
+ paje_event_t e1 = *(paje_event_t*)xbt_dynar_get_ptr(buffer, i);
+ if (e1->timestamp > tbi->timestamp){
+ xbt_dynar_insert_at (buffer, i, &tbi);
+ XBT_DEBUG("%s: inserted at %d", __FUNCTION__, i);
+ inserted = 1;
+ break;
+ }
+ }
+ if (!inserted){
+ xbt_dynar_push (buffer, &tbi);
+ XBT_DEBUG("%s: inserted at end", __FUNCTION__);
+ }
}
}
-static void __pajeSetVariable(char *output, int len, int eventid,
- double time, const char *entityType,
- const char *container, const char *value)
+static void print_pajeDefineContainerType(paje_event_t event)
{
- if (time == 0){
- snprintf(output, len, "%d 0 %s %s %s", eventid, entityType,
- container, value);
- }else{
- snprintf(output, len, "%d %lf %s %s %s", eventid, time, entityType,
- container, value);
- }
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ fprintf(tracing_file, "%d %s %s %s\n",
+ event->event_type,
+ ((defineContainerType_t)event->data)->type->id,
+ ((defineContainerType_t)event->data)->type->father->id,
+ ((defineContainerType_t)event->data)->type->name);
}
-static void __pajeStartLink(char *output, int len, int eventid,
- double time, const char *entityType,
- const char *container, const char *value,
- const char *sourceContainer, const char *key)
+static void print_pajeDefineVariableType(paje_event_t event)
{
- if (time == 0){
- snprintf(output, len, "%d 0 %s %s %s %s %s", eventid, entityType,
- container, value, sourceContainer, key);
- }else{
- snprintf(output, len, "%d %lf %s %s %s %s %s", eventid, time, entityType,
- container, value, sourceContainer, key);
- }
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
+ 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->color);
}
-/* internal do the instrumentation module */
-void pajeDefineContainerType(const char *alias, const char *containerType,
- const char *name)
+static void print_pajeDefineStateType(paje_event_t event)
{
- INSTR_PAJE_ASSERT(alias);
- INSTR_PAJE_ASSERT(containerType);
- INSTR_PAJE_ASSERT(name);
-
- fprintf(tracing_file, "%d %s %s %s\n", pajeDefineContainerTypeId, alias,
- containerType, name);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ fprintf(tracing_file, "%d %s %s %s\n",
+ event->event_type,
+ ((defineStateType_t)event->data)->type->id,
+ ((defineStateType_t)event->data)->type->father->id,
+ ((defineStateType_t)event->data)->type->name);
}
-void pajeDefineStateType(const char *alias, const char *containerType,
- const char *name)
+static void print_pajeDefineEventType(paje_event_t event)
{
- INSTR_PAJE_ASSERT(alias);
- INSTR_PAJE_ASSERT(containerType);
- INSTR_PAJE_ASSERT(name);
-
- fprintf(tracing_file, "%d %s %s %s\n", pajeDefineStateTypeId, alias,
- containerType, name);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
+ 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->color);
}
-void pajeDefineEventTypeWithColor(const char *alias, const char *containerType,
- const char *name, const char *color)
+static void print_pajeDefineLinkType(paje_event_t event)
{
- INSTR_PAJE_ASSERT(alias);
- INSTR_PAJE_ASSERT(containerType);
- INSTR_PAJE_ASSERT(name);
- INSTR_PAJE_ASSERT(name);
-
- fprintf(tracing_file, "%d %s %s %s %s\n", pajeDefineEventTypeWithColorId, alias,
- containerType, name, color);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ fprintf(tracing_file, "%d %s %s %s %s %s\n",
+ 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)->dest->id,
+ ((defineLinkType_t)event->data)->type->name);
}
-void pajeDefineEventType(const char *alias, const char *containerType,
- const char *name)
+static void print_pajeDefineEntityValue (paje_event_t event)
{
- INSTR_PAJE_ASSERT(alias);
- INSTR_PAJE_ASSERT(containerType);
- INSTR_PAJE_ASSERT(name);
-
- fprintf(tracing_file, "%d %s %s %s\n", pajeDefineEventTypeId, alias,
- containerType, name);
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+ fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
+ 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->color);
}
-void pajeDefineLinkType(const char *alias, const char *containerType,
- const char *sourceContainerType,
- const char *destContainerType, const char *name)
+static void print_pajeCreateContainer(paje_event_t event)
{
- INSTR_PAJE_ASSERT(alias);
- INSTR_PAJE_ASSERT(containerType);
- INSTR_PAJE_ASSERT(sourceContainerType);
- INSTR_PAJE_ASSERT(destContainerType);
- INSTR_PAJE_ASSERT(name);
-
- fprintf(tracing_file, "%d %s %s %s %s %s\n", pajeDefineLinkTypeId, alias,
- containerType, sourceContainerType, destContainerType, name);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %s %s\n",
+ 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",
+ event->event_type,
+ event->timestamp,
+ ((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);
+ }
}
-void pajeCreateContainer(double time, const char *alias, const char *type,
- const char *container, const char *name)
+static void print_pajeDestroyContainer(paje_event_t event)
{
- INSTR_PAJE_ASSERT(alias);
- INSTR_PAJE_ASSERT(type);
- INSTR_PAJE_ASSERT(container);
- INSTR_PAJE_ASSERT(name);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s\n",
+ 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",
+ event->event_type,
+ event->timestamp,
+ ((destroyContainer_t)event->data)->container->type->id,
+ ((destroyContainer_t)event->data)->container->id);
+ }
+}
- char line[TRACE_LINE_SIZE];
- __pajeCreateContainer(line, TRACE_LINE_SIZE, pajeCreateContainerId, time,
- alias, type, container, name);
- fprintf(tracing_file, "%s\n", line);
+static void print_pajeSetVariable(paje_event_t event)
+{
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %f\n",
+ 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",
+ event->event_type,
+ event->timestamp,
+ ((setVariable_t)event->data)->type->id,
+ ((setVariable_t)event->data)->container->id,
+ ((setVariable_t)event->data)->value);
+ }
}
-void pajeDestroyContainer(double time, const char *type,
- const char *container)
+static void print_pajeAddVariable(paje_event_t event)
{
- INSTR_PAJE_ASSERT(type);
- INSTR_PAJE_ASSERT(container);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %f\n",
+ 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",
+ event->event_type,
+ event->timestamp,
+ ((addVariable_t)event->data)->type->id,
+ ((addVariable_t)event->data)->container->id,
+ ((addVariable_t)event->data)->value);
+ }
+}
- if (time == 0){
- fprintf(tracing_file, "%d 0 %s %s\n", pajeDestroyContainerId,
- type, container);
+static void print_pajeSubVariable(paje_event_t event)
+{
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %f\n",
+ 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\n", pajeDestroyContainerId, time,
- type, container);
+ fprintf(tracing_file, "%d %lf %s %s %f\n",
+ event->event_type,
+ event->timestamp,
+ ((subVariable_t)event->data)->type->id,
+ ((subVariable_t)event->data)->container->id,
+ ((subVariable_t)event->data)->value);
}
}
-void pajeSetState(double time, const char *entityType,
- const char *container, const char *value)
+static void print_pajeSetState(paje_event_t event)
{
- INSTR_PAJE_ASSERT(entityType);
- INSTR_PAJE_ASSERT(container);
- INSTR_PAJE_ASSERT(value);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %s\n",
+ 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",
+ event->event_type,
+ event->timestamp,
+ ((setState_t)event->data)->type->id,
+ ((setState_t)event->data)->container->id,
+ ((setState_t)event->data)->value->id);
+ }
+}
- char line[TRACE_LINE_SIZE];
- __pajeSetState(line, TRACE_LINE_SIZE, pajeSetStateId, time, entityType,
- container, value);
- fprintf(tracing_file, "%s\n", line);
+static void print_pajePushState(paje_event_t event)
+{
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %s\n",
+ 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",
+ event->event_type,
+ event->timestamp,
+ ((pushState_t)event->data)->type->id,
+ ((pushState_t)event->data)->container->id,
+ ((pushState_t)event->data)->value->id);
+ }
}
-void pajePushState(double time, const char *entityType,
- const char *container, const char *value)
+static void print_pajePopState(paje_event_t event)
{
- INSTR_PAJE_ASSERT(entityType);
- INSTR_PAJE_ASSERT(container);
- INSTR_PAJE_ASSERT(value);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s\n",
+ event->event_type,
+ ((popState_t)event->data)->type->id,
+ ((popState_t)event->data)->container->id);
+ }else{
+ fprintf(tracing_file, "%d %lf %s %s\n",
+ event->event_type,
+ event->timestamp,
+ ((popState_t)event->data)->type->id,
+ ((popState_t)event->data)->container->id);
+ }
+}
- char line[TRACE_LINE_SIZE];
- __pajeSetState(line, TRACE_LINE_SIZE, pajePushStateId, time, entityType,
- container, value);
- fprintf(tracing_file, "%s\n", line);
+static void print_pajeStartLink(paje_event_t event)
+{
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
+ event->event_type,
+ ((startLink_t)event->data)->type->id,
+ ((startLink_t)event->data)->container->id,
+ ((startLink_t)event->data)->value,
+ ((startLink_t)event->data)->sourceContainer->id,
+ ((startLink_t)event->data)->key);
+ }else {
+ fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",
+ event->event_type,
+ event->timestamp,
+ ((startLink_t)event->data)->type->id,
+ ((startLink_t)event->data)->container->id,
+ ((startLink_t)event->data)->value,
+ ((startLink_t)event->data)->sourceContainer->id,
+ ((startLink_t)event->data)->key);
+ }
}
-void pajePopState(double time, const char *entityType,
- const char *container)
+static void print_pajeEndLink(paje_event_t event)
{
- INSTR_PAJE_ASSERT(entityType);
- INSTR_PAJE_ASSERT(container);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
+ event->event_type,
+ ((endLink_t)event->data)->type->id,
+ ((endLink_t)event->data)->container->id,
+ ((endLink_t)event->data)->value,
+ ((endLink_t)event->data)->destContainer->id,
+ ((endLink_t)event->data)->key);
+ }else {
+ fprintf(tracing_file, "%d %lf %s %s %s %s %s\n",
+ event->event_type,
+ event->timestamp,
+ ((endLink_t)event->data)->type->id,
+ ((endLink_t)event->data)->container->id,
+ ((endLink_t)event->data)->value,
+ ((endLink_t)event->data)->destContainer->id,
+ ((endLink_t)event->data)->key);
+ }
+}
- fprintf(tracing_file, "%d %lf %s %s\n", pajePopStateId, time, entityType,
- container);
+static void print_pajeNewEvent (paje_event_t event)
+{
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->timestamp == 0){
+ fprintf(tracing_file, "%d 0 %s %s %s\n",
+ 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",
+ event->event_type,
+ event->timestamp,
+ ((newEvent_t)event->data)->type->id,
+ ((newEvent_t)event->data)->container->id,
+ ((newEvent_t)event->data)->value->id);
+ }
}
-void pajeStartLink(double time, const char *entityType,
- const char *container, const char *value,
- const char *sourceContainer, const char *key)
+static void free_paje_event (paje_event_t event)
{
- INSTR_PAJE_ASSERT(entityType);
- INSTR_PAJE_ASSERT(container);
- INSTR_PAJE_ASSERT(value);
- INSTR_PAJE_ASSERT(sourceContainer);
- INSTR_PAJE_ASSERT(key);
+ XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, event->event_type, event->timestamp);
+ if (event->event_type == PAJE_StartLink){
+ xbt_free (((startLink_t)(event->data))->value);
+ xbt_free (((startLink_t)(event->data))->key);
+ }else if (event->event_type == PAJE_EndLink){
+ xbt_free (((endLink_t)(event->data))->value);
+ xbt_free (((endLink_t)(event->data))->key);
+ }
+ xbt_free (event->data);
+ xbt_free (event);
+}
- char line[TRACE_LINE_SIZE];
- __pajeStartLink(line, TRACE_LINE_SIZE, pajeStartLinkId, time, entityType,
- container, value, sourceContainer, key);
- fprintf(tracing_file, "%s\n", line);
+void new_pajeDefineContainerType(type_t type)
+{
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_DefineContainerType;
+ event->timestamp = 0;
+ event->print = print_pajeDefineContainerType;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_defineContainerType_t, 1);
+ ((defineContainerType_t)(event->data))->type = type;
+
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+
+ //print it
+ event->print (event);
+ event->free (event);
}
-void pajeStartLinkWithVolume(double time, const char *entityType,
- const char *container, const char *value,
- const char *sourceContainer, const char *key,
- double volume)
+void new_pajeDefineVariableType(type_t type)
{
- INSTR_PAJE_ASSERT(entityType);
- INSTR_PAJE_ASSERT(container);
- INSTR_PAJE_ASSERT(value);
- INSTR_PAJE_ASSERT(sourceContainer);
- INSTR_PAJE_ASSERT(key);
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_DefineVariableType;
+ event->timestamp = 0;
+ event->print = print_pajeDefineVariableType;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_defineVariableType_t, 1);
+ ((defineVariableType_t)(event->data))->type = type;
+
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+
+ //print it
+ event->print (event);
+ event->free (event);
+}
- char line[TRACE_LINE_SIZE];
- __pajeStartLink(line, TRACE_LINE_SIZE, pajeStartLinkWithVolumeId, time,
- entityType, container, value, sourceContainer, key);
- fprintf(tracing_file, "%s %f\n", line, volume);
+void new_pajeDefineStateType(type_t type)
+{
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_DefineStateType;
+ event->timestamp = 0;
+ event->print = print_pajeDefineStateType;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_defineStateType_t, 1);
+ ((defineStateType_t)(event->data))->type = type;
+
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+
+ //print it
+ event->print (event);
+ event->free (event);
}
-void pajeEndLink(double time, const char *entityType,
- const char *container, const char *value,
- const char *destContainer, const char *key)
+void new_pajeDefineEventType(type_t type)
{
- INSTR_PAJE_ASSERT(entityType);
- INSTR_PAJE_ASSERT(container);
- INSTR_PAJE_ASSERT(value);
- INSTR_PAJE_ASSERT(destContainer);
- INSTR_PAJE_ASSERT(key);
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_DefineEventType;
+ event->timestamp = 0;
+ event->print = print_pajeDefineEventType;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_defineEventType_t, 1);
+ ((defineEventType_t)(event->data))->type = type;
+
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+
+ //print it
+ event->print (event);
+ event->free (event);
+}
- if (time == 0){
- fprintf(tracing_file, "%d 0 %s %s %s %s %s\n", pajeEndLinkId,
- entityType, container, value, destContainer, key);
- }else {
- fprintf(tracing_file, "%d %lf %s %s %s %s %s\n", pajeEndLinkId, time,
- entityType, container, value, destContainer, key);
- }
+void new_pajeDefineLinkType(type_t type, type_t source, type_t dest)
+{
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_DefineLinkType;
+ event->timestamp = 0;
+ event->print = print_pajeDefineLinkType;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_defineLinkType_t, 1);
+ ((defineLinkType_t)(event->data))->type = type;
+ ((defineLinkType_t)(event->data))->source = source;
+ ((defineLinkType_t)(event->data))->dest = dest;
+
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+
+ //print it
+ event->print (event);
+ event->free (event);
}
-void pajeDefineVariableType(const char *alias, const char *containerType,
- const char *name)
+void new_pajeDefineEntityValue (val_t value)
{
- INSTR_PAJE_ASSERT(alias);
- INSTR_PAJE_ASSERT(containerType);
- INSTR_PAJE_ASSERT(name);
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_DefineEntityValue;
+ event->timestamp = 0;
+ event->print = print_pajeDefineEntityValue;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_defineEntityValue_t, 1);
+ ((defineEntityValue_t)(event->data))->value = value;
+
+ XBT_DEBUG("%s: event_type=%d", __FUNCTION__, event->event_type);
+
+ //print it
+ event->print (event);
+ event->free (event);
+}
- fprintf(tracing_file, "%d %s %s %s\n", pajeDefineVariableTypeId, alias,
- containerType, name);
+void new_pajeCreateContainer (container_t container)
+{
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_CreateContainer;
+ event->timestamp = SIMIX_get_clock();
+ event->print = print_pajeCreateContainer;
+ event->free = free_paje_event;
+ 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);
+
+ //print it
+ event->print (event);
+ event->free (event);
}
-void pajeDefineVariableTypeWithColor(const char *alias, const char *containerType,
- const char *name, const char *color)
+void new_pajeDestroyContainer (container_t container)
{
- INSTR_PAJE_ASSERT(alias);
- INSTR_PAJE_ASSERT(containerType);
- INSTR_PAJE_ASSERT(name);
- INSTR_PAJE_ASSERT(color);
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_DestroyContainer;
+ event->timestamp = SIMIX_get_clock();
+ event->print = print_pajeDestroyContainer;
+ event->free = free_paje_event;
+ 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);
+
+ //print it
+ event->print (event);
+ event->free (event);
+}
- fprintf(tracing_file, "%d %s %s %s \"%s\"\n", pajeDefineVariableTypeWithColorId, alias,
- containerType, name, color);
+void new_pajeSetVariable (double timestamp, container_t container, type_t type, double value)
+{
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_SetVariable;
+ event->timestamp = timestamp;
+ event->print = print_pajeSetVariable;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_setVariable_t, 1);
+ ((setVariable_t)(event->data))->type = type;
+ ((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);
+
+ insert_into_buffer (event);
}
-void pajeSetVariable(double time, const char *entityType,
- const char *container, const char *value)
+
+void new_pajeAddVariable (double timestamp, container_t container, type_t type, double value)
{
- INSTR_PAJE_ASSERT(entityType);
- INSTR_PAJE_ASSERT(container);
- INSTR_PAJE_ASSERT(value);
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_AddVariable;
+ event->timestamp = timestamp;
+ event->print = print_pajeAddVariable;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_addVariable_t, 1);
+ ((addVariable_t)(event->data))->type = type;
+ ((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);
+
+ insert_into_buffer (event);
+}
- char line[TRACE_LINE_SIZE];
- __pajeSetVariable(line, TRACE_LINE_SIZE, pajeSetVariableId, time,
- entityType, container, value);
- fprintf(tracing_file, "%s\n", line);
+void new_pajeSubVariable (double timestamp, container_t container, type_t type, double value)
+{
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_SubVariable;
+ event->timestamp = timestamp;
+ event->print = print_pajeSubVariable;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_subVariable_t, 1);
+ ((subVariable_t)(event->data))->type = type;
+ ((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);
+
+ insert_into_buffer (event);
}
-void pajeAddVariable(double time, const char *entityType,
- const char *container, const char *value)
+void new_pajeSetState (double timestamp, container_t container, type_t type, val_t value)
{
- INSTR_PAJE_ASSERT(entityType);
- INSTR_PAJE_ASSERT(container);
- INSTR_PAJE_ASSERT(value);
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_SetState;
+ event->timestamp = timestamp;
+ event->print = print_pajeSetState;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_setState_t, 1);
+ ((setState_t)(event->data))->type = type;
+ ((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);
+
+ insert_into_buffer (event);
+}
+
- char line[TRACE_LINE_SIZE];
- __pajeSetVariable(line, TRACE_LINE_SIZE, pajeAddVariableId, time,
- entityType, container, value);
- fprintf(tracing_file, "%s\n", line);
+void new_pajePushState (double timestamp, container_t container, type_t type, val_t value)
+{
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_PushState;
+ event->timestamp = timestamp;
+ event->print = print_pajePushState;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_pushState_t, 1);
+ ((pushState_t)(event->data))->type = type;
+ ((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);
+
+ insert_into_buffer (event);
}
-void pajeSubVariable(double time, const char *entityType,
- const char *container, const char *value)
+
+void new_pajePopState (double timestamp, container_t container, type_t type)
{
- INSTR_PAJE_ASSERT(entityType);
- INSTR_PAJE_ASSERT(container);
- INSTR_PAJE_ASSERT(value);
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_PopState;
+ event->timestamp = timestamp;
+ event->print = print_pajePopState;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_popState_t, 1);
+ ((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);
+
+ insert_into_buffer (event);
+}
- char line[TRACE_LINE_SIZE];
- __pajeSetVariable(line, TRACE_LINE_SIZE, pajeSubVariableId, time,
- entityType, container, value);
- fprintf(tracing_file, "%s\n", line);
+void new_pajeStartLink (double timestamp, container_t container, type_t type, container_t sourceContainer, const char *value, const char *key)
+{
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_StartLink;
+ event->timestamp = timestamp;
+ event->print = print_pajeStartLink;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_startLink_t, 1);
+ ((startLink_t)(event->data))->type = type;
+ ((startLink_t)(event->data))->container = container;
+ ((startLink_t)(event->data))->sourceContainer = sourceContainer;
+ ((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);
+
+ insert_into_buffer (event);
}
-void pajeNewEvent(double time, const char *entityType,
- const char *container, const char *value)
+void new_pajeEndLink (double timestamp, container_t container, type_t type, container_t destContainer, const char *value, const char *key)
{
- INSTR_PAJE_ASSERT(entityType);
- INSTR_PAJE_ASSERT(container);
- INSTR_PAJE_ASSERT(value);
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_EndLink;
+ event->timestamp = timestamp;
+ event->print = print_pajeEndLink;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_endLink_t, 1);
+ ((endLink_t)(event->data))->type = type;
+ ((endLink_t)(event->data))->container = container;
+ ((endLink_t)(event->data))->destContainer = destContainer;
+ ((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);
+
+ insert_into_buffer (event);
+}
- if (time == 0){
- fprintf(tracing_file, "%d 0 %s %s %s\n", pajeNewEventId,
- entityType, container, value);
- }else{
- fprintf(tracing_file, "%d %lf %s %s %s\n", pajeNewEventId, time,
- entityType, container, value);
- }
+void new_pajeNewEvent (double timestamp, container_t container, type_t type, val_t value)
+{
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_NewEvent;
+ event->timestamp = timestamp;
+ event->print = print_pajeNewEvent;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_newEvent_t, 1);
+ ((newEvent_t)(event->data))->type = type;
+ ((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);
+
+ insert_into_buffer (event);
}
#endif /* HAVE_TRACING */