A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove last occurences of "swag" in src/kernel/.
[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
c842064
..
3f87707
100644
(file)
--- a/
src/instr/instr_paje_types.cpp
+++ b/
src/instr/instr_paje_types.cpp
@@
-8,7
+8,6
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)");
-static simgrid::instr::ContainerType* rootType = nullptr; /* the root type */
extern FILE* tracing_file;
namespace simgrid {
extern FILE* tracing_file;
namespace simgrid {
@@
-61,24
+60,24
@@
StateType::~StateType()
events_.clear();
}
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(
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, TIData
* extra)
{
{
- events_.push_back(new StateEvent(
timestamp, container
, this, PAJE_PushState, getEntityValue(value_name), extra));
+ events_.push_back(new StateEvent(
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(
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(
issuer_
, this, PAJE_PopState, nullptr));
}
VariableType::VariableType(std::string name, std::string color, Type* father) : Type(name, name, color, father)
}
VariableType::VariableType(std::string name, std::string color, Type* father) : Type(name, name, color, father)
@@
-92,40
+91,37
@@
VariableType::~VariableType()
events_.clear();
}
events_.clear();
}
-void VariableType::setEvent(double timestamp,
Container* container,
double value)
+void VariableType::setEvent(double timestamp, double value)
{
{
- events_.push_back(new VariableEvent(timestamp,
container
, this, PAJE_SetVariable, value));
+ events_.push_back(new VariableEvent(timestamp,
issuer_
, this, PAJE_SetVariable, value));
}
}
-void VariableType::addEvent(double timestamp,
Container* container,
double value)
+void VariableType::addEvent(double timestamp, double value)
{
{
- events_.push_back(new VariableEvent(timestamp,
container
, this, PAJE_AddVariable, value));
+ events_.push_back(new VariableEvent(timestamp,
issuer_
, this, PAJE_AddVariable, value));
}
}
-void VariableType::subEvent(double timestamp,
Container* container,
double value)
+void VariableType::subEvent(double timestamp, double value)
{
{
- events_.push_back(new VariableEvent(timestamp,
container
, this, PAJE_SubVariable, value));
+ events_.push_back(new VariableEvent(timestamp,
issuer_
, this, PAJE_SubVariable, value));
}
LinkType::LinkType(std::string name, std::string alias, Type* father) : ValueType(name, alias, father)
{
}
}
LinkType::LinkType(std::string name, std::string alias, Type* father) : ValueType(name, alias, father)
{
}
-void LinkType::startEvent(double timestamp, Container* container, container_t endpoint, std::string value,
- std::string key)
+void LinkType::startEvent(container_t startContainer, std::string value, std::string key)
{
{
- startEvent(
timestamp, container, endpoint
, value, key, -1);
+ startEvent(
startContainer
, value, key, -1);
}
}
-void LinkType::startEvent(double timestamp, Container* container, container_t endpoint, std::string value,
- std::string key, int size)
+void LinkType::startEvent(container_t startContainer, std::string value, std::string key, int size)
{
{
- new LinkEvent(
timestamp, container, this, PAJE_StartLink, endpoint
, value, key, size);
+ new LinkEvent(
issuer_, this, PAJE_StartLink, startContainer
, value, key, size);
}
}
-void LinkType::endEvent(double timestamp, Container* container, container_t endpoint, std::string value,
- std::string key)
+void LinkType::endEvent(container_t endContainer, std::string value, std::string key)
{
{
- new LinkEvent(
timestamp, container, this, PAJE_EndLink, endpoint
, value, key);
+ new LinkEvent(
issuer_, this, PAJE_EndLink, endContainer
, value, key);
}
void Type::logDefinition(e_event_type event_type)
}
void Type::logDefinition(e_event_type event_type)
@@
-201,17
+197,6
@@
EntityValue* ValueType::getEntityValue(std::string name)
return ret->second;
}
return ret->second;
}
-ContainerType* Type::createRootType()
-{
- rootType = new ContainerType("0");
- return rootType;
-}
-
-ContainerType* Type::getRootType()
-{
- return rootType;
-}
-
ContainerType* Type::getOrCreateContainerType(std::string name)
{
auto cont = children_.find(name);
ContainerType* Type::getOrCreateContainerType(std::string name)
{
auto cont = children_.find(name);