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
kill a C type now that we have a class
[simgrid.git]
/
src
/
instr
/
instr_paje_trace.cpp
diff --git
a/src/instr/instr_paje_trace.cpp
b/src/instr/instr_paje_trace.cpp
index
c7c4f7c
..
84c6059
100644
(file)
--- a/
src/instr/instr_paje_trace.cpp
+++ b/
src/instr/instr_paje_trace.cpp
@@
-68,14
+68,14
@@
void TRACE_paje_dump_buffer (int force)
return;
XBT_DEBUG("%s: dump until %f. starts", __FUNCTION__, TRACE_last_timestamp_to_dump);
if (force){
return;
XBT_DEBUG("%s: dump until %f. starts", __FUNCTION__, TRACE_last_timestamp_to_dump);
if (force){
- for (auto
event : buffer)
{
+ for (auto
const& event : buffer)
{
event->print();
delete event;
}
buffer.clear();
}else{
std::vector<PajeEvent*>::iterator i = buffer.begin();
event->print();
delete event;
}
buffer.clear();
}else{
std::vector<PajeEvent*>::iterator i = buffer.begin();
- for (auto
event :buffer)
{
+ for (auto
const& event : buffer)
{
double head_timestamp = event->timestamp;
if (head_timestamp > TRACE_last_timestamp_to_dump)
break;
double head_timestamp = event->timestamp;
if (head_timestamp > TRACE_last_timestamp_to_dump)
break;
@@
-92,7
+92,7
@@
void buffer_debug(std::vector<PajeEvent*> *buf);
void buffer_debug(std::vector<PajeEvent*> *buf) {
return;
XBT_DEBUG(">>>>>> Dump the state of the buffer. %zu events", buf->size());
void buffer_debug(std::vector<PajeEvent*> *buf) {
return;
XBT_DEBUG(">>>>>> Dump the state of the buffer. %zu events", buf->size());
- for (auto
event :*buf)
{
+ for (auto
const& event : *buf)
{
event->print();
XBT_DEBUG("%p %s", event, stream.str().c_str());
stream.str("");
event->print();
XBT_DEBUG("%p %s", event, stream.str().c_str());
stream.str("");
@@
-192,7
+192,7
@@
void TRACE_paje_end() {
XBT_DEBUG("Filename %s is closed", filename);
}
XBT_DEBUG("Filename %s is closed", filename);
}
-void DefineContainerEvent(
type_t
type)
+void DefineContainerEvent(
Type*
type)
{
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineContainerType);
//print it
{
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineContainerType);
//print it
@@
-210,9
+210,7
@@
void DefineContainerEvent(type_t type)
//--
}
//--
}
-
-
-void LogVariableTypeDefinition(type_t type)
+void LogVariableTypeDefinition(Type* type)
{
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineVariableType);
{
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineVariableType);
@@
-233,8
+231,7
@@
if (instr_fmt_type == instr_fmt_paje) {
}
}
}
}
-
-void LogStateTypeDefinition(type_t type)
+void LogStateTypeDefinition(Type* type)
{
//print it
if (instr_fmt_type == instr_fmt_paje) {
{
//print it
if (instr_fmt_type == instr_fmt_paje) {
@@
-250,8
+247,7
@@
if (instr_fmt_type == instr_fmt_paje) {
}
}
}
}
-
-void LogDefineEventType(type_t type)
+void LogDefineEventType(Type* type)
{
//print it
if (instr_fmt_type == instr_fmt_paje) {
{
//print it
if (instr_fmt_type == instr_fmt_paje) {
@@
-267,7
+263,7
@@
void LogDefineEventType(type_t type)
}
}
}
}
-void LogLinkTypeDefinition(
type_t type, type_t source, type_t
dest)
+void LogLinkTypeDefinition(
Type* type, Type* source, Type*
dest)
{
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineLinkType);
//print it
{
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineLinkType);
//print it
@@
-284,7
+280,7
@@
if (instr_fmt_type == instr_fmt_paje) {
}
}
}
}
-void LogEntityValue(
v
alue* val)
+void LogEntityValue(
V
alue* val)
{
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineEntityValue);
//print it
{
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineEntityValue);
//print it
@@
-383,7
+379,7
@@
if (instr_fmt_type == instr_fmt_paje) {
}
}
-SetVariableEvent::SetVariableEvent (double timestamp, container_t container,
type_t
type, double value)
+SetVariableEvent::SetVariableEvent (double timestamp, container_t container,
Type*
type, double value)
{
this->event_type = PAJE_SetVariable;
this->timestamp = timestamp;
{
this->event_type = PAJE_SetVariable;
this->timestamp = timestamp;
@@
-411,7
+407,7
@@
void SetVariableEvent::print() {
}
}
}
}
-AddVariableEvent::AddVariableEvent (double timestamp, container_t container,
type_t
type, double value)
+AddVariableEvent::AddVariableEvent (double timestamp, container_t container,
Type*
type, double value)
{
this->event_type = PAJE_AddVariable;
this->timestamp = timestamp;
{
this->event_type = PAJE_AddVariable;
this->timestamp = timestamp;
@@
-439,7
+435,7
@@
void AddVariableEvent::print() {
}
}
}
}
-SubVariableEvent::SubVariableEvent (double timestamp, container_t container,
type_t
type, double value)
+SubVariableEvent::SubVariableEvent (double timestamp, container_t container,
Type*
type, double value)
{
this->event_type = PAJE_SubVariable;
this->timestamp = timestamp;
{
this->event_type = PAJE_SubVariable;
this->timestamp = timestamp;
@@
-467,7
+463,7
@@
void SubVariableEvent::print() {
}
}
}
}
-SetStateEvent::SetStateEvent(double timestamp, container_t container,
type_t type, v
alue* val)
+SetStateEvent::SetStateEvent(double timestamp, container_t container,
Type* type, V
alue* val)
{
this->event_type = PAJE_SetState;
this->timestamp = timestamp;
{
this->event_type = PAJE_SetState;
this->timestamp = timestamp;
@@
-509,7
+505,7
@@
void SetStateEvent::print() {
}
}
}
}
-PushStateEvent::PushStateEvent(double timestamp, container_t container,
type_t type, v
alue* val, void* extra)
+PushStateEvent::PushStateEvent(double timestamp, container_t container,
Type* type, V
alue* val, void* extra)
{
this->event_type = PAJE_PushState;
this->timestamp = timestamp;
{
this->event_type = PAJE_PushState;
this->timestamp = timestamp;
@@
-531,7
+527,7
@@
PushStateEvent::PushStateEvent(double timestamp, container_t container, type_t t
insert_into_buffer (this);
}
insert_into_buffer (this);
}
-PushStateEvent::PushStateEvent(double timestamp, container_t container,
type_t type, v
alue* val)
+PushStateEvent::PushStateEvent(double timestamp, container_t container,
Type* type, V
alue* val)
: PushStateEvent(timestamp, container, type, val, nullptr)
{}
void PushStateEvent::print() {
: PushStateEvent(timestamp, container, type, val, nullptr)
{}
void PushStateEvent::print() {
@@
-667,11
+663,13
@@
void PushStateEvent::print() {
fprintf(trace_file, "%d ", extra->recvcounts[i]);
fprintf(trace_file, "%d %s %s\n", extra->root, extra->datatype1, extra->datatype2);
break;
fprintf(trace_file, "%d ", extra->recvcounts[i]);
fprintf(trace_file, "%d %s %s\n", extra->root, extra->datatype1, extra->datatype2);
break;
+ case TRACING_ALLGATHER: // rank allgather sendcount recvcounts (sendtype) (recvtype)
+ fprintf(trace_file, "%s allGather %d %d %s %s", process_id, extra->send_size, extra->recv_size, extra->datatype1, extra->datatype2);
+ break;
case TRACING_WAITANY:
case TRACING_SENDRECV:
case TRACING_SCATTER:
case TRACING_SCATTERV:
case TRACING_WAITANY:
case TRACING_SENDRECV:
case TRACING_SCATTER:
case TRACING_SCATTERV:
- case TRACING_ALLGATHER:
case TRACING_SCAN:
case TRACING_EXSCAN:
case TRACING_COMM_SIZE:
case TRACING_SCAN:
case TRACING_EXSCAN:
case TRACING_COMM_SIZE:
@@
-697,7
+695,7
@@
void PushStateEvent::print() {
}
}
-PopStateEvent::PopStateEvent (double timestamp, container_t container,
type_t
type)
+PopStateEvent::PopStateEvent (double timestamp, container_t container,
Type*
type)
{
this->event_type = PAJE_PopState;
this->timestamp = timestamp;
{
this->event_type = PAJE_PopState;
this->timestamp = timestamp;
@@
-724,7
+722,7
@@
void PopStateEvent::print() {
}
}
}
}
-ResetStateEvent::ResetStateEvent (double timestamp, container_t container,
type_t
type)
+ResetStateEvent::ResetStateEvent (double timestamp, container_t container,
Type*
type)
{
this->event_type = PAJE_ResetState;
this->timestamp = timestamp;
{
this->event_type = PAJE_ResetState;
this->timestamp = timestamp;
@@
-758,11
+756,11
@@
StartLinkEvent::~StartLinkEvent()
free(key);
}
StartLinkEvent::StartLinkEvent (double timestamp, container_t container,
free(key);
}
StartLinkEvent::StartLinkEvent (double timestamp, container_t container,
-
type_t
type, container_t sourceContainer, const char *value, const char *key)
+
Type*
type, container_t sourceContainer, const char *value, const char *key)
: StartLinkEvent(timestamp, container, type, sourceContainer, value, key, -1)
{}
: StartLinkEvent(timestamp, container, type, sourceContainer, value, key, -1)
{}
-StartLinkEvent::StartLinkEvent (double timestamp, container_t container,
type_t
type, container_t sourceContainer,
+StartLinkEvent::StartLinkEvent (double timestamp, container_t container,
Type*
type, container_t sourceContainer,
const char *value, const char *key, int size)
{
event_type = PAJE_StartLink;
const char *value, const char *key, int size)
{
event_type = PAJE_StartLink;
@@
-800,7
+798,7
@@
void StartLinkEvent::print() {
}
}
}
}
-EndLinkEvent::EndLinkEvent (double timestamp, container_t container,
type_t
type, container_t destContainer,
+EndLinkEvent::EndLinkEvent (double timestamp, container_t container,
Type*
type, container_t destContainer,
const char *value, const char *key)
{
this->event_type = PAJE_EndLink;
const char *value, const char *key)
{
this->event_type = PAJE_EndLink;
@@
-837,7
+835,7
@@
void EndLinkEvent::print() {
}
}
}
}
-NewEvent::NewEvent(double timestamp, container_t container,
type_t type, v
alue* val)
+NewEvent::NewEvent(double timestamp, container_t container,
Type* type, V
alue* val)
{
this->event_type = PAJE_NewEvent;
this->timestamp = timestamp;
{
this->event_type = PAJE_NewEvent;
this->timestamp = timestamp;