#include "simgrid_config.h"
#include "src/internal_config.h"
#include <set>
-
-SG_BEGIN_DECL()
+#include <string>
/* Need to define function drand48 for Windows */
/* FIXME: use _drand48() defined in src/surf/random_mgr.c instead */
class Type {
public:
- char *id;
- char *name;
- char *color;
-
- e_entity_types kind;
- Type *father;
- xbt_dict_t children;
- xbt_dict_t values; //valid for all types except variable and container
+ char* id_;
+ char* name_;
+ char* color_;
+
+ e_entity_types kind_;
+ 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* father);
- static Type* getOrNull(const char* name, Type* father);
+ ~Type();
+ Type* getChild(const char* name);
+ Type* getChildOrNull(const char* name);
+
static Type* containerNew(const char* name, Type* father);
static Type* eventNew(const char* name, Type* father);
static Type* variableNew(const char* name, const char* color, Type* father);
//--------------------------------------------------
class Value {
public:
- char* id;
- char* name;
- char* color;
+ char* id_;
+ char* name_;
+ char* color_;
- Type* father;
- Value* ret;
+ Type* father_;
Value(const char* name, const char* color, Type* father);
~Value();
static Value* get_or_new(const char* name, const char* color, Type* father);
//--------------------------------------------------
-class s_container {
- public:
- sg_netpoint_t netpoint;
- char *name; /* Unique name of this container */
- char *id; /* Unique id of this container */
- Type* type; /* Type of this container */
- int level; /* Level in the hierarchy, root level is 0 */
- e_container_types kind; /* This container is of what kind */
- s_container *father;
- xbt_dict_t children;
+class Container {
+public:
+ Container(const char* name, simgrid::instr::e_container_types kind, Container* father);
+ virtual ~Container();
+
+ sg_netpoint_t netpoint_;
+ char* name_; /* Unique name of this container */
+ char* id_; /* Unique id of this container */
+ Type* type_; /* Type of this container */
+ int level_ = 0; /* Level in the hierarchy, root level is 0 */
+ e_container_types kind_; /* This container is of what kind */
+ Container* father_;
+ xbt_dict_t children_;
};
//--------------------------------------------------
class PajeEvent {
public:
- double timestamp;
- e_event_type event_type;
- virtual void print() = 0;
- void *data;
- virtual ~PajeEvent();
+ double timestamp_;
+ e_event_type eventType_;
+ virtual void print() = 0;
+ virtual ~PajeEvent();
};
//--------------------------------------------------
-
-class DefineVariableTypeEvent : public PajeEvent
-{
- public:
- Type* type;
- DefineVariableTypeEvent(Type* type);
- void print() override;
-};
-//--------------------------------------------------
-
-class DefineStateTypeEvent : public PajeEvent {
- Type* type;
-
-public:
- DefineStateTypeEvent(Type* type);
- void print() override;
-};
-
-
class SetVariableEvent : public PajeEvent {
private:
- s_container* container;
+ Container* container;
Type* type;
double value;
public:
- SetVariableEvent(double timestamp, s_container* container, Type* type, double value);
+ SetVariableEvent(double timestamp, Container* container, Type* type, double value);
void print() override;
};
-
class AddVariableEvent:public PajeEvent {
private:
- s_container* container;
+ Container* container;
Type* type;
double value;
public:
- AddVariableEvent(double timestamp, s_container* container, Type* type, double value);
+ AddVariableEvent(double timestamp, Container* container, Type* type, double value);
void print() override;
};
-
//--------------------------------------------------
class SubVariableEvent : public PajeEvent {
private:
- s_container* container;
+ Container* container;
Type* type;
double value;
public:
- SubVariableEvent(double timestamp, s_container* container, Type* type, double value);
+ SubVariableEvent(double timestamp, Container* container, Type* type, double value);
void print() override;
};
//--------------------------------------------------
class SetStateEvent : public PajeEvent {
private:
- s_container* container;
+ Container* container;
Type* type;
Value* val;
const char* filename;
int linenumber;
public:
- SetStateEvent(double timestamp, s_container* container, Type* type, Value* val);
+ SetStateEvent(double timestamp, Container* container, Type* type, Value* val);
void print() override;
};
class PushStateEvent : public PajeEvent {
public:
- s_container* container;
+ Container* container;
Type* type;
Value* val;
int size;
void* extra_;
public:
- PushStateEvent(double timestamp, s_container* container, Type* type, Value* val);
- PushStateEvent(double timestamp, s_container* container, Type* type, Value* val, void* extra);
+ PushStateEvent(double timestamp, Container* container, Type* type, Value* val);
+ PushStateEvent(double timestamp, Container* container, Type* type, Value* val, void* extra);
void print() override;
};
class PopStateEvent : public PajeEvent {
- s_container* container;
+ Container* container;
Type* type;
public:
- PopStateEvent(double timestamp, s_container* container, Type* type);
+ PopStateEvent(double timestamp, Container* container, Type* type);
void print() override;
};
class ResetStateEvent : public PajeEvent {
- s_container* container;
+ Container* container;
Type* type;
public:
- ResetStateEvent(double timestamp, s_container* container, Type* type);
+ ResetStateEvent(double timestamp, Container* container, Type* type);
void print() override;
};
class StartLinkEvent : public PajeEvent {
- public:
- s_container* container;
- Type* type;
- s_container* sourceContainer;
- char* value;
- char* key;
- int size;
+ Container* container_;
+ Type* type_;
+ Container* sourceContainer_;
+ std::string value_;
+ std::string key_;
+ int size_;
- public:
- ~StartLinkEvent();
- StartLinkEvent(double timestamp, s_container* container, Type* type, s_container* sourceContainer,
- const char* value, const char* key);
- StartLinkEvent(double timestamp, s_container* container, Type* type, s_container* sourceContainer,
- const char* value, const char* key, int size);
- void print() override;
+public:
+ StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value,
+ const char* key);
+ StartLinkEvent(double timestamp, Container* container, Type* type, Container* sourceContainer, const char* value,
+ const char* key, int size);
+ void print() override;
};
class EndLinkEvent : public PajeEvent {
- s_container* container;
+ Container* container;
Type* type;
- s_container* destContainer;
+ Container* destContainer;
char *value;
char *key;
public:
- EndLinkEvent(double timestamp, s_container* container, Type* type, s_container* destContainer, const char* value,
+ EndLinkEvent(double timestamp, Container* container, Type* type, Container* destContainer, const char* value,
const char* key);
~EndLinkEvent();
void print() override;
class NewEvent : public PajeEvent {
public:
- s_container* container;
+ Container* container;
Type* type;
Value* val;
public:
- NewEvent(double timestamp, s_container* container, Type* type, Value* val);
+ NewEvent(double timestamp, Container* container, Type* type, Value* val);
void print() override;
};
}
} // namespace simgrid::instr
-typedef simgrid::instr::s_container* container_t;
+typedef simgrid::instr::Container* container_t;
+
+SG_BEGIN_DECL()
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> 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(container_t) PJ_container_new(const char* name, simgrid::instr::e_container_types kind, container_t father);
XBT_PUBLIC(container_t) PJ_container_get (const char *name);
-XBT_PUBLIC(container_t) PJ_container_get_or_null (const char *name);
+XBT_PUBLIC(simgrid::instr::Container*) PJ_container_get_or_null(const char* name);
XBT_PUBLIC(container_t) PJ_container_get_root ();
XBT_PUBLIC(void) PJ_container_set_root (container_t root);
-XBT_PUBLIC(void) PJ_container_free (container_t container);
XBT_PUBLIC(void) PJ_container_free_all (void);
XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container);
/* instr_paje_types.c */
-XBT_PRIVATE void PJ_type_release ();
XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get_root();
-XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get(const char* name, simgrid::instr::Type* father);
-XBT_PRIVATE XBT_PRIVATE void PJ_type_free(simgrid::instr::Type* type);
/* instr_config.c */
-XBT_PRIVATE void recursiveDestroyType(simgrid::instr::Type* type);
-
XBT_PRIVATE void TRACE_TI_start();
XBT_PRIVATE void TRACE_TI_end();
SG_END_DECL()
-void DefineContainerEvent(simgrid::instr::Type* type);
+void LogContainerTypeDefinition(simgrid::instr::Type* type);
void LogVariableTypeDefinition(simgrid::instr::Type* type);
void LogStateTypeDefinition(simgrid::instr::Type* type);
void LogLinkTypeDefinition(simgrid::instr::Type* type, simgrid::instr::Type* source, simgrid::instr::Type* dest);
