a few more simplifications

[simgrid.git] / src / instr / instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index f86eb05..03995c7 100644 (file)
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -61,24 +61,25 @@ StateType::~StateType()
   events_.clear();
 }
 
-void StateType::setEvent(double timestamp, Container* container, std::string value_name)
+void StateType::setEvent(std::string value_name)
 {
-  events_.push_back(new StateEvent(timestamp, container, this, PAJE_SetState, getEntityValue(value_name)));
+  events_.push_back(new StateEvent(SIMIX_get_clock(), issuer_, this, PAJE_SetState, getEntityValue(value_name)));
 }
 
-void StateType::pushEvent(double timestamp, Container* container, std::string value_name, void* extra)
+void StateType::pushEvent(std::string value_name, void* extra)
 {
-  events_.push_back(new StateEvent(timestamp, container, this, PAJE_PushState, getEntityValue(value_name), extra));
+  events_.push_back(
+      new StateEvent(SIMIX_get_clock(), issuer_, this, PAJE_PushState, getEntityValue(value_name), extra));
 }
 
-void StateType::pushEvent(double timestamp, Container* container, std::string value_name)
+void StateType::pushEvent(std::string value_name)
 {
-  events_.push_back(new StateEvent(timestamp, container, this, PAJE_PushState, getEntityValue(value_name)));
+  events_.push_back(new StateEvent(SIMIX_get_clock(), issuer_, this, PAJE_PushState, getEntityValue(value_name)));
 }
 
-void StateType::popEvent(double timestamp, Container* container)
+void StateType::popEvent()
 {
-  events_.push_back(new StateEvent(timestamp, container, this, PAJE_PopState, nullptr));
+  events_.push_back(new StateEvent(SIMIX_get_clock(), issuer_, this, PAJE_PopState, nullptr));
 }
 
 VariableType::VariableType(std::string name, std::string color, Type* father) : Type(name, name, color, father)
@@ -87,9 +88,43 @@ VariableType::VariableType(std::string name, std::string color, Type* father) :
   logDefinition(PAJE_DefineVariableType);
 }
 
+VariableType::~VariableType()
+{
+  events_.clear();
+}
+
+void VariableType::setEvent(double timestamp, Container* container, double value)
+{
+  events_.push_back(new VariableEvent(timestamp, container, this, PAJE_SetVariable, value));
+}
+
+void VariableType::addEvent(double timestamp, Container* container, double value)
+{
+  events_.push_back(new VariableEvent(timestamp, container, this, PAJE_AddVariable, value));
+}
+
+void VariableType::subEvent(double timestamp, Container* container, double value)
+{
+  events_.push_back(new VariableEvent(timestamp, container, this, PAJE_SubVariable, value));
+}
+
 LinkType::LinkType(std::string name, std::string alias, Type* father) : ValueType(name, alias, father)
 {
 }
+void LinkType::startEvent(Container* container, container_t endpoint, std::string value, std::string key)
+{
+  startEvent(container, endpoint, value, key, -1);
+}
+
+void LinkType::startEvent(Container* container, container_t endpoint, std::string value, std::string key, int size)
+{
+  new LinkEvent(SIMIX_get_clock(), container, this, PAJE_StartLink, endpoint, value, key, size);
+}
+
+void LinkType::endEvent(Container* container, container_t endpoint, std::string value, std::string key)
+{
+  new LinkEvent(SIMIX_get_clock(), container, this, PAJE_EndLink, endpoint, value, key);
+}
 
 void Type::logDefinition(e_event_type event_type)
 {
@@ -166,7 +201,7 @@ EntityValue* ValueType::getEntityValue(std::string name)
 
 ContainerType* Type::createRootType()
 {
-  rootType = static_cast<ContainerType*>(new simgrid::instr::Type("0", "0", "", nullptr));
+  rootType = new ContainerType("0");
   return rootType;
 }