X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5744268bf404292887f93d4521a94579c9aaea93..393218f71f3bc45d05abb47474c4f81f4740571b:/src/instr/instr_paje_trace.c

diff --git a/src/instr/instr_paje_trace.c b/src/instr/instr_paje_trace.c
index 8f5eb7d8e3..4e94d7d490 100644
--- a/src/instr/instr_paje_trace.c
+++ b/src/instr/instr_paje_trace.c
@@ -12,6 +12,138 @@
 
 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 *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_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;
+  char *value;
+}s_setState_t;
+
+typedef struct s_pushState *pushState_t;
+typedef struct s_pushState {
+  container_t container;
+  type_t type;
+  char *value;
+}s_pushState_t;
+
+typedef struct s_popState *popState_t;
+typedef struct s_popState {
+  container_t container;
+  type_t type;
+  char *value;
+}s_popState_t;
+
+typedef struct s_startLink *startLink_t;
+typedef struct s_startLink {
+  type_t type;
+  container_t container;
+  container_t sourceContainer;
+  char *value;
+  char *key;
+}s_startLink_t;
+
+typedef struct s_endLink *endLink_t;
+typedef struct s_endLink {
+  type_t type;
+  container_t container;
+  container_t destContainer;
+  char *value;
+  char *key;
+}s_endLink_t;
+
+typedef struct s_newEvent *newEvent_t;
+typedef struct s_newEvent {
+  type_t type;
+  container_t container;
+  char *value;
+}s_newEvent_t;
+
 static FILE *tracing_file = NULL;
 
 static int pajeDefineContainerTypeId = 0;
@@ -40,7 +172,7 @@ static int pajeSetVariableId = 22;
 static int pajeAddVariableId = 23;
 static int pajeSubVariableId = 24;
 static int pajeDefineVariableTypeId = 25;
-static int pajeStartLinkWithVolumeId = 26;
+#define UNUSED001 26
 static int pajeNewEventId = 27;
 
 #define TRACE_LINE_SIZE 1000
@@ -175,331 +307,619 @@ void TRACE_paje_create_header(void)
 %%       Name string \n\
 %%       Color color \n\
 %%EndEventDef \n\
