-void TRACE_paje_create_header(void);
-void TRACE_paje_start(FILE * file);
-FILE *TRACE_paje_end(void);
-void pajeDefineContainerType(const char *alias, const char *containerType,
- const char *name);
-void pajeDefineStateType(const char *alias, const char *containerType,
- const char *name);
-void pajeDefineEventType(const char *alias, const char *containerType,
- const char *name);
-void pajeDefineLinkType(const char *alias, const char *containerType,
- const char *sourceContainerType,
- const char *destContainerType, const char *name);
-void pajeCreateContainer(double time, const char *alias, const char *type,
- const char *container, const char *name);
-void pajeDestroyContainer(double time, const char *type,
- const char *container);
-void pajeSetState(double time, const char *entityType,
- const char *container, const char *value);
-void pajePushState(double time, const char *entityType,
- const char *container, const char *value);
-void pajePopState(double time, const char *entityType,
- const char *container);
-void pajeStartLink(double time, const char *entityType,
- const char *container, const char *value,
- const char *sourceContainer, const char *key);
-void pajeStartLinkWithVolume(double time, const char *entityType,
- const char *container, const char *value,
- const char *sourceContainer, const char *key,
- double volume);
-void pajeEndLink(double time, const char *entityType,
- const char *container, const char *value,
- const char *destContainer, const char *key);
-void pajeDefineVariableType(const char *alias, const char *containerType,
- const char *name);
-void pajeDefineVariableTypeWithColor(const char *alias, const char *containerType,
- const char *name, const char *color);
-void pajeSetVariable(double time, const char *entityType,
- const char *container, const char *value);
-void pajeAddVariable(double time, const char *entityType,
- const char *container, const char *value);
-void pajeSubVariable(double time, const char *entityType,
- const char *container, const char *value);
-void pajeNewEvent(double time, const char *entityType,
- const char *container, const char *value);
-
-/* from categories.c */
-void TRACE_category_alloc(void);
-void TRACE_category_release(void);
-void TRACE_category_set(smx_process_t proc, const char *category);
-char *TRACE_category_get(smx_process_t proc);
-void TRACE_category_unset(smx_process_t proc);
-void TRACE_msg_category_set(smx_process_t proc, m_task_t task);
-
-/* declaration of instrumentation functions from msg_task_instr.c */
-char *TRACE_task_container(m_task_t task, char *output, int len);
-void TRACE_msg_task_alloc(void);
-void TRACE_msg_task_release(void);
-void TRACE_msg_task_create(m_task_t task);
-void TRACE_msg_task_execute_start(m_task_t task);
-void TRACE_msg_task_execute_end(m_task_t task);
-void TRACE_msg_task_destroy(m_task_t task);
-void TRACE_msg_task_get_start(void);
-void TRACE_msg_task_get_end(double start_time, m_task_t task);
-int TRACE_msg_task_put_start(m_task_t task); //returns TRUE if the task_put_end must be called
-void TRACE_msg_task_put_end(void);
-
-/* declaration of instrumentation functions from msg_process_instr.c */
-char *TRACE_process_alias_container(m_process_t process, m_host_t host,
- char *output, int len);
-char *TRACE_process_container(m_process_t process, char *output, int len);
-void TRACE_msg_process_alloc(void);
-void TRACE_msg_process_release(void);
-void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host,
- m_host_t new_host);
-void TRACE_msg_process_kill(m_process_t process);
-void TRACE_msg_process_suspend(m_process_t process);
-void TRACE_msg_process_resume(m_process_t process);
-void TRACE_msg_process_sleep_in(m_process_t process); //called from msg/gos.c
-void TRACE_msg_process_sleep_out(m_process_t process);
-void TRACE_msg_process_end(m_process_t process);
-
-/* declaration of instrumentation functions from msg_volume.c */
-void TRACE_msg_volume_start(m_task_t task);
-void TRACE_msg_volume_finish(m_task_t task);
-
-/* from smx.c */
-void TRACE_smx_host_execute(smx_action_t act);
-void TRACE_smx_action_communicate(smx_action_t act, smx_process_t proc);
-void TRACE_smx_action_destroy(smx_action_t act);
-
-/* from surf_instr.c */
-void TRACE_surf_alloc(void);
-void TRACE_surf_release(void);
-void TRACE_surf_host_declaration(const char *name, double power);
-void TRACE_surf_host_set_power(double date, const char *resource,
- double power);
-void TRACE_surf_host_define_id(const char *name, int host_id);
-void TRACE_surf_host_vivaldi_parse(char *host, double x, double y,
- double h);
-void TRACE_surf_link_declaration(void *link, char *name, double bw,
- double lat);
-void TRACE_surf_link_set_bandwidth(double date, void *link,
- double bandwidth);
-void TRACE_surf_link_set_latency(double date, void *link, double latency);
-void TRACE_surf_save_onelink(void);
-int TRACE_surf_link_is_traced(void *link);
-void TRACE_surf_action(surf_action_t surf_action, const char *category);
+void TRACE_paje_start(void);
+void TRACE_paje_end(void);
+void TRACE_paje_dump_buffer (int force);
+XBT_PUBLIC(void) new_pajeDefineContainerType(type_t type);
+XBT_PUBLIC(void) new_pajeDefineVariableType(type_t type);
+XBT_PUBLIC(void) new_pajeDefineStateType(type_t type);
+XBT_PUBLIC(void) new_pajeDefineEventType(type_t type);
+XBT_PUBLIC(void) new_pajeDefineLinkType(type_t type, type_t source, type_t dest);
+XBT_PUBLIC(void) new_pajeDefineEntityValue (val_t type);
+XBT_PUBLIC(void) new_pajeCreateContainer (container_t container);
+XBT_PUBLIC(void) new_pajeDestroyContainer (container_t container);
+XBT_PUBLIC(void) new_pajeSetVariable (double timestamp, container_t container, type_t type, double value);
+XBT_PUBLIC(void) new_pajeAddVariable (double timestamp, container_t container, type_t type, double value);
+XBT_PUBLIC(void) new_pajeSubVariable (double timestamp, container_t container, type_t type, double value);
+XBT_PUBLIC(void) new_pajeSetState (double timestamp, container_t container, type_t type, val_t value);
+XBT_PUBLIC(void) new_pajePushState (double timestamp, container_t container, type_t type, val_t value);
+XBT_PUBLIC(void) new_pajePushStateWithSize (double timestamp, container_t container, type_t type, val_t value, int size);
+XBT_PUBLIC(void) new_pajePopState (double timestamp, container_t container, type_t type);
+XBT_PUBLIC(void) new_pajeResetState (double timestamp, container_t container, type_t type);
+XBT_PUBLIC(void) new_pajeStartLink (double timestamp, container_t container, type_t type, container_t sourceContainer, const char *value, const char *key);
+XBT_PUBLIC(void) new_pajeStartLinkWithSize (double timestamp, container_t container, type_t type, container_t sourceContainer, const char *value, const char *key, int size);
+XBT_PUBLIC(void) new_pajeEndLink (double timestamp, container_t container, type_t type, container_t destContainer, const char *value, const char *key);
+XBT_PUBLIC(void) new_pajeNewEvent (double timestamp, container_t container, type_t type, val_t value);