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_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 {
- unsigned int id;
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 {
- s_paje_event_t event;
type_t type;
- void (*print) (defineContainerType_t event);
}s_defineContainerType_t;
typedef struct s_defineVariableType *defineVariableType_t;
typedef struct s_defineVariableType {
- s_paje_event_t event;
type_t type;
- void (*print) (defineVariableType_t event);
}s_defineVariableType_t;
typedef struct s_defineStateType *defineStateType_t;
typedef struct s_defineStateType {
- s_paje_event_t event;
type_t type;
- void (*print) (defineStateType_t event);
}s_defineStateType_t;
typedef struct s_defineEventType *defineEventType_t;
typedef struct s_defineEventType {
- s_paje_event_t event;
type_t type;
- void (*print) (defineEventType_t event);
}s_defineEventType_t;
typedef struct s_defineLinkType *defineLinkType_t;
typedef struct s_defineLinkType {
- s_paje_event_t event;
type_t type;
type_t source;
type_t dest;
- void (*print) (defineLinkType_t event);
}s_defineLinkType_t;
typedef struct s_createContainer *createContainer_t;
typedef struct s_createContainer {
- s_paje_event_t event;
container_t container;
- void (*print) (createContainer_t event);
}s_createContainer_t;
typedef struct s_destroyContainer *destroyContainer_t;
typedef struct s_destroyContainer {
- s_paje_event_t event;
container_t container;
- void (*print) (destroyContainer_t event);
}s_destroyContainer_t;
typedef struct s_setVariable *setVariable_t;
typedef struct s_setVariable {
- s_paje_event_t event;
container_t container;
type_t type;
double value;
- void (*print) (setVariable_t event);
}s_setVariable_t;
typedef struct s_addVariable *addVariable_t;
typedef struct s_addVariable {
- s_paje_event_t event;
container_t container;
type_t type;
double value;
- void (*print) (addVariable_t event);
}s_addVariable_t;
typedef struct s_subVariable *subVariable_t;
typedef struct s_subVariable {
- s_paje_event_t event;
container_t container;
type_t type;
double value;
- void (*print) (subVariable_t event);
}s_subVariable_t;
typedef struct s_setState *setState_t;
typedef struct s_setState {
- s_paje_event_t event;
container_t container;
type_t type;
char *value;
- void (*print) (setState_t event);
}s_setState_t;
typedef struct s_pushState *pushState_t;
typedef struct s_pushState {
- s_paje_event_t event;
container_t container;
type_t type;
char *value;
- void (*print) (pushState_t event);
}s_pushState_t;
typedef struct s_popState *popState_t;
typedef struct s_popState {
- s_paje_event_t event;
container_t container;
type_t type;
- char *value;
- void (*print) (popState_t event);
}s_popState_t;
typedef struct s_startLink *startLink_t;
typedef struct s_startLink {
- s_paje_event_t event;
- type_t type;
container_t container;
+ type_t type;
container_t sourceContainer;
char *value;
char *key;
- void (*print) (startLink_t event);
}s_startLink_t;
typedef struct s_endLink *endLink_t;
typedef struct s_endLink {
- s_paje_event_t event;
- type_t type;
container_t container;
+ type_t type;
container_t destContainer;
char *value;
char *key;
- void (*print) (endLink_t event);
}s_endLink_t;
typedef struct s_newEvent *newEvent_t;
typedef struct s_newEvent {
- s_paje_event_t event;
- type_t type;
container_t container;
+ type_t type;
char *value;
- void (*print) (newEvent_t event);
}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;
-#define UNUSED001 26
-static int pajeNewEventId = 27;
-
-#define TRACE_LINE_SIZE 1000
+static xbt_dynar_t buffer = NULL;
void TRACE_paje_start(void)
{
/* output header */
TRACE_paje_create_header();
+
+ buffer = xbt_dynar_new (sizeof(paje_event_t), NULL);
}
void TRACE_paje_end(void)
DEBUG1("Filename %s is closed", filename);
}
+void TRACE_paje_dump_buffer (void)
+{
+ paje_event_t event;
+ while (xbt_dynar_length (buffer) > 0){
+ xbt_dynar_remove_at (buffer, 0, &event);
+ event->print (event);
+ event->free (event);
+ }
+}
+
void TRACE_paje_create_header(void)
{
DEBUG0 ("Define paje header");
%% 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\
%% 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\
+%%EventDef PajeAddVariable %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
+%% Value string \n\
%%EndEventDef\n\
-%%EventDef PajeStartLink %d \n\
+%%EventDef PajeSubVariable %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 PajeSetState %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\
%% Time date \n\
%% Container string \n\
%% Value string \n\
%%EndEventDef\n\
-%%EventDef PajeSetVariable %d \n\
+%%EventDef PajePopState %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
-%% Value string \n\
%%EndEventDef\n\
-%%EventDef PajeAddVariable %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 PajeSubVariable %d \n\
+%%EventDef PajeEndLink %d \n\
%% Time date \n\
%% EntityType string \n\
%% Container string \n\
%% Value string \n\
+%% DestContainer 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 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, pajeNewEventId);
+%%EndEventDef\n",
+ PAJE_DefineContainerType,
+ PAJE_DefineVariableType,
+ PAJE_DefineStateType,
+ PAJE_DefineEventType,
+ PAJE_DefineLinkType,
+ PAJE_CreateContainer,
+ PAJE_DestroyContainer,
+ PAJE_SetVariable,
+ PAJE_AddVariable,
+ PAJE_SubVariable,
+ PAJE_SetState,
+ PAJE_PushState,
+ PAJE_PopState,
+ PAJE_StartLink,
+ PAJE_EndLink,
+ PAJE_NewEvent);
}
/* internal do the instrumentation module */
-static void print_pajeDefineContainerType(defineContainerType_t event)
+static void insert_into_buffer (paje_event_t tbi)
+{
+ unsigned int i;
+ if (xbt_dynar_length(buffer) == 0){
+ xbt_dynar_push (buffer, &tbi);
+ }else{
+ int inserted = 0;
+ for (i = 0; i < xbt_dynar_length(buffer); 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);
+ inserted = 1;
+ break;
+ }
+ }
+ if (!inserted){
+ xbt_dynar_push (buffer, &tbi);
+ }
+ }
+}
+
+static void print_pajeDefineContainerType(paje_event_t event)
{
fprintf(tracing_file, "%d %s %s %s\n",
- event->event.id,
- event->type->id,
- event->type->father->id,
- event->type->name);
+ event->event_type,
+ ((defineContainerType_t)event->data)->type->id,
+ ((defineContainerType_t)event->data)->type->father->id,
+ ((defineContainerType_t)event->data)->type->name);
}
-static void print_pajeDefineVariableType(defineVariableType_t event)
+static void print_pajeDefineVariableType(paje_event_t event)
{
fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
- event->event.id,
- event->type->id,
- event->type->father->id,
- event->type->name,
- event->type->color);
+ 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);
}
-static void print_pajeDefineStateType(defineStateType_t event)
+static void print_pajeDefineStateType(paje_event_t event)
{
fprintf(tracing_file, "%d %s %s %s\n",
- event->event.id,
- event->type->id,
- event->type->father->id,
- event->type->name);
+ event->event_type,
+ ((defineStateType_t)event->data)->type->id,
+ ((defineStateType_t)event->data)->type->father->id,
+ ((defineStateType_t)event->data)->type->name);
}
-static void print_pajeDefineEventType(defineEventType_t event)
+static void print_pajeDefineEventType(paje_event_t event)
{
fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
- event->event.id,
- event->type->id,
- event->type->father->id,
- event->type->name,
- event->type->color);
+ 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);
}
-static void print_pajeDefineLinkType(defineLinkType_t event)
+static void print_pajeDefineLinkType(paje_event_t event)
{
fprintf(tracing_file, "%d %s %s %s %s %s\n",
- event->event.id,
- event->type->id,
- event->type->father->id,
- event->source->id,
- event->dest->id,
- event->type->name);
+ 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);
}
-static void print_pajeCreateContainer(createContainer_t event)
+static void print_pajeCreateContainer(paje_event_t event)
{
- if (event->event.timestamp == 0){
+ if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s %s\n",
- event->event.id,
- event->container->id,
- event->container->type->id,
- event->container->father->id,
- event->container->name);
+ 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.id,
- event->event.timestamp,
- event->container->id,
- event->container->type->id,
- event->container->father->id,
- event->container->name);
+ 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);
}
}
-static void print_pajeDestroyContainer(destroyContainer_t event)
+static void print_pajeDestroyContainer(paje_event_t event)
{
- if (event->event.timestamp == 0){
+ if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s\n",
- event->event.id,
- event->container->type->id,
- event->container->id);
+ 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.id,
- event->event.timestamp,
- event->container->type->id,
- event->container->id);
+ event->event_type,
+ event->timestamp,
+ ((destroyContainer_t)event->data)->container->type->id,
+ ((destroyContainer_t)event->data)->container->id);
}
}
-static void print_pajeSetVariable(setVariable_t event)
+static void print_pajeSetVariable(paje_event_t event)
{
- if (event->event.timestamp == 0){
+ if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %f\n",
- event->event.id,
- event->type->id,
- event->container->id,
- event->value);
+ 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.id,
- event->event.timestamp,
- event->type->id,
- event->container->id,
- event->value);
+ event->event_type,
+ event->timestamp,
+ ((setVariable_t)event->data)->type->id,
+ ((setVariable_t)event->data)->container->id,
+ ((setVariable_t)event->data)->value);
}
}
-static void print_pajeAddVariable(addVariable_t event)
+static void print_pajeAddVariable(paje_event_t event)
{
- if (event->event.timestamp == 0){
+ if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %f\n",
- event->event.id,
- event->type->id,
- event->container->id,
- event->value);
+ 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.id,
- event->event.timestamp,
- event->type->id,
- event->container->id,
- event->value);
+ event->event_type,
+ event->timestamp,
+ ((addVariable_t)event->data)->type->id,
+ ((addVariable_t)event->data)->container->id,
+ ((addVariable_t)event->data)->value);
}
}
-static void print_pajeSubVariable(subVariable_t event)
+static void print_pajeSubVariable(paje_event_t event)
{
- if (event->event.timestamp == 0){
+ if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %f\n",
- event->event.id,
- event->type->id,
- event->container->id,
- event->value);
+ 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",
- event->event.id,
- event->event.timestamp,
- event->type->id,
- event->container->id,
- event->value);
+ event->event_type,
+ event->timestamp,
+ ((subVariable_t)event->data)->type->id,
+ ((subVariable_t)event->data)->container->id,
+ ((subVariable_t)event->data)->value);
}
}
-static void print_pajeSetState(setState_t event)
+static void print_pajeSetState(paje_event_t event)
{
- if (event->event.timestamp == 0){
+ if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s\n",
- event->event.id,
- event->type->id,
- event->container->id,
- event->value);
+ event->event_type,
+ ((setState_t)event->data)->type->id,
+ ((setState_t)event->data)->container->id,
+ ((setState_t)event->data)->value);
}else{
fprintf(tracing_file, "%d %lf %s %s %s\n",
- event->event.id,
- event->event.timestamp,
- event->type->id,
- event->container->id,
- event->value);
+ event->event_type,
+ event->timestamp,
+ ((setState_t)event->data)->type->id,
+ ((setState_t)event->data)->container->id,
+ ((setState_t)event->data)->value);
}
}
-static void print_pajePushState(pushState_t event)
+static void print_pajePushState(paje_event_t event)
{
- if (event->event.timestamp == 0){
+ if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s\n",
- event->event.id,
- event->type->id,
- event->container->id,
- event->value);
+ event->event_type,
+ ((pushState_t)event->data)->type->id,
+ ((pushState_t)event->data)->container->id,
+ ((pushState_t)event->data)->value);
}else{
fprintf(tracing_file, "%d %lf %s %s %s\n",
- event->event.id,
- event->event.timestamp,
- event->type->id,
- event->container->id,
- event->value);
+ event->event_type,
+ event->timestamp,
+ ((pushState_t)event->data)->type->id,
+ ((pushState_t)event->data)->container->id,
+ ((pushState_t)event->data)->value);
}
}
-static void print_pajePopState(popState_t event)
+static void print_pajePopState(paje_event_t event)
{
- if (event->event.timestamp == 0){
+ if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s\n",
- event->event.id,
- event->type->id,
- event->container->id);
+ 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.id,
- event->event.timestamp,
- event->type->id,
- event->container->id);
+ event->event_type,
+ event->timestamp,
+ ((popState_t)event->data)->type->id,
+ ((popState_t)event->data)->container->id);
}
}
-static void print_pajeStartLink(startLink_t event)
+static void print_pajeStartLink(paje_event_t event)
{
- if (event->event.timestamp == 0){
+ if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
- event->event.id,
- event->type->id,
- event->container->id,
- event->value,
- event->sourceContainer->id,
- event->key);
+ 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.id,
- event->event.timestamp,
- event->type->id,
- event->container->id,
- event->value,
- event->sourceContainer->id,
- event->key);
+ 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);
}
}
-static void print_pajeEndLink(endLink_t event)
+static void print_pajeEndLink(paje_event_t event)
{
- if (event->event.timestamp == 0){
+ if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
- event->event.id,
- event->type->id,
- event->container->id,
- event->value,
- event->destContainer->id,
- event->key);
+ 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.id,
- event->event.timestamp,
- event->type->id,
- event->container->id,
- event->value,
- event->destContainer->id,
- event->key);
+ 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);
}
}
-static void print_pajeNewEvent (newEvent_t event)
+static void print_pajeNewEvent (paje_event_t event)
{
- if (event->event.timestamp == 0){
+ if (event->timestamp == 0){
fprintf(tracing_file, "%d 0 %s %s %s\n",
- event->event.id,
- event->type->id,
- event->container->id,
- event->value);
+ event->event_type,
+ ((newEvent_t)event->data)->type->id,
+ ((newEvent_t)event->data)->container->id,
+ ((newEvent_t)event->data)->value);
}else{
fprintf(tracing_file, "%d %lf %s %s %s\n",
- event->event.id,
- event->event.timestamp,
- event->type->id,
- event->container->id,
- event->value);
+ event->event_type,
+ event->timestamp,
+ ((newEvent_t)event->data)->type->id,
+ ((newEvent_t)event->data)->container->id,
+ ((newEvent_t)event->data)->value);
}
}
+static void free_paje_event (paje_event_t event)
+{
+ if (event->event_type == PAJE_SetState) {
+ xbt_free (((setState_t)(event->data))->value);
+ }else if (event->event_type == PAJE_PushState) {
+ xbt_free (((pushState_t)(event->data))->value);
+ }else if (event->event_type == PAJE_NewEvent){
+ xbt_free (((newEvent_t)(event->data))->value);
+ }else 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);
+}
+
void new_pajeDefineContainerType(type_t type)
{
- defineContainerType_t event = xbt_new0(s_defineContainerType_t, 1);
- event->type = 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->event.id = pajeDefineContainerTypeId;
- event->event.timestamp = 0;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_defineContainerType_t, 1);
+ ((defineContainerType_t)(event->data))->type = type;
//print it
event->print (event);
-
- //destroy it
- xbt_free (event);
- event = NULL;
+ event->free (event);
}
void new_pajeDefineVariableType(type_t type)
{
- defineVariableType_t event = xbt_new0(s_defineVariableType_t, 1);
- event->type = type;
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_DefineVariableType;
+ event->timestamp = 0;
event->print = print_pajeDefineVariableType;
- event->event.id = pajeDefineVariableTypeWithColorId;
- event->event.timestamp = 0;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_defineVariableType_t, 1);
+ ((defineVariableType_t)(event->data))->type = type;
//print it
event->print (event);
-
- //destroy it
- xbt_free (event);
- event = NULL;
+ event->free (event);
}
void new_pajeDefineStateType(type_t type)
{
- defineStateType_t event = xbt_new0(s_defineStateType_t, 1);
- event->type = 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->event.id = pajeDefineStateTypeId;
- event->event.timestamp = 0;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_defineStateType_t, 1);
+ ((defineStateType_t)(event->data))->type = type;
//print it
event->print (event);
-
- //destroy it
- xbt_free (event);
- event = NULL;
+ event->free (event);
}
void new_pajeDefineEventType(type_t type)
{
- defineEventType_t event = xbt_new0(s_defineEventType_t, 1);
- event->type = type;
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_DefineEventType;
+ event->timestamp = 0;
event->print = print_pajeDefineEventType;
- event->event.id = pajeDefineEventTypeWithColorId;
- event->event.timestamp = 0;
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_defineEventType_t, 1);
+ ((defineEventType_t)(event->data))->type = type;
//print it
event->print (event);
-
- //destroy it
- xbt_free (event);
- event = NULL;
+ event->free (event);
}
void new_pajeDefineLinkType(type_t type, type_t source, type_t dest)
{
- defineLinkType_t event = xbt_new0(s_defineLinkType_t, 1);
- event->type = type;
- event->source = source;
- event->dest = 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->event.id = pajeDefineLinkTypeId;
- event->event.timestamp = 0;
+ 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;
//print it
event->print (event);
-
- //destroy it
- xbt_free (event);
- event = NULL;
+ event->free (event);
}
void new_pajeCreateContainer (container_t container)
{
- createContainer_t event = xbt_new0(s_createContainer_t, 1);
- event->container = 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->event.id = pajeCreateContainerId;
- event->event.timestamp = SIMIX_get_clock();
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_createContainer_t, 1);
+ ((createContainer_t)(event->data))->container = container;
//print it
event->print (event);
-
- //destroy it
- xbt_free (event);
- event = NULL;
+ event->free (event);
}
void new_pajeDestroyContainer (container_t container)
{
- destroyContainer_t event = xbt_new0(s_destroyContainer_t, 1);
- event->container = container;
+ 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->event.id = pajeDestroyContainerId;
- event->event.timestamp = SIMIX_get_clock();
+ event->free = free_paje_event;
+ event->data = xbt_new0(s_destroyContainer_t, 1);
+ ((destroyContainer_t)(event->data))->container = container;
//print it
event->print (event);
-
- //destroy it
- xbt_free (event);
- event = NULL;
-
- fflush (tracing_file);
+ event->free (event);
}
void new_pajeSetVariable (double timestamp, container_t container, type_t type, double value)
{
- setVariable_t event = xbt_new0(s_setVariable_t, 1);
- event->type = type;
- event->container = container;
- event->value = 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->event.id = pajeSetVariableId;
- event->event.timestamp = timestamp;
+ 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;
- //print it
- event->print (event);
-
- //destroy it
- xbt_free (event);
- event = NULL;
+ insert_into_buffer (event);
}
void new_pajeAddVariable (double timestamp, container_t container, type_t type, double value)
{
- addVariable_t event = xbt_new0(s_addVariable_t, 1);
- event->type = type;
- event->container = container;
- event->value = 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->event.id = pajeAddVariableId;
- event->event.timestamp = timestamp;
-
- //print it
- event->print (event);
+ 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;
- //destroy it
- xbt_free (event);
- event = NULL;
+ insert_into_buffer (event);
}
void new_pajeSubVariable (double timestamp, container_t container, type_t type, double value)
{
- subVariable_t event = xbt_new0(s_subVariable_t, 1);
- event->type = type;
- event->container = container;
- event->value = 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->event.id = pajeSubVariableId;
- event->event.timestamp = timestamp;
-
- //print it
- event->print (event);
+ 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;
- //destroy it
- xbt_free (event);
- event = NULL;
+ insert_into_buffer (event);
}
void new_pajeSetState (double timestamp, container_t container, type_t type, const char *value)
{
- setState_t event = xbt_new0(s_setState_t, 1);
- event->type = type;
- event->container = container;
- event->value = xbt_strdup(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->event.id = pajeSetStateId;
- event->event.timestamp = timestamp;
-
- //print it
- event->print (event);
+ 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 = xbt_strdup(value);
- //destroy it
- xbt_free (event->value);
- xbt_free (event);
- event = NULL;
+ insert_into_buffer (event);
}
void new_pajePushState (double timestamp, container_t container, type_t type, const char *value)
{
- pushState_t event = xbt_new0(s_pushState_t, 1);
- event->type = type;
- event->container = container;
- event->value = xbt_strdup(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->event.id = pajePushStateId;
- event->event.timestamp = timestamp;
-
- //print it
- event->print (event);
+ 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 = xbt_strdup(value);
- //destroy it
- xbt_free (event->value);
- xbt_free (event);
- event = NULL;
+ insert_into_buffer (event);
}
void new_pajePopState (double timestamp, container_t container, type_t type)
{
- popState_t event = xbt_new0(s_popState_t, 1);
- event->type = type;
- event->container = container;
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_PopState;
+ event->timestamp = timestamp;
event->print = print_pajePopState;
- event->event.id = pajePopStateId;
- event->event.timestamp = timestamp;
-
- //print it
- event->print (event);
+ 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;
- //destroy it
- xbt_free (event);
- event = NULL;
+ insert_into_buffer (event);
}
void new_pajeStartLink (double timestamp, container_t container, type_t type, container_t sourceContainer, const char *value, const char *key)
{
- startLink_t event = xbt_new0(s_startLink_t, 1);
- event->type = type;
- event->container = container;
- event->sourceContainer = sourceContainer;
- event->value = xbt_strdup (value);
- event->key = xbt_strdup (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->event.id = pajeStartLinkId;
- event->event.timestamp = timestamp;
-
- //print it
- event->print (event);
+ 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);
- //destroy it
- xbt_free (event->value);
- xbt_free (event->key);
- xbt_free (event);
- event = NULL;
+ insert_into_buffer (event);
}
void new_pajeEndLink (double timestamp, container_t container, type_t type, container_t destContainer, const char *value, const char *key)
{
- endLink_t event = xbt_new0(s_endLink_t, 1);
- event->type = type;
- event->container = container;
- event->destContainer = destContainer;
- event->value = xbt_strdup (value);
- event->key = xbt_strdup (key);
+ paje_event_t event = xbt_new0(s_paje_event_t, 1);
+ event->event_type = PAJE_EndLink;
+ event->timestamp = timestamp;
event->print = print_pajeEndLink;
- event->event.id = pajeEndLinkId;
- event->event.timestamp = timestamp;
+ 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);
- //print it
- event->print (event);
-
- //destroy it
- xbt_free (event->value);
- xbt_free (event->key);
- xbt_free (event);
- event = NULL;
+ insert_into_buffer (event);
}
void new_pajeNewEvent (double timestamp, container_t container, type_t type, const char *value)
{
- newEvent_t event = xbt_new0(s_newEvent_t, 1);
- event->type = type;
- event->container = container;
- event->value = xbt_strdup (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->event.id = pajeNewEventId;
- event->event.timestamp = timestamp;
+ 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 = xbt_strdup(value);
- //print it
- event->print (event);
-
- //destroy it
- xbt_free (event->value);
- xbt_free (event);
- event = NULL;
-}
-//
-//void pajeNewEvent(double time, const char *entityType,
-// const char *container, const char *value)
-//{
-// INSTR_PAJE_ASSERT(entityType);
-// INSTR_PAJE_ASSERT(container);
-// INSTR_PAJE_ASSERT(value);
-//
-// 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);
-// }
-//}
+ insert_into_buffer (event);
+}
#endif /* HAVE_TRACING */