-%%EventDef PajeStartLink %d \n\
-%%       Time date \n\
-%%       EntityType string \n\
-%%       Container string \n\
-%%       Value string \n\
-%%       SourceContainer 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", pajeDefineContainerTypeId, pajeDefineStateTypeId, pajeDefineEntityValueId, pajeDefineEventTypeWithColorId, pajeDefineEventTypeId, pajeDefineLinkTypeId, pajeCreateContainerId, pajeDestroyContainerId, pajeSetStateId, pajePopStateId, pajeStartLinkId, pajeEndLinkId, pajePushStateId, pajeSetVariableId, pajeAddVariableId, pajeSubVariableId, pajeDefineVariableTypeId, pajeDefineVariableTypeWithColorId, pajeNewEventId);
+}
+
+/* internal do the instrumentation module */
+static void print_pajeDefineContainerType(paje_event_t event)
+{
+  fprintf(tracing_file, "%d %s %s %s\n",
+      event->id,
+      ((defineContainerType_t)event->data)->type->id,
+      ((defineContainerType_t)event->data)->type->father->id,
+      ((defineContainerType_t)event->data)->type->name);
+}
+
+static void print_pajeDefineVariableType(paje_event_t event)
+{
+  fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
+      event->id,
+      ((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(paje_event_t event)
+{
+  fprintf(tracing_file, "%d %s %s %s\n",
+      event->id,
+      ((defineStateType_t)event->data)->type->id,
+      ((defineStateType_t)event->data)->type->father->id,
+      ((defineStateType_t)event->data)->type->name);
+}
+
+static void print_pajeDefineEventType(paje_event_t event)
+{
+  fprintf(tracing_file, "%d %s %s %s \"%s\"\n",
+      event->id,
+      ((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);
 }
 
-/* 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)
+static void print_pajeDefineLinkType(paje_event_t event)
 {
-  if (time == 0){
-    snprintf(output, len, "%d 0 %s %s %s %s", eventid,
-           alias, type, container, name);
+  fprintf(tracing_file, "%d %s %s %s %s %s\n",
+      event->id,
+      ((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(paje_event_t event)
+{
+  if (event->timestamp == 0){
+    fprintf(tracing_file, "%d 0 %s %s %s %s\n",
+        event->id,
+        ((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{
-    snprintf(output, len, "%d %lf %s %s %s %s", eventid, time,
-           alias, type, container, name);
+    fprintf(tracing_file, "%d %lf %s %s %s %s\n",
+        event->id,
+        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 __pajeSetState(char *output, int len, int eventid, double time,
-                           const char *entityType, const char *container,
-                           const char *value)
+static void print_pajeDestroyContainer(paje_event_t event)
 {
-  if (time == 0){
-    snprintf(output, len, "%d 0 %s %s %s", eventid, entityType,
-           container, value);
+  if (event->timestamp == 0){
+    fprintf(tracing_file, "%d 0 %s %s\n",
+        event->id,
+        ((destroyContainer_t)event->data)->container->type->id,
+        ((destroyContainer_t)event->data)->container->id);
   }else{
-    snprintf(output, len, "%d %lf %s %s %s", eventid, time, entityType,
-           container, value);
+    fprintf(tracing_file, "%d %lf %s %s\n",
+        event->id,
+        event->timestamp,
+        ((destroyContainer_t)event->data)->container->type->id,
+        ((destroyContainer_t)event->data)->container->id);
   }
 }
 
-static void __pajeSetVariable(char *output, int len, int eventid,
-                              double time, const char *entityType,
-                              const char *container, const char *value)
+static void print_pajeSetVariable(paje_event_t event)
 {
-  if (time == 0){
-    snprintf(output, len, "%d 0 %s %s %s", eventid, entityType,
-           container, value);
+  if (event->timestamp == 0){
+    fprintf(tracing_file, "%d 0 %s %s %f\n",
+        event->id,
+        ((setVariable_t)event->data)->type->id,
+        ((setVariable_t)event->data)->container->id,
+        ((setVariable_t)event->data)->value);
   }else{
-    snprintf(output, len, "%d %lf %s %s %s", eventid, time, entityType,
-           container, value);
+    fprintf(tracing_file, "%d %lf %s %s %f\n",
+        event->id,
+        event->timestamp,
+        ((setVariable_t)event->data)->type->id,
+        ((setVariable_t)event->data)->container->id,
+        ((setVariable_t)event->data)->value);
   }
 }
 
-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_pajeAddVariable(paje_event_t event)
 {
-  if (time == 0){
-    snprintf(output, len, "%d 0 %s %s %s %s %s", eventid, entityType,
-           container, value, sourceContainer, key);
+  if (event->timestamp == 0){
+    fprintf(tracing_file, "%d 0 %s %s %f\n",
+        event->id,
+        ((addVariable_t)event->data)->type->id,
+        ((addVariable_t)event->data)->container->id,
+        ((addVariable_t)event->data)->value);
   }else{
-    snprintf(output, len, "%d %lf %s %s %s %s %s", eventid, time, entityType,
-           container, value, sourceContainer, key);
+    fprintf(tracing_file, "%d %lf %s %s %f\n",
+        event->id,
+        event->timestamp,
+        ((addVariable_t)event->data)->type->id,
+        ((addVariable_t)event->data)->container->id,
+        ((addVariable_t)event->data)->value);
   }
 }
 
-/* internal do the instrumentation module */
-void pajeDefineContainerType(const char *alias, const char *containerType,
-                             const char *name)
+static void print_pajeSubVariable(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);
+  if (event->timestamp == 0){
+    fprintf(tracing_file, "%d 0 %s %s %f\n",
+        event->id,
+        ((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->id,
+        event->timestamp,
+        ((subVariable_t)event->data)->type->id,
+        ((subVariable_t)event->data)->container->id,
+        ((subVariable_t)event->data)->value);
+  }
 }
 
-void pajeDefineStateType(const char *alias, const char *containerType,
-                         const char *name)
+static void print_pajeSetState(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);
+  if (event->timestamp == 0){
+    fprintf(tracing_file, "%d 0 %s %s %s\n",
+        event->id,
+        ((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->id,
+        event->timestamp,
+        ((setState_t)event->data)->type->id,
+        ((setState_t)event->data)->container->id,
+        ((setState_t)event->data)->value);
+  }
 }
 
-void pajeDefineEventTypeWithColor(const char *alias, const char *containerType,
-                         const char *name, const char *color)
+static void print_pajePushState(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);
+  if (event->timestamp == 0){
+    fprintf(tracing_file, "%d 0 %s %s %s\n",
+        event->id,
+        ((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->id,
+        event->timestamp,
+        ((pushState_t)event->data)->type->id,
+        ((pushState_t)event->data)->container->id,
+        ((pushState_t)event->data)->value);
+  }
 }
 
-void pajeDefineEventType(const char *alias, const char *containerType,
-                         const char *name)
+static void print_pajePopState(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);
+  if (event->timestamp == 0){
+    fprintf(tracing_file, "%d 0 %s %s\n",
+        event->id,
+        ((popState_t)event->data)->type->id,
+        ((popState_t)event->data)->container->id);
+  }else{
+    fprintf(tracing_file, "%d %lf %s %s\n",
+        event->id,
+        event->timestamp,
+        ((popState_t)event->data)->type->id,
+        ((popState_t)event->data)->container->id);
+  }
 }
 
-void pajeDefineLinkType(const char *alias, const char *containerType,
-                        const char *sourceContainerType,
-                        const char *destContainerType, const char *name)
+static void print_pajeStartLink(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);
+  if (event->timestamp == 0){
+    fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
+        event->id,
+        ((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->id,
+        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 pajeCreateContainer(double time, const char *alias, const char *type,
-                         const char *container, const char *name)
+static void print_pajeEndLink(paje_event_t event)
 {
-  INSTR_PAJE_ASSERT(alias);
-  INSTR_PAJE_ASSERT(type);
-  INSTR_PAJE_ASSERT(container);
-  INSTR_PAJE_ASSERT(name);
-
-  char line[TRACE_LINE_SIZE];
-  __pajeCreateContainer(line, TRACE_LINE_SIZE, pajeCreateContainerId, time,
-                        alias, type, container, name);
-  fprintf(tracing_file, "%s\n", line);
+  if (event->timestamp == 0){
+    fprintf(tracing_file, "%d 0 %s %s %s %s %s\n",
+        event->id,
+        ((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->id,
+        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);
+  }
 }
 
-void pajeDestroyContainer(double time, const char *type,
-                          const char *container)
+static void print_pajeNewEvent (paje_event_t event)
 {
-  INSTR_PAJE_ASSERT(type);
-  INSTR_PAJE_ASSERT(container);
-
-  if (time == 0){
-    fprintf(tracing_file, "%d 0 %s %s\n", pajeDestroyContainerId,
-          type, container);
+  if (event->timestamp == 0){
+    fprintf(tracing_file, "%d 0 %s %s %s\n",
+        event->id,
+        ((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\n", pajeDestroyContainerId, time,
-          type, container);
+    fprintf(tracing_file, "%d %lf %s %s %s\n",
+        event->id,
+        event->timestamp,
+        ((newEvent_t)event->data)->type->id,
+        ((newEvent_t)event->data)->container->id,
+        ((newEvent_t)event->data)->value);
   }
 }
 
-void pajeSetState(double time, const char *entityType,
-                  const char *container, const char *value)
+void new_pajeDefineContainerType(type_t type)
 {
-  INSTR_PAJE_ASSERT(entityType);
-  INSTR_PAJE_ASSERT(container);
-  INSTR_PAJE_ASSERT(value);
-
-  char line[TRACE_LINE_SIZE];
-  __pajeSetState(line, TRACE_LINE_SIZE, pajeSetStateId, time, entityType,
-                 container, value);
-  fprintf(tracing_file, "%s\n", line);
+  paje_event_t event = xbt_new0(s_paje_event_t, 1);
+  event->event_type = PAJE_DefineContainerType;
+  event->id = pajeDefineContainerTypeId;
+  event->timestamp = 0;
+  event->print = print_pajeDefineContainerType;
+  event->data = xbt_new0(s_defineContainerType_t, 1);
+  ((defineContainerType_t)(event->data))->type = type;
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
 }
 
-void pajePushState(double time, const char *entityType,
-                   const char *container, const char *value)
+void new_pajeDefineVariableType(type_t type)
 {
-  INSTR_PAJE_ASSERT(entityType);
-  INSTR_PAJE_ASSERT(container);
-  INSTR_PAJE_ASSERT(value);
-
-  char line[TRACE_LINE_SIZE];
-  __pajeSetState(line, TRACE_LINE_SIZE, pajePushStateId, time, entityType,
-                 container, value);
-  fprintf(tracing_file, "%s\n", line);
+  paje_event_t event = xbt_new0(s_paje_event_t, 1);
+  event->event_type = PAJE_DefineVariableType;
+  event->id = pajeDefineVariableTypeWithColorId;
+  event->timestamp = 0;
+  event->print = print_pajeDefineVariableType;
+  event->data = xbt_new0(s_defineVariableType_t, 1);
+  ((defineVariableType_t)(event->data))->type = type;
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
 }
 
-void pajePopState(double time, const char *entityType,
-                  const char *container)
+void new_pajeDefineStateType(type_t type)
 {
-  INSTR_PAJE_ASSERT(entityType);
-  INSTR_PAJE_ASSERT(container);
-
-  fprintf(tracing_file, "%d %lf %s %s\n", pajePopStateId, time, entityType,
-          container);
+  paje_event_t event = xbt_new0(s_paje_event_t, 1);
+  event->event_type = PAJE_DefineStateType;
+  event->id = pajeDefineStateTypeId;
+  event->timestamp = 0;
+  event->print = print_pajeDefineStateType;
+  event->data = xbt_new0(s_defineStateType_t, 1);
+  ((defineStateType_t)(event->data))->type = type;
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
 }
 
-void pajeStartLink(double time, const char *entityType,
-                   const char *container, const char *value,
-                   const char *sourceContainer, const char *key)
+void new_pajeDefineEventType(type_t type)
 {
-  INSTR_PAJE_ASSERT(entityType);
-  INSTR_PAJE_ASSERT(container);
-  INSTR_PAJE_ASSERT(value);
-  INSTR_PAJE_ASSERT(sourceContainer);
-  INSTR_PAJE_ASSERT(key);
-
-  char line[TRACE_LINE_SIZE];
-  __pajeStartLink(line, TRACE_LINE_SIZE, pajeStartLinkId, time, entityType,
-                  container, value, sourceContainer, key);
-  fprintf(tracing_file, "%s\n", line);
+  paje_event_t event = xbt_new0(s_paje_event_t, 1);
+  event->event_type = PAJE_DefineEventType;
+  event->id = pajeDefineEventTypeWithColorId;
+  event->timestamp = 0;
+  event->print = print_pajeDefineEventType;
+  event->data = xbt_new0(s_defineEventType_t, 1);
+  ((defineEventType_t)(event->data))->type = type;
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
 }
 
-void pajeStartLinkWithVolume(double time, const char *entityType,
-                             const char *container, const char *value,
-                             const char *sourceContainer, const char *key,
-                             double volume)
+void new_pajeDefineLinkType(type_t type, type_t source, type_t dest)
 {
-  INSTR_PAJE_ASSERT(entityType);
-  INSTR_PAJE_ASSERT(container);
-  INSTR_PAJE_ASSERT(value);
-  INSTR_PAJE_ASSERT(sourceContainer);
-  INSTR_PAJE_ASSERT(key);
-
-  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);
+  paje_event_t event = xbt_new0(s_paje_event_t, 1);
+  event->event_type = PAJE_DefineLinkType;
+  event->id = pajeDefineLinkTypeId;
+  event->timestamp = 0;
+  event->print = print_pajeDefineLinkType;
+  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->data);
+  xbt_free (event);
+  event = NULL;
 }
 
-void pajeEndLink(double time, const char *entityType,
-                 const char *container, const char *value,
-                 const char *destContainer, const char *key)
+void new_pajeCreateContainer (container_t container)
 {
-  INSTR_PAJE_ASSERT(entityType);
-  INSTR_PAJE_ASSERT(container);
-  INSTR_PAJE_ASSERT(value);
-  INSTR_PAJE_ASSERT(destContainer);
-  INSTR_PAJE_ASSERT(key);
-
-  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);
-  }
+  paje_event_t event = xbt_new0(s_paje_event_t, 1);
+  event->event_type = PAJE_CreateContainer;
+  event->id = pajeCreateContainerId;
+  event->timestamp = SIMIX_get_clock();
+  event->print = print_pajeCreateContainer;
+  event->data = xbt_new0(s_createContainer_t, 1);
+  ((createContainer_t)(event->data))->container = container;
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
 }
 
-void pajeDefineVariableType(const char *alias, const char *containerType,
-                            const char *name)
+void new_pajeDestroyContainer (container_t container)
 {
-  INSTR_PAJE_ASSERT(alias);
-  INSTR_PAJE_ASSERT(containerType);
-  INSTR_PAJE_ASSERT(name);
-
-  fprintf(tracing_file, "%d %s %s %s\n", pajeDefineVariableTypeId, alias,
-          containerType, name);
+  paje_event_t event = xbt_new0(s_paje_event_t, 1);
+  event->event_type = PAJE_DestroyContainer;
+  event->id = pajeDestroyContainerId;
+  event->timestamp = SIMIX_get_clock();
+  event->print = print_pajeDestroyContainer;
+  event->data = xbt_new0(s_destroyContainer_t, 1);
+  ((destroyContainer_t)(event->data))->container = container;
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
 }
 
-void pajeDefineVariableTypeWithColor(const char *alias, const char *containerType,
-                            const char *name, const char *color)
+void new_pajeSetVariable (double timestamp, container_t container, type_t type, double value)
 {
-  INSTR_PAJE_ASSERT(alias);
-  INSTR_PAJE_ASSERT(containerType);
-  INSTR_PAJE_ASSERT(name);
-  INSTR_PAJE_ASSERT(color);
-
-  fprintf(tracing_file, "%d %s %s %s \"%s\"\n", pajeDefineVariableTypeWithColorId, alias,
-          containerType, name, color);
+  paje_event_t event = xbt_new0(s_paje_event_t, 1);
+  event->event_type = PAJE_SetVariable;
+  event->id = pajeSetVariableId;
+  event->timestamp = timestamp;
+  event->print = print_pajeSetVariable;
+  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->data);
+  xbt_free (event);
+  event = NULL;
 }
 
-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->id = pajeAddVariableId;
+  event->timestamp = timestamp;
+  event->print = print_pajeAddVariable;
+  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;
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
+}
 
-  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->id = pajeSubVariableId;
+  event->timestamp = timestamp;
+  event->print = print_pajeSubVariable;
+  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;
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
 }
 
-void pajeAddVariable(double time, const char *entityType,
-                     const char *container, const char *value)
+void new_pajeSetState (double timestamp, container_t container, type_t type, const char *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->id = pajeSetStateId;
+  event->timestamp = timestamp;
+  event->print = print_pajeSetState;
+  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);
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (((setState_t)(event->data))->value);
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
+}
+
 
-  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, const char *value)
+{
+  paje_event_t event = xbt_new0(s_paje_event_t, 1);
+  event->event_type = PAJE_PushState;
+  event->id = pajePushStateId;
+  event->timestamp = timestamp;
+  event->print = print_pajePushState;
+  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);
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (((pushState_t)(event->data))->value);
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
 }
 
-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->id = pajePopStateId;
+  event->timestamp = timestamp;
+  event->print = print_pajePopState;
+  event->data = xbt_new0(s_popState_t, 1);
+  ((popState_t)(event->data))->type = type;
+  ((popState_t)(event->data))->container = container;
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
+}
 
-  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->id = pajeStartLinkId;
+  event->timestamp = timestamp;
+  event->print = print_pajeStartLink;
+  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);
+
+  //print it
+  event->print (event);
+
+  //destroy it
+  xbt_free (((startLink_t)(event->data))->value);
+  xbt_free (((startLink_t)(event->data))->key);
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
 }
 
-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->id = pajeEndLinkId;
+  event->timestamp = timestamp;
+  event->print = print_pajeEndLink;
+  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 (((endLink_t)(event->data))->value);
+  xbt_free (((endLink_t)(event->data))->key);
+  xbt_free (event->data);
+  xbt_free (event);
+  event = NULL;
+}
 
-  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, const char *value)
+{
+  paje_event_t event = xbt_new0(s_paje_event_t, 1);
+  event->event_type = PAJE_NewEvent;
+  event->id = pajeNewEventId;
+  event->timestamp = timestamp;
+  event->print = print_pajeNewEvent;
+  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 (((newEvent_t)(event->data))->value);
+  xbt_free (event->data);
+  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);
+//  }
+//}
 
 #endif /* HAVE_TRACING */