X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0b434542d7de83f5e040e7c03d5e98cd9c9f5d8a..143f5f6f6c838686a0365a379d3caf8955f27675:/src/instr/instr_private.h diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 573f3f4c29..6eb604427c 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -114,20 +114,16 @@ class s_container { typedef s_container s_container_t; //-------------------------------------------------- -class paje_event; -typedef paje_event *paje_event_t; - -class paje_event { +class PajeEvent { public: double timestamp; e_event_type event_type; - virtual void print(); + virtual void print() = 0; void *data; - ~paje_event(); + virtual ~PajeEvent(); }; -typedef paje_event s_paje_event_t; -class DefineContainerEvent : public paje_event +class DefineContainerEvent : public PajeEvent { public: type_t type; @@ -140,7 +136,7 @@ class DefineContainerEvent : public paje_event //-------------------------------------------------- -class DefineVariableTypeEvent : public paje_event +class DefineVariableTypeEvent : public PajeEvent { public: type_t type; @@ -149,21 +145,21 @@ class DefineVariableTypeEvent : public paje_event }; //-------------------------------------------------- -class DefineStateTypeEvent : public paje_event { +class DefineStateTypeEvent : public PajeEvent { type_t type; public: DefineStateTypeEvent(type_t type); - void print();// override; + void print() override; }; -class DefineEventTypeEvent : public paje_event { +class DefineEventTypeEvent : public PajeEvent { type_t type; public: DefineEventTypeEvent(type_t type); void print() override; }; -class DefineLinkTypeEvent : public paje_event { +class DefineLinkTypeEvent : public PajeEvent { type_t type; type_t source; type_t dest; @@ -172,21 +168,21 @@ class DefineLinkTypeEvent : public paje_event { void print() override; }; -class DefineEntityValueEvent : public paje_event { +class DefineEntityValueEvent : public PajeEvent { val_t value; public: DefineEntityValueEvent (val_t type); void print() override; }; -class CreateContainerEvent : public paje_event { +class CreateContainerEvent : public PajeEvent { public: container_t container; explicit CreateContainerEvent (container_t container); void print() override; }; -class DestroyContainerEvent : public paje_event { +class DestroyContainerEvent : public PajeEvent { public: container_t container; DestroyContainerEvent (container_t container); @@ -194,7 +190,7 @@ class DestroyContainerEvent : public paje_event { }; -class SetVariableEvent : public paje_event { +class SetVariableEvent : public PajeEvent { container_t container; type_t type; double value; @@ -204,7 +200,7 @@ class SetVariableEvent : public paje_event { }; -class AddVariableEvent:public paje_event { +class AddVariableEvent:public PajeEvent { container_t container; type_t type; double value; @@ -216,7 +212,7 @@ class AddVariableEvent:public paje_event { //-------------------------------------------------- -class SubVariableEvent : public paje_event { +class SubVariableEvent : public PajeEvent { public: container_t container; type_t type; @@ -227,7 +223,7 @@ class SubVariableEvent : public paje_event { }; //-------------------------------------------------- -class SetStateEvent : public paje_event { +class SetStateEvent : public PajeEvent { public: container_t container; type_t type; @@ -240,7 +236,7 @@ class SetStateEvent : public paje_event { }; -class PushStateEvent : public paje_event { +class PushStateEvent : public PajeEvent { public: container_t container; type_t type; @@ -248,7 +244,7 @@ class PushStateEvent : public paje_event { int size; const char* filename; int linenumber; - void* extra; + void* extra_; public: PushStateEvent (double timestamp, container_t container, type_t type, val_t value); PushStateEvent (double timestamp, container_t container, type_t type, val_t value, @@ -256,16 +252,15 @@ class PushStateEvent : public paje_event { void print() override; }; -class PopStateEvent : public paje_event { +class PopStateEvent : public PajeEvent { container_t container; type_t type; - xbt_dynar_t extra; public: PopStateEvent (double timestamp, container_t container, type_t type); void print() override; }; -class ResetStateEvent : public paje_event { +class ResetStateEvent : public PajeEvent { container_t container; type_t type; public: @@ -273,7 +268,7 @@ class ResetStateEvent : public paje_event { void print() override; }; -class StartLinkEvent : public paje_event { +class StartLinkEvent : public PajeEvent { public: container_t container; type_t type; @@ -282,14 +277,15 @@ class StartLinkEvent : public paje_event { char *key; int size; public: - StartLinkEvent (double timestamp, container_t container, type_t type, container_t sourceContainer, - const char *value, const char *key); - StartLinkEvent (double timestamp, container_t container, type_t type, - container_t sourceContainer, const char *value, const char *key, int size); - void print() override; + ~StartLinkEvent(); + StartLinkEvent(double timestamp, container_t container, type_t type, container_t sourceContainer, const char* value, + const char* key); + StartLinkEvent(double timestamp, container_t container, type_t type, container_t sourceContainer, const char* value, + const char* key, int size); + void print() override; }; -class EndLinkEvent : public paje_event { +class EndLinkEvent : public PajeEvent { container_t container; type_t type; container_t destContainer; @@ -298,11 +294,12 @@ class EndLinkEvent : public paje_event { public: EndLinkEvent (double timestamp, container_t container, type_t type, container_t destContainer, const char *value, const char *key); + ~EndLinkEvent(); void print() override; }; -class NewEvent : public paje_event { +class NewEvent : public PajeEvent { public: container_t container; type_t type; @@ -310,6 +307,7 @@ class NewEvent : public paje_event { public: NewEvent (double timestamp, container_t container, type_t type, val_t value); void print() override; + }; @@ -324,7 +322,6 @@ extern XBT_PRIVATE double TRACE_last_timestamp_to_dump; XBT_PRIVATE void TRACE_header(int basic, int size); /* from paje.c */ -XBT_PRIVATE void TRACE_paje_init(); XBT_PRIVATE void TRACE_paje_start(); XBT_PRIVATE void TRACE_paje_end(); XBT_PRIVATE void TRACE_paje_dump_buffer (int force); @@ -407,56 +404,52 @@ XBT_PUBLIC(val_t) PJ_value_get_or_new (const char *name, const char *color, typ XBT_PUBLIC(val_t) PJ_value_get (const char *name, const type_t father); XBT_PRIVATE void PJ_value_free (val_t value); -XBT_PRIVATE void print_pajeDefineContainerType(paje_event_t event); -XBT_PRIVATE void print_pajeDefineVariableType(paje_event_t event); -XBT_PRIVATE void print_pajeDefineStateType(paje_event_t event); -XBT_PRIVATE void print_pajeDefineEventType(paje_event_t event); -XBT_PRIVATE void print_pajeDefineLinkType(paje_event_t event); -XBT_PRIVATE void print_pajeDefineEntityValue (paje_event_t event); -XBT_PRIVATE void print_pajeCreateContainer(paje_event_t event); -XBT_PRIVATE void print_pajeDestroyContainer(paje_event_t event); -XBT_PRIVATE void print_pajeSetVariable(paje_event_t event); -XBT_PRIVATE void print_pajeAddVariable(paje_event_t event); -XBT_PRIVATE void print_pajeSubVariable(paje_event_t event); -XBT_PRIVATE void print_pajeSetState(paje_event_t event); -XBT_PRIVATE void print_pajePushState(paje_event_t event); -XBT_PRIVATE void print_pajePopState(paje_event_t event); -XBT_PRIVATE void print_pajeResetState(paje_event_t event); -XBT_PRIVATE void print_pajeStartLink(paje_event_t event); -XBT_PRIVATE void print_pajeEndLink(paje_event_t event); -XBT_PRIVATE void print_pajeNewEvent (paje_event_t event); - -XBT_PRIVATE void print_TIPushState(paje_event_t event); -XBT_PRIVATE void print_TICreateContainer(paje_event_t event); -XBT_PRIVATE void print_TIDestroyContainer(paje_event_t event); +XBT_PRIVATE void print_pajeDefineContainerType(PajeEvent* event); +XBT_PRIVATE void print_pajeDefineVariableType(PajeEvent* event); +XBT_PRIVATE void print_pajeDefineStateType(PajeEvent* event); +XBT_PRIVATE void print_pajeDefineEventType(PajeEvent* event); +XBT_PRIVATE void print_pajeDefineLinkType(PajeEvent* event); +XBT_PRIVATE void print_pajeDefineEntityValue (PajeEvent* event); +XBT_PRIVATE void print_pajeCreateContainer(PajeEvent* event); +XBT_PRIVATE void print_pajeDestroyContainer(PajeEvent* event); +XBT_PRIVATE void print_pajeSetVariable(PajeEvent* event); +XBT_PRIVATE void print_pajeAddVariable(PajeEvent* event); +XBT_PRIVATE void print_pajeSubVariable(PajeEvent* event); +XBT_PRIVATE void print_pajeSetState(PajeEvent* event); +XBT_PRIVATE void print_pajePushState(PajeEvent* event); +XBT_PRIVATE void print_pajePopState(PajeEvent* event); +XBT_PRIVATE void print_pajeResetState(PajeEvent* event); +XBT_PRIVATE void print_pajeStartLink(PajeEvent* event); +XBT_PRIVATE void print_pajeEndLink(PajeEvent* event); +XBT_PRIVATE void print_pajeNewEvent (PajeEvent* event); + XBT_PRIVATE void TRACE_TI_start(); XBT_PRIVATE void TRACE_TI_end(); -XBT_PRIVATE void TRACE_TI_init(); -XBT_PRIVATE void print_NULL (paje_event_t event); +XBT_PRIVATE void print_NULL (PajeEvent* event); XBT_PRIVATE void TRACE_paje_dump_buffer (int force); XBT_PRIVATE void dump_comment_file (const char *filename); XBT_PRIVATE void dump_comment (const char *comment); typedef struct instr_trace_writer { - void (*print_DefineContainerType) (paje_event_t event); - void (*print_DefineVariableType)(paje_event_t event); - void (*print_DefineStateType)(paje_event_t event); - void (*print_DefineEventType)(paje_event_t event); - void (*print_DefineLinkType)(paje_event_t event); - void (*print_DefineEntityValue)(paje_event_t event); - void (*print_CreateContainer)(paje_event_t event); - void (*print_DestroyContainer)(paje_event_t event); - void (*print_SetVariable)(paje_event_t event); - void (*print_AddVariable)(paje_event_t event); - void (*print_SubVariable)(paje_event_t event); - void (*print_SetState)(paje_event_t event); - void (*print_PushState)(paje_event_t event); - void (*print_PopState)(paje_event_t event); - void (*print_ResetState)(paje_event_t event); - void (*print_StartLink)(paje_event_t event); - void (*print_EndLink)(paje_event_t event); - void (*print_NewEvent) (paje_event_t event); + void (*print_DefineContainerType) (PajeEvent* event); + void (*print_DefineVariableType)(PajeEvent* event); + void (*print_DefineStateType)(PajeEvent* event); + void (*print_DefineEventType)(PajeEvent* event); + void (*print_DefineLinkType)(PajeEvent* event); + void (*print_DefineEntityValue)(PajeEvent* event); + void (*print_CreateContainer)(PajeEvent* event); + void (*print_DestroyContainer)(PajeEvent* event); + void (*print_SetVariable)(PajeEvent* event); + void (*print_AddVariable)(PajeEvent* event); + void (*print_SubVariable)(PajeEvent* event); + void (*print_SetState)(PajeEvent* event); + void (*print_PushState)(PajeEvent* event); + void (*print_PopState)(PajeEvent* event); + void (*print_ResetState)(PajeEvent* event); + void (*print_StartLink)(PajeEvent* event); + void (*print_EndLink)(PajeEvent* event); + void (*print_NewEvent) (PajeEvent* event); } s_instr_trace_writer_t; struct s_instr_extra_data; @@ -514,6 +507,14 @@ typedef struct s_instr_extra_data { int num_processes; } s_instr_extra_data_t; +/* Format of TRACING output. + * - paje is the regular format, that we all know + * - TI is a trick to reuse the tracing functions to generate a time independent trace during the execution. Such trace can easily be replayed with smpi_replay afterward. + * This trick should be removed and replaced by some code using the signal that we will create to cleanup the TRACING + */ +typedef enum { instr_fmt_paje, instr_fmt_TI } instr_fmt_type_t; +extern instr_fmt_type_t instr_fmt_type; + SG_END_DECL() #endif