} 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 s_type;
+typedef s_type *type_t;
+class s_type : public ess_type {
+ public:
e_entity_types kind;
s_type *father;
xbt_dict_t children;
xbt_dict_t values; //valid for all types except variable and container
};
-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 {
s_container *father;
xbt_dict_t children;
};
-typedef s_container s_container_t;
//--------------------------------------------------
class PajeEvent {
class SetVariableEvent : public PajeEvent {
+ private:
container_t container;
type_t type;
double value;
class AddVariableEvent:public PajeEvent {
+ private:
container_t container;
type_t type;
double value;
class SubVariableEvent : public PajeEvent {
- public:
+ private:
container_t container;
type_t type;
double value;
//--------------------------------------------------
class SetStateEvent : public PajeEvent {
- public:
+ 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, val_t value);
- void print() override;
+ SetStateEvent(double timestamp, container_t container, type_t type, value* val);
+ void print() override;
};
public:
container_t container;
type_t type;
- val_t value;
+ value* val;
int size;
const char* filename;
int linenumber;
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,
- void* extra);
- void print() override;
+ 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;
};
class PopStateEvent : public PajeEvent {
public:
container_t container;
type_t type;
- val_t value;
- public:
- NewEvent (double timestamp, container_t container, type_t type, val_t value);
+ value* val;
+
+public:
+ NewEvent(double timestamp, container_t container, type_t type, value* val);
void print() override;
};
/* instr_config.c */
XBT_PRIVATE void recursiveDestroyType (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 TRACE_TI_start();
XBT_PRIVATE void TRACE_TI_end();
void LogVariableTypeDefinition(type_t type);
void LogStateTypeDefinition(type_t type);
void LogLinkTypeDefinition(type_t type, type_t source, type_t dest);
-void LogEntityValue (val_t value);
+void LogEntityValue(value* val);
void LogContainerCreation (container_t container);
void LogContainerDestruction (container_t container);
void LogDefineEventType(type_t type);