X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d656f9465e7b1c36319f86eeafdcec58fe9551a4..510c97d4c651c63ef9851a7e1d9c328f62b5b00b:/src/instr/instr_paje_values.cpp

diff --git a/src/instr/instr_paje_values.cpp b/src/instr/instr_paje_values.cpp
index 380f1c6a76..6a4bd38eec 100644
--- a/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@ -1,58 +1,33 @@
-/* Copyright (c) 2012-2017. The SimGrid Team.
+/* Copyright (c) 2012-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <xbt/ex.hpp>
 #include "src/instr/instr_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
+extern std::ofstream tracing_file;
 
 namespace simgrid {
 namespace instr {
 
-Value::Value(std::string name, std::string color, Type* father) : name_(name), color_(color), father_(father)
-{
-  if (name.empty() || father == nullptr) {
-    THROWF(tracing_error, 0, "can't create a value with no name (or a nullptr father)");
-  }
-  this->id_    = std::to_string(instr_new_paje_id());
-
-  father->values_.insert({name, this});
-  XBT_DEBUG("new value %s, child of %s", name_.c_str(), father_->getCname());
-  print();
-};
-
-Value::~Value()
-{
-  XBT_DEBUG("free value %s, child of %s", getCname(), father_->getCname());
-}
+EntityValue::EntityValue(const std::string& name, const std::string& color, Type* father)
+    : id_(instr_new_paje_id()), name_(name), color_(color), father_(father){};
 
-Value* Value::byNameOrCreate(std::string name, std::string color, Type* father)
+void EntityValue::print()
 {
-  Value* ret = nullptr;
-  try {
-    ret = Value::byName(name, father);
-  } catch (xbt_ex& e) {
-    ret = new Value(name, color, father);
-  }
-  return ret;
+  if (trace_format != simgrid::instr::TraceFormat::Paje)
+    return;
+  std::stringstream stream;
+  XBT_DEBUG("%s: event_type=%u", __func__, PAJE_DefineEntityValue);
+  stream << std::fixed << std::setprecision(TRACE_precision()) << PAJE_DefineEntityValue;
+  stream << " " << id_ << " " << father_->get_id() << " " << name_;
+  if (not color_.empty())
+    stream << " \"" << color_ << "\"";
+  XBT_DEBUG("Dump %s", stream.str().c_str());
+  tracing_file << stream.str() << std::endl;
 }
 
-Value* Value::byName(std::string name, Type* father)
-{
-  if (name.empty() || father == nullptr) {
-    THROWF(tracing_error, 0, "can't get a value with no name (or a nullptr father)");
-  }
-
-  if (father->getKind() == TYPE_VARIABLE)
-    THROWF(tracing_error, 0, "variables can't have different values (%s)", father->getCname());
-  auto ret = father->values_.find(name);
-  if (ret == father->values_.end()) {
-    THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name.c_str(), father->getCname());
-  }
-  return ret->second;
-}
 }
 }