X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43bcc7a70e8f2f69fb3563226b55be8483e793f6..5198991bb329c947bd497b66b2d837959ce20ee6:/src/instr/instr_paje_events.cpp diff --git a/src/instr/instr_paje_events.cpp b/src/instr/instr_paje_events.cpp index 44fcd006b4..9719ce57d9 100644 --- a/src/instr/instr_paje_events.cpp +++ b/src/instr/instr_paje_events.cpp @@ -18,19 +18,23 @@ namespace instr { NewEvent::NewEvent(double timestamp, container_t container, Type* type, EntityValue* val) : simgrid::instr::PajeEvent::PajeEvent(container, type, timestamp, PAJE_NewEvent), val(val) { - XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_); + XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, timestamp_); insertIntoBuffer(); } -LinkEvent::LinkEvent(double timestamp, container_t container, Type* type, e_event_type event_type, container_t endpoint, +LinkEvent::LinkEvent(container_t container, Type* type, e_event_type event_type, container_t endpoint, std::string value, std::string key) - : LinkEvent(timestamp, container, type, event_type, endpoint, value, key, -1) + : LinkEvent(container, type, event_type, endpoint, value, key, -1) { } -LinkEvent::LinkEvent(double timestamp, container_t container, Type* type, e_event_type event_type, container_t endpoint, +LinkEvent::LinkEvent(container_t container, Type* type, e_event_type event_type, container_t endpoint, std::string value, std::string key, int size) - : PajeEvent(container, type, timestamp, event_type), endpoint_(endpoint), value_(value), key_(key), size_(size) + : PajeEvent(container, type, SIMIX_get_clock(), event_type) + , endpoint_(endpoint) + , value_(value) + , key_(key) + , size_(size) { XBT_DEBUG("%s: event_type=%u, timestamp=%f, value:%s", __FUNCTION__, eventType_, timestamp_, value_.c_str()); insertIntoBuffer(); @@ -39,18 +43,17 @@ LinkEvent::LinkEvent(double timestamp, container_t container, Type* type, e_even VariableEvent::VariableEvent(double timestamp, Container* container, Type* type, e_event_type event_type, double value) : PajeEvent::PajeEvent(container, type, timestamp, event_type), value(value) { - XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, this->timestamp_); + XBT_DEBUG("%s: event_type=%u, timestamp=%f", __FUNCTION__, eventType_, timestamp_); insertIntoBuffer(); } -StateEvent::StateEvent(double timestamp, Container* container, Type* type, e_event_type event_type, EntityValue* value) - : StateEvent(timestamp, container, type, event_type, value, nullptr) +StateEvent::StateEvent(Container* container, Type* type, e_event_type event_type, EntityValue* value) + : StateEvent(container, type, event_type, value, nullptr) { } -StateEvent::StateEvent(double timestamp, Container* container, Type* type, e_event_type event_type, EntityValue* value, - void* extra) - : PajeEvent::PajeEvent(container, type, timestamp, event_type), value(value), extra_(extra) +StateEvent::StateEvent(Container* container, Type* type, e_event_type event_type, EntityValue* value, TIData* extra) + : PajeEvent::PajeEvent(container, type, SIMIX_get_clock(), event_type), value(value), extra_(extra) { #if HAVE_SMPI if (xbt_cfg_get_boolean("smpi/trace-call-location")) { @@ -73,10 +76,10 @@ void NewEvent::print() return; if (timestamp_ < 1e-12) - stream << eventType_ << " " << 0 << " " << type->getId() << " " << container->getId(); + stream << eventType_ << " " << 0 << " "; else - stream << eventType_ << " " << timestamp_ << " " << type->getId() << " " << container->getId(); - stream << " " << val->getId(); + stream << eventType_ << " " << timestamp_ << " "; + stream << getType()->getId() << " " << getContainer()->getId() << " " << val->getId(); XBT_DEBUG("Dump %s", stream.str().c_str()); fprintf(tracing_file, "%s\n", stream.str().c_str()); } @@ -89,11 +92,11 @@ void LinkEvent::print() if (instr_fmt_type != instr_fmt_paje) return; if (timestamp_ < 1e-12) - stream << eventType_ << " " << 0 << " " << type->getId() << " " << container->getId() << " " << value_; + stream << eventType_ << " " << 0 << " " << getType()->getId() << " " << getContainer()->getId(); else - stream << eventType_ << " " << timestamp_ << " " << type->getId() << " " << container->getId() << " " << value_; + stream << eventType_ << " " << timestamp_ << " " << getType()->getId() << " " << getContainer()->getId(); - stream << " " << endpoint_->getId() << " " << key_; + stream << " " << value_ << " " << endpoint_->getId() << " " << key_; if (TRACE_display_sizes()) { stream << " " << size_; @@ -111,9 +114,10 @@ void VariableEvent::print() return; if (timestamp_ < 1e-12) - stream << eventType_ << " " << 0 << " " << type->getId() << " " << container->getId() << " " << value; + stream << eventType_ << " " << 0 << " "; else - stream << eventType_ << " " << timestamp_ << " " << type->getId() << " " << container->getId() << " " << value; + stream << eventType_ << " " << timestamp_ << " "; + stream << getType()->getId() << " " << getContainer()->getId() << " " << value; XBT_DEBUG("Dump %s", stream.str().c_str()); fprintf(tracing_file, "%s\n", stream.str().c_str()); } @@ -125,21 +129,16 @@ void StateEvent::print() XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __FUNCTION__, eventType_, TRACE_precision(), timestamp_); if (instr_fmt_type == instr_fmt_paje) { if (timestamp_ < 1e-12) - stream << eventType_ << " " << 0 << " " << type->getId() << " " << container->getId(); + stream << eventType_ << " " << 0 << " " << getType()->getId() << " " << getContainer()->getId(); else - stream << eventType_ << " " << timestamp_ << " " << type->getId() << " " << container->getId(); + stream << eventType_ << " " << timestamp_ << " " << getType()->getId() << " " << getContainer()->getId(); if (value != nullptr) // PAJE_PopState Event does not need to have a value stream << " " << value->getId(); - if (TRACE_display_sizes()) { - stream << " "; - if (extra_ != nullptr) { - stream << static_cast(extra_)->send_size; - } else { - stream << 0; - } - } + if (TRACE_display_sizes()) + stream << " " << ((extra_ != nullptr) ? extra_->display_size() : 0); + #if HAVE_SMPI if (xbt_cfg_get_boolean("smpi/trace-call-location")) { stream << " \"" << filename << "\" " << linenumber; @@ -147,134 +146,25 @@ void StateEvent::print() #endif XBT_DEBUG("Dump %s", stream.str().c_str()); fprintf(tracing_file, "%s\n", stream.str().c_str()); - - if (extra_ != nullptr) { - if (static_cast(extra_)->sendcounts != nullptr) - xbt_free(static_cast(extra_)->sendcounts); - if (static_cast(extra_)->recvcounts != nullptr) - xbt_free(static_cast(extra_)->recvcounts); - xbt_free(extra_); - } } else if (instr_fmt_type == instr_fmt_TI) { if (extra_ == nullptr) return; - instr_extra_data extra = (instr_extra_data)extra_; + + /* Unimplemented calls are: WAITANY, SENDRECV, SCAN, EXSCAN, SSEND, and ISSEND. */ // FIXME: dirty extract "rank-" from the name, as we want the bare process id here - if (container->getName().find("rank-") != 0) - stream << container->getName() << " "; + if (getContainer()->getName().find("rank-") != 0) + stream << getContainer()->getName() << " " << extra_->print(); else - stream << container->getName().erase(0, 5) << " "; - - FILE* trace_file = tracing_files.at(container); - - switch (extra->type) { - case TRACING_INIT: - stream << "init"; - break; - case TRACING_FINALIZE: - stream << "finalize"; - break; - case TRACING_SEND: - stream << "send " << extra->dst << " " << extra->send_size << " " << extra->datatype1; - break; - case TRACING_ISEND: - stream << "Isend " << extra->dst << " " << extra->send_size << " " << extra->datatype1; - break; - case TRACING_RECV: - stream << "recv " << extra->src << " " << extra->send_size << " " << extra->datatype1; - break; - case TRACING_IRECV: - stream << "Irecv " << extra->src << " " << extra->send_size << " " << extra->datatype1; - break; - case TRACING_TEST: - stream << "test"; - break; - case TRACING_WAIT: - stream << "wait"; - break; - case TRACING_WAITALL: - stream << "waitAll"; - break; - case TRACING_BARRIER: - stream << "barrier"; - break; - case TRACING_BCAST: // rank bcast size (root) (datatype) - stream << "bcast " << extra->send_size; - if (extra->root != 0 || (extra->datatype1 && strcmp(extra->datatype1, ""))) - stream << " " << extra->root << " " << extra->datatype1; - break; - case TRACING_REDUCE: // rank reduce comm_size comp_size (root) (datatype) - stream << "reduce " << extra->send_size << " " << extra->comp_size; - if (extra->root != 0 || (extra->datatype1 && strcmp(extra->datatype1, ""))) - stream << " " << extra->root << " " << extra->datatype1; - break; - case TRACING_ALLREDUCE: // rank allreduce comm_size comp_size (datatype) - stream << "allReduce " << extra->send_size << " " << extra->comp_size << " " << extra->datatype1; - break; - case TRACING_ALLTOALL: // rank alltoall send_size recv_size (sendtype) (recvtype) - stream << "allToAll " << extra->send_size << " " << extra->recv_size << " " << extra->datatype1 << " "; - stream << extra->datatype2; - break; - case TRACING_ALLTOALLV: // rank alltoallv send_size [sendcounts] recv_size [recvcounts] (sendtype) (recvtype) - stream << "allToAllV " << extra->send_size << " "; - for (int i = 0; i < extra->num_processes; i++) - stream << extra->sendcounts[i] << " "; - stream << extra->recv_size << " "; - for (int i = 0; i < extra->num_processes; i++) - stream << extra->recvcounts[i] << " "; - stream << extra->datatype1 << " " << extra->datatype2; - break; - case TRACING_GATHER: // rank gather send_size recv_size root (sendtype) (recvtype) - stream << "gather " << extra->send_size << " " << extra->recv_size << " " << extra->datatype1 << " "; - stream << extra->datatype2; - break; - case TRACING_ALLGATHERV: // rank allgatherv send_size [recvcounts] (sendtype) (recvtype) - stream << "allGatherV " << extra->send_size; - for (int i = 0; i < extra->num_processes; i++) - stream << extra->recvcounts[i] << " "; - stream << extra->datatype1 << " " << extra->datatype2; - break; - case TRACING_REDUCE_SCATTER: // rank reducescatter [recvcounts] comp_size (sendtype) - stream << "reduceScatter "; - for (int i = 0; i < extra->num_processes; i++) - stream << extra->recvcounts[i] << " "; - stream << extra->comp_size << " " << extra->datatype1; - break; - case TRACING_COMPUTING: - stream << "compute " << extra->comp_size; - break; - case TRACING_SLEEPING: - stream << "sleep " << extra->sleep_duration; - break; - case TRACING_GATHERV: // rank gatherv send_size [recvcounts] root (sendtype) (recvtype) - stream << "gatherV " << extra->send_size; - for (int i = 0; i < extra->num_processes; i++) - stream << extra->recvcounts[i] << " "; - stream << extra->root << " " << extra->datatype1 << " " << extra->datatype2; - break; - case TRACING_ALLGATHER: // rank allgather sendcount recvcounts (sendtype) (recvtype) - stream << "allGather " << extra->send_size << " " << extra->recv_size << " " << extra->datatype1 << " "; - stream << extra->datatype2; - break; - default: - /* Unimplemented calls are: WAITANY, SENDRECV, SCATTER, SCATTERV, SCAN, EXSCAN, COMM_SIZE, COMM_SPLIT, COMM_DUP, - * SSEND, and ISSEND. - */ - XBT_WARN("Call from %s impossible to translate into replay command : Not implemented (yet)", value->getCname()); - break; - } - fprintf(trace_file, "%s\n", stream.str().c_str()); - - if (extra->recvcounts != nullptr) - xbt_free(extra->recvcounts); - if (extra->sendcounts != nullptr) - xbt_free(extra->sendcounts); - xbt_free(extra); + /* Subtract -1 because this is the process id and we transform it to the rank id */ + stream << stoi(getContainer()->getName().erase(0, 5)) - 1 << " " << extra_->print(); + fprintf(tracing_files.at(getContainer()), "%s\n", stream.str().c_str()); } else { THROW_IMPOSSIBLE; } + + delete extra_; } } }