X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/274b996ead50456d7519b1cbd5d4f86e0a9154ec..fd317f3cbf1cafcd1eeb4841b9a4b22d0dc81a0b:/src/instr/instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index b8065ec32e..ac6d1e4730 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -24,6 +24,27 @@
 #include "simix/smx_private.h"
 #include "xbt/graph_private.h"
 
+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_ResetState,
+  PAJE_StartLink,
+  PAJE_EndLink,
+  PAJE_NewEvent
+} e_event_type;
+
 typedef enum {
   TYPE_VARIABLE,
   TYPE_LINK,
@@ -79,8 +100,10 @@ extern xbt_dict_t user_host_variables;
 extern xbt_dict_t user_link_variables;
 extern double TRACE_last_timestamp_to_dump;
 
+/* instr_paje_header.c */
+void TRACE_header(int basic);
+
 /* from paje.c */
-void TRACE_paje_create_header(void);
 void TRACE_paje_start(void);
 void TRACE_paje_end(void);
 void TRACE_paje_dump_buffer (int force);
@@ -120,6 +143,7 @@ char *instr_process_id_2 (const char *process_name, int process_pid, char *str,
 void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host,
                                    msg_host_t new_host);
 void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host);
+void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_host_t host);
 void TRACE_msg_process_kill(msg_process_t process);
 void TRACE_msg_process_suspend(msg_process_t process);
 void TRACE_msg_process_resume(msg_process_t process);
@@ -147,6 +171,9 @@ void TRACE_smpi_init(int rank);
 void TRACE_smpi_finalize(int rank);
 void TRACE_smpi_collective_in(int rank, int root, const char *operation);
 void TRACE_smpi_collective_out(int rank, int root, const char *operation);
+void TRACE_smpi_computing_init(int rank);
+void TRACE_smpi_computing_out(int rank);
+void TRACE_smpi_computing_in(int rank);
 void TRACE_smpi_ptp_in(int rank, int src, int dst, const char *operation);
 void TRACE_smpi_ptp_out(int rank, int src, int dst, const char *operation);
 void TRACE_smpi_send(int rank, int src, int dst);
@@ -161,12 +188,16 @@ int TRACE_platform(void);
 int TRACE_is_configured(void);
 int TRACE_smpi_is_enabled(void);
 int TRACE_smpi_is_grouped(void);
+int TRACE_smpi_is_computing(void);
 int TRACE_categorized (void);
 int TRACE_uncategorized (void);
 int TRACE_msg_process_is_enabled(void);
 int TRACE_buffer (void);
 int TRACE_onelink_only (void);
 int TRACE_disable_destroy (void);
+int TRACE_basic (void);
+char *TRACE_get_comment (void);
+char *TRACE_get_comment_file (void);
 char *TRACE_get_filename(void);
 char *TRACE_get_triva_uncat_conf (void);
 char *TRACE_get_triva_cat_conf (void);
@@ -213,7 +244,7 @@ void PJ_type_alloc (void);
 void PJ_type_release (void);
 type_t PJ_type_get_root (void);
 type_t PJ_type_container_new (const char *name, type_t father);
-type_t PJ_type_event_new (const char *name, const char *color, type_t father);
+type_t PJ_type_event_new (const char *name, type_t father);
 type_t PJ_type_variable_new (const char *name, const char *color, type_t father);
 type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t dest);
 type_t PJ_type_state_new (const char *name, type_t father);