#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 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
+ s_type (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father);
};
-typedef s_type s_type_t;
-
//--------------------------------------------------
-class value {
+class value : public ess_type{
public:
- char *id;
- char *name;
- char *color;
type_t father;
value* ret;
value(const char* name, const char* color, type_t father);
s_container *father;
xbt_dict_t children;
};
-typedef s_container s_container_t;
//--------------------------------------------------
class PajeEvent {
};
-
-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_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 ();