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
allgather was forgotten in ti tracing. fix this
[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
c63641c
..
cd2a3ce
100644
(file)
--- a/
src/instr/instr_paje_trace.cpp
+++ b/
src/instr/instr_paje_trace.cpp
@@
-154,20
+154,6
@@
PajeEvent:: ~PajeEvent()
{
XBT_DEBUG("%s not implemented for %p: event_type=%d, timestamp=%f", __FUNCTION__,
this, (int)event_type, timestamp);
-// xbt_backtrace_display_current();
-
- /* switch (event->event_type){
- case PAJE_StartLink:
- xbt_free (((startLink_t)(event->data))->value);
- xbt_free (((startLink_t)(event->data))->key);
- break;
- case PAJE_EndLink:
- xbt_free (((endLink_t)(event->data))->value);
- xbt_free (((endLink_t)(event->data))->key);
- break;
- default:
- break;
- }*/
}
void TRACE_paje_start() {
@@
-298,16
+284,16
@@
if (instr_fmt_type == instr_fmt_paje) {
}
}
-void LogEntityValue
(val_t value
)
+void LogEntityValue
(value* val
)
{
XBT_DEBUG("%s: event_type=%d", __FUNCTION__, PAJE_DefineEntityValue);
//print it
if (instr_fmt_type == instr_fmt_paje) {
stream << std::fixed << std::setprecision(TRACE_precision());
stream << PAJE_DefineEntityValue;
- stream << " " << val
ue->id << " " << value->father->id << " " << value
->name;
- if (val
ue
->color)
- stream << " \"" << val
ue
->color << "\"";
+ stream << " " << val
->id << " " << val->father->id << " " << val
->name;
+ if (val->color)
+ stream << " \"" << val->color << "\"";
print_row();
} else if (instr_fmt_type == instr_fmt_TI) {
/* Nothing to do */
@@
-481,13
+467,13
@@
void SubVariableEvent::print() {
}
}
-SetStateEvent::SetStateEvent
(double timestamp, container_t container, type_t type, val_t value
)
+SetStateEvent::SetStateEvent
(double timestamp, container_t container, type_t type, value* val
)
{
this->event_type = PAJE_SetState;
this->timestamp = timestamp;
this->type = type;
this->container = container;
- this->val
ue = value
;
+ this->val
= val
;
#if HAVE_SMPI
if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
@@
-509,7
+495,7
@@
void SetStateEvent::print() {
stream << (int)this->event_type;
print_timestamp(this);
stream << " " << type->id << " " << container->id;
- stream << " " << val
ue
->id;
+ stream << " " << val->id;
#if HAVE_SMPI
if (xbt_cfg_get_boolean("smpi/trace-call-location")) {
stream << " \"" << filename << "\" " << linenumber;
@@
-523,13
+509,13
@@
void SetStateEvent::print() {
}
}
-PushStateEvent::PushStateEvent
(double timestamp, container_t container, type_t type, val_t value
, void* extra)
+PushStateEvent::PushStateEvent
(double timestamp, container_t container, type_t type, value* val
, void* extra)
{
this->event_type = PAJE_PushState;
this->timestamp = timestamp;
this->type = type;
this->container = container;
- this->val
ue = value
;
+ this->val
= val
;
this->extra_ = extra;
#if HAVE_SMPI
@@
-545,8
+531,8
@@
PushStateEvent::PushStateEvent (double timestamp, container_t container, type_t
insert_into_buffer (this);
}
-PushStateEvent::PushStateEvent
(double timestamp, container_t container, type_t type, val_t value
)
-
: PushStateEvent(timestamp, container, type, value
, nullptr)
+PushStateEvent::PushStateEvent
(double timestamp, container_t container, type_t type, value* val
)
+
: PushStateEvent(timestamp, container, type, val
, nullptr)
{}
void PushStateEvent::print() {
if (instr_fmt_type == instr_fmt_paje) {
@@
-555,7
+541,7
@@
void PushStateEvent::print() {
stream << (int)this->event_type;
print_timestamp(this);
stream << " " << type->id << " " << container->id;
- stream << " " << val
ue
->id;
+ stream << " " << val->id;
if (TRACE_display_sizes()) {
stream << " ";
@@
-681,11
+667,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;
+ 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_ALLGATHER:
case TRACING_SCAN:
case TRACING_EXSCAN:
case TRACING_COMM_SIZE:
@@
-694,7
+682,7
@@
void PushStateEvent::print() {
case TRACING_SSEND:
case TRACING_ISSEND:
default:
- XBT_WARN("Call from %s impossible to translate into replay command : Not implemented (yet)", val
ue
->name);
+ XBT_WARN("Call from %s impossible to translate into replay command : Not implemented (yet)", val->name);
break;
}
@@
-851,13
+839,13
@@
void EndLinkEvent::print() {
}
}
-NewEvent::NewEvent
(double timestamp, container_t container, type_t type, val_t value
)
+NewEvent::NewEvent
(double timestamp, container_t container, type_t type, value* val
)
{
this->event_type = PAJE_NewEvent;
this->timestamp = timestamp;
this->type = type;
this->container = container;
- this->val
ue = value
;
+ this->val
= val
;
XBT_DEBUG("%s: event_type=%d, timestamp=%f", __FUNCTION__, (int)event_type, this->timestamp);
@@
-870,7
+858,7
@@
void NewEvent::print () {
stream << std::fixed << std::setprecision(TRACE_precision());
stream << (int)this->event_type;
print_timestamp(this);
- stream << " " << type->id << " " << container->id << " " << val
ue
->id;
+ stream << " " << type->id << " " << container->id << " " << val->id;
print_row();
} else if (instr_fmt_type == instr_fmt_TI) {
/* Nothing to do */