#include "simgrid/instr.h"
#include "simgrid_config.h"
#include "src/internal_config.h"
+#include "xbt/graph.h"
+#include <iomanip> /** std::setprecision **/
#include <map>
#include <set>
+#include <sstream>
#include <string>
-
+#include <sys/stat.h>
+#ifdef WIN32
+#include <direct.h> // _mkdir
/* Need to define function drand48 for Windows */
/* FIXME: use _drand48() defined in src/surf/random_mgr.c instead */
-#ifdef _WIN32
#define drand48() (rand() / (RAND_MAX + 1.0))
#endif
#define INSTR_DEFAULT_STR_SIZE 500
-#include "xbt/dict.h"
-#include "xbt/graph.h"
-
namespace simgrid {
namespace instr {
PAJE_NewEvent
};
-enum e_entity_types { TYPE_VARIABLE, TYPE_LINK, TYPE_CONTAINER, TYPE_STATE, TYPE_EVENT };
-
//--------------------------------------------------
+enum e_entity_types { TYPE_VARIABLE, TYPE_LINK, TYPE_CONTAINER, TYPE_STATE, TYPE_EVENT };
class Type {
-public:
- char* id_;
- char* name_;
+ std::string id_;
+ std::string name_;
std::string color_;
-
e_entity_types kind_;
Type* father_;
- xbt_dict_t children_;
+
+public:
+ std::map<std::string, Type*> children_;
std::map<std::string, Value*> values_; // valid for all types except variable and container
- Type(const char* typeNameBuff, const char* key, std::string color, e_entity_types kind, Type* father);
+
+ Type(std::string name, std::string alias, std::string 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, std::string color, Type* father);
- static Type* linkNew(const char* name, Type* father, Type* source, Type* dest);
- static Type* stateNew(const char* name, Type* father);
+
+ std::string getName() { return name_; }
+ const char* getCname() { return name_.c_str(); }
+ const char* getId() { return id_.c_str(); }
+ e_entity_types getKind() { return kind_; }
bool isColored() { return not color_.empty(); }
+
+ Type* byName(std::string name);
+
+ Type* getOrCreateContainerType(std::string name);
+ Type* getOrCreateEventType(std::string name);
+ Type* getOrCreateLinkType(std::string name, Type* source, Type* dest);
+ Type* getOrCreateStateType(std::string name);
+ Type* getOrCreateVariableType(std::string name, std::string color);
+
+ void logContainerTypeDefinition();
+ void logVariableTypeDefinition();
+ void logStateTypeDefinition();
+ void logLinkTypeDefinition(simgrid::instr::Type* source, simgrid::instr::Type* dest);
+ void logDefineEventType();
+
+ static Type* createRootType();
+ static Type* getRootType();
};
//--------------------------------------------------
class Value {
-private:
std::string name_;
std::string id_;
std::string color_;
+ Type* father_;
explicit Value(std::string name, std::string color, Type* father);
public:
- ~Value() = default;
- Type* father_;
+ ~Value();
static Value* byNameOrCreate(std::string name, std::string color, Type* father);
static Value* byName(std::string name, Type* father);
const char* getCname() { return name_.c_str(); }
INSTR_MSG_TASK
};
-//--------------------------------------------------
-
class Container {
+ e_container_types kind_; /* This container is of what kind */
+ int level_ = 0; /* Level in the hierarchy, root level is 0 */
+ sg_netpoint_t netpoint_ = nullptr;
+
public:
Container(std::string name, simgrid::instr::e_container_types kind, Container* father);
virtual ~Container();
- sg_netpoint_t netpoint_;
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_;
std::map<std::string, Container*> children_;
- static simgrid::instr::Container* byNameOrNull(std::string name);
- static simgrid::instr::Container* byName(std::string name);
+ static Container* byNameOrNull(std::string name);
+ static Container* byName(std::string name);
+ void removeFromParent();
+ void logCreation();
+ void logDestruction();
};
//--------------------------------------------------
extern XBT_PRIVATE double TRACE_last_timestamp_to_dump;
/* instr_paje_header.c */
-XBT_PRIVATE void TRACE_header(int basic, int size);
+XBT_PRIVATE void TRACE_header(bool basic, int size);
/* from paje.c */
XBT_PRIVATE void TRACE_paje_start();
XBT_PRIVATE void TRACE_paje_end();
-XBT_PRIVATE void TRACE_paje_dump_buffer(int force);
/* from instr_config.c */
XBT_PRIVATE bool TRACE_needs_platform();
XBT_PRIVATE long long int instr_new_paje_id();
XBT_PUBLIC(container_t) PJ_container_get_root ();
XBT_PUBLIC(void) PJ_container_set_root (container_t root);
-XBT_PUBLIC(void) PJ_container_remove_from_parent (container_t container);
-
-/* instr_paje_types.c */
-XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get_root();
/* instr_config.c */
XBT_PRIVATE void TRACE_TI_start();
XBT_PRIVATE void TRACE_TI_end();
-XBT_PRIVATE void TRACE_paje_dump_buffer(int force);
+XBT_PRIVATE void TRACE_paje_dump_buffer(bool force);
XBT_PRIVATE void dump_comment_file(const char* filename);
XBT_PRIVATE void dump_comment(const char* comment);
extern instr_fmt_type_t instr_fmt_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);
-void LogContainerCreation(container_t container);
-void LogContainerDestruction(container_t container);
-void LogDefineEventType(simgrid::instr::Type* type);
-
#endif
