#include <xbt/base.h>
-#include "simgrid/instr.h"
#include "instr/instr_interface.h"
-#include "src/internal_config.h"
+#include "simgrid/instr.h"
#include "simgrid_config.h"
+#include "src/internal_config.h"
+#include <set>
SG_BEGIN_DECL()
} e_entity_types;
//--------------------------------------------------
-class s_type;
-typedef s_type *type_t;
-class s_type {
+
+class ess_type {
public:
char *id;
char *name;
char *color;
+};
+
+class Type;
+typedef Type *type_t;
+class Type : public ess_type {
+ public:
e_entity_types kind;
- s_type *father;
+ Type *father;
xbt_dict_t children;
xbt_dict_t values; //valid for all types except variable and container
+ Type (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father);
+ static type_t getOrNull (const char *name, type_t father);
+ static type_t containerNew (const char *name, type_t father);
+ static type_t eventNew (const char *name, type_t father);
+ static type_t variableNew (const char *name, const char *color, type_t father);
+ static type_t linkNew (const char *name, type_t father, type_t source, type_t dest);
+ static type_t stateNew (const char *name, type_t father);
};
-typedef s_type s_type_t;
-
//--------------------------------------------------
-class s_val;
-typedef s_val *val_t;
-
-class s_val {
- public:
- char *id;
- char *name;
- char *color;
+class value : public ess_type{
+public:
type_t father;
+ value* ret;
+ value(const char* name, const char* color, type_t father);
+ ~value();
+ static value* get_or_new(const char* name, const char* color, type_t father);
+ static value* get(const char* name, type_t father);
};
-typedef s_val s_val_t;
+
//--------------------------------------------------
typedef enum {
typedef s_container *container_t;
class s_container {
- public:
+ public:
sg_netpoint_t netpoint;
char *name; /* Unique name of this container */
char *id; /* Unique id of this container */
s_container *father;
xbt_dict_t children;
};
-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;
- void (*print) (paje_event_t event);
- void (*free) (paje_event_t event);
+ virtual void print() = 0;
void *data;
+ virtual ~PajeEvent();
};
-typedef paje_event s_paje_event_t;
+
//--------------------------------------------------
-class s_defineContainerType;
-typedef s_defineContainerType *defineContainerType_t;
-class s_defineContainerType {
+class DefineVariableTypeEvent : public PajeEvent
+{
public:
type_t type;
- XBT_PUBLIC(void) new_pajeDefineContainerType(type_t type);
+ DefineVariableTypeEvent(type_t type);
+ void print() override;
};
-typedef s_defineContainerType 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 {
+class DefineStateTypeEvent : public PajeEvent {
type_t type;
- type_t source;
- type_t dest;
-}s_defineLinkType_t;
-
-typedef struct s_defineEntityValue *defineEntityValue_t;
-typedef struct s_defineEntityValue {
- val_t value;
-}s_defineEntityValue_t;
-
-typedef struct s_createContainer *createContainer_t;
-typedef struct s_createContainer {
- container_t container;
-}s_createContainer_t;
+ public:
+ DefineStateTypeEvent(type_t type);
+ void print() override;
+};
-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 {
+class SetVariableEvent : public PajeEvent {
+ private:
container_t container;
type_t type;
double value;
-}s_setVariable_t;
+ public:
+ SetVariableEvent (double timestamp, container_t container, type_t type, double value);
+ void print() override;
+};
-typedef struct s_addVariable *addVariable_t;
-typedef struct s_addVariable {
+
+class AddVariableEvent:public PajeEvent {
+ private:
container_t container;
type_t type;
double value;
-}s_addVariable_t;
+ public:
+ AddVariableEvent (double timestamp, container_t container, type_t type, double value);
+ void print() override;
+};
//--------------------------------------------------
-class s_subVariable;
-typedef s_subVariable *subVariable_t;
-class s_subVariable {
- public:
+class SubVariableEvent : public PajeEvent {
+ private:
container_t container;
type_t type;
double value;
- //methods
- XBT_PUBLIC(void) new_pajeSubVariable (double timestamp, container_t container, type_t type, double value);
+ public:
+ SubVariableEvent(double timestamp, container_t container, type_t type, double value);
+ void print() override;
};
-typedef s_subVariable s_subVariable_t;
//--------------------------------------------------
-class s_setState;
-
-typedef s_setState *setState_t;
-class s_setState {
- public:
+class SetStateEvent : public PajeEvent {
+ private:
container_t container;
type_t type;
- val_t value;
+ value* val;
const char* filename;
int linenumber;
+ public:
+ SetStateEvent(double timestamp, container_t container, type_t type, value* val);
+ void print() override;
};
-typedef s_setState s_setState_t;
-class s_pushState;
-
-typedef s_pushState *pushState_t;
-class s_pushState {
+class PushStateEvent : public PajeEvent {
public:
container_t container;
type_t type;
- val_t value;
+ value* val;
int size;
const char* filename;
int linenumber;
- void* extra;
+ void* extra_;
+ public:
+ PushStateEvent(double timestamp, container_t container, type_t type, value* val);
+ PushStateEvent(double timestamp, container_t container, type_t type, value* val, void* extra);
+ void print() override;
};
-typedef s_pushState s_pushState_t;
-
-typedef struct s_popState *popState_t;
-typedef struct s_popState {
+class PopStateEvent : public PajeEvent {
container_t container;
type_t type;
- xbt_dynar_t extra;
-}s_popState_t;
+ public:
+ PopStateEvent (double timestamp, container_t container, type_t type);
+ void print() override;
+};
-typedef struct s_resetState *resetState_t;
-typedef struct s_resetState {
+class ResetStateEvent : public PajeEvent {
container_t container;
type_t type;
-}s_resetState_t;
+ public:
+ ResetStateEvent (double timestamp, container_t container, type_t type);
+ void print() override;
+};
-typedef struct s_startLink *startLink_t;
-typedef struct s_startLink {
+class StartLinkEvent : public PajeEvent {
+ public:
container_t container;
type_t type;
container_t sourceContainer;
char *value;
char *key;
int size;
-}s_startLink_t;
+ public:
+ ~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;
+};
-typedef struct s_endLink *endLink_t;
-typedef struct s_endLink {
+class EndLinkEvent : public PajeEvent {
container_t container;
type_t type;
container_t destContainer;
char *value;
char *key;
-}s_endLink_t;
-
-class s_newEvent;
+ public:
+ EndLinkEvent (double timestamp, container_t container, type_t type, container_t destContainer,
+ const char *value, const char *key);
+ ~EndLinkEvent();
+ void print() override;
+};
-typedef s_newEvent *newEvent_t;
-class s_newEvent {
+class NewEvent : public PajeEvent {
public:
container_t container;
type_t type;
- val_t value;
-};
+ value* val;
-typedef s_newEvent s_newEvent_t;
+public:
+ NewEvent(double timestamp, container_t container, type_t type, value* val);
+ void print() override;
-extern XBT_PRIVATE xbt_dict_t created_categories;
-extern XBT_PRIVATE xbt_dict_t declared_marks;
-extern XBT_PRIVATE xbt_dict_t user_host_variables;
-extern XBT_PRIVATE xbt_dict_t user_vm_variables;
-extern XBT_PRIVATE xbt_dict_t user_link_variables;
+};
+
+extern XBT_PRIVATE std::set<std::string> created_categories;
+extern XBT_PRIVATE std::set<std::string> declared_marks;
+extern XBT_PRIVATE std::set<std::string> user_host_variables;
+extern XBT_PRIVATE std::set<std::string> user_vm_variables;
+extern XBT_PRIVATE std::set<std::string> user_link_variables;
extern XBT_PRIVATE double TRACE_last_timestamp_to_dump;
/* instr_paje_header.c */
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);
-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);
-
-// Container
-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_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_pajePushStateWithExtra (double timestamp, container_t container, type_t type, val_t value,
- void* extra);
-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);
/* from instr_config.c */
XBT_PRIVATE bool TRACE_needs_platform ();
XBT_PUBLIC(void) TRACE_surf_resource_utilization_alloc();
/* instr_paje.c */
-extern XBT_PRIVATE xbt_dict_t trivaNodeTypes;
-extern XBT_PRIVATE xbt_dict_t trivaEdgeTypes;
+extern XBT_PRIVATE std::set<std::string> trivaNodeTypes;
+extern XBT_PRIVATE std::set<std::string> trivaEdgeTypes;
XBT_PRIVATE long long int instr_new_paje_id ();
XBT_PRIVATE void PJ_container_alloc ();
XBT_PRIVATE void PJ_container_release ();
XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container);
/* instr_paje_types.c */
-XBT_PRIVATE void PJ_type_alloc ();
XBT_PRIVATE void PJ_type_release ();
XBT_PUBLIC(type_t) PJ_type_get_root ();
-XBT_PRIVATE type_t PJ_type_container_new (const char *name, type_t father);
-XBT_PRIVATE type_t PJ_type_event_new (const char *name, type_t father);
-type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t dest);
-XBT_PRIVATE XBT_PRIVATE type_t PJ_type_variable_new (const char *name, const char *color, type_t father);
-XBT_PRIVATE type_t PJ_type_state_new (const char *name, type_t father);
XBT_PUBLIC(type_t) PJ_type_get (const char *name, const type_t father);
-XBT_PUBLIC(type_t) PJ_type_get_or_null (const char *name, type_t father);
-void PJ_type_free_all ();
-XBT_PRIVATE XBT_PRIVATE void PJ_type_free (type_t type);
-
-/* instr_paje_values.c */
-XBT_PUBLIC(val_t) PJ_value_new (const char *name, const char *color, type_t father);
-XBT_PUBLIC(val_t) PJ_value_get_or_new (const char *name, const char *color, type_t father);
-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 XBT_PRIVATE void PJ_type_free (type_t type);
+
+/* instr_config.c */
+XBT_PRIVATE void recursiveDestroyType (type_t type);
+
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 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);
-} s_instr_trace_writer_t;
-
struct s_instr_extra_data;
typedef struct s_instr_extra_data *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()
+void DefineContainerEvent(type_t type);
+void LogVariableTypeDefinition(type_t type);
+void LogStateTypeDefinition(type_t type);
+void LogLinkTypeDefinition(type_t type, type_t source, type_t dest);
+void LogEntityValue(value* val);
+void LogContainerCreation (container_t container);
+void LogContainerDestruction (container_t container);
+void LogDefineEventType(type_t type);
+
#endif
