#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()
typedef s_type s_type_t;
//--------------------------------------------------
-class s_val;
-typedef s_val *val_t;
-
-class s_val {
- public:
+class value {
+public:
char *id;
char *name;
char *color;
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 */
//--------------------------------------------------
-class DefineVariableTypeEvent : public PajeEvent
+class DefineVariableTypeEvent : public PajeEvent
{
public:
type_t type;
void print() override;
};
-class DefineEventTypeEvent : public PajeEvent {
- type_t type;
- public:
- DefineEventTypeEvent(type_t type);
- void print() override;
-};
-
-class DefineLinkTypeEvent : public PajeEvent {
- type_t type;
- type_t source;
- type_t dest;
- public:
- DefineLinkTypeEvent(type_t type, type_t source, type_t dest);
- void print() override;
-};
-
-class DefineEntityValueEvent : public PajeEvent {
- val_t value;
- public:
- DefineEntityValueEvent (val_t type);
- void print() override;
-};
-
-class CreateContainerEvent : public PajeEvent {
- public:
- container_t container;
- explicit CreateContainerEvent (container_t container);
- void print() override;
-};
-
-class DestroyContainerEvent : public PajeEvent {
- public:
- container_t container;
- DestroyContainerEvent (container_t container);
- void print() override;
-};
-
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;
+ double value;
public:
SubVariableEvent(double timestamp, container_t container, type_t type, double value);
void print() override;
//--------------------------------------------------
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;
};
-
-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 ();
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_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);
+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);
+/* 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 print_NULL (PajeEvent* 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);
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