#include "simgrid/instr.h"
#include "simgrid_config.h"
#include "src/internal_config.h"
+#include <map>
#include <set>
+#include <string>
/* Need to define function drand48 for Windows */
/* FIXME: use _drand48() defined in src/surf/random_mgr.c instead */
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);
~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 Container {
public:
- Container(const char* name, simgrid::instr::e_container_types kind, Container* father);
+ Container(std::string 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 */
+ std::string name_; /* Unique name of this container */
+ std::string 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_;
+ std::map<std::string, Container*> children_;
};
//--------------------------------------------------
private:
Container* container;
Type* type;
- Value* val;
+ Value* value;
const char* filename;
int linenumber;
public:
Container* container;
Type* type;
- Value* val;
+ Value* value;
int size;
const char* filename;
int linenumber;
};
class StartLinkEvent : public PajeEvent {
- public:
- Container* container;
- Type* type;
- 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, 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;
+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 {
Container* container;
Type* type;
Container* destContainer;
- char *value;
- char *key;
- public:
- EndLinkEvent(double timestamp, Container* container, Type* type, Container* destContainer, const char* value,
- const char* key);
- ~EndLinkEvent();
- void print() override;
+ std::string value;
+ std::string key;
+
+public:
+ EndLinkEvent(double timestamp, Container* container, Type* type, Container* destContainer, std::string value,
+ std::string key);
+ ~EndLinkEvent() = default;
+ void print() override;
};
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);
/* instr_config.c */
XBT_PRIVATE void TRACE_TI_start();