X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1366b293e8c700b12567e45076cf0e6b7a25478f..62534c29d0fe83dbec6b7e7642d2ecbe100f3d7b:/src/instr/instr_paje_values.cpp

diff --git a/src/instr/instr_paje_values.cpp b/src/instr/instr_paje_values.cpp
index 9e60ab1db3..f4a2c4d745 100644
--- a/src/instr/instr_paje_values.cpp
+++ b/src/instr/instr_paje_values.cpp
@@ -1,74 +1,33 @@
-/* Copyright (c) 2012-2015. The SimGrid Team.
+/* Copyright (c) 2012-2018. 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.h"
+#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;
 
-val_t s_val::PJ_value_update (const char *name, const char *color, type_t father)
-{
-  this->ret = xbt_new0(s_val, 1);
-  this->ret->name = xbt_strdup (name);
-  this->ret->father = father;
-  this->ret->color = xbt_strdup (color);
+namespace simgrid {
+namespace instr {
 
-  char str_id[INSTR_DEFAULT_STR_SIZE];
-  snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", instr_new_paje_id());
-  this->ret->id = xbt_strdup (str_id);
+EntityValue::EntityValue(std::string name, std::string color, Type* father)
+    : id_(instr_new_paje_id()), name_(name), color_(color), father_(father){};
 
-  xbt_dict_set (father->values, name, ret, nullptr);
-  XBT_DEBUG("new value %s, child of %s", this->ret->name, this->ret->father->name);
-  LogEntityValue(this->ret);
-  return this->ret;
+void EntityValue::print()
+{
+  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;
 }
 
-s_val::s_val(const char *name, const char *color, type_t father){
-  if (name == nullptr || father == nullptr){
-    THROWF (tracing_error, 0, "can't create a value with a nullptr name (or a nullptr father)");
-  }
-  this->ret = xbt_new0(s_val, 1);
-  this->ret->name = xbt_strdup (name);
-  this->ret->father = father;
-  this->ret->color = xbt_strdup (color);
-
-  char str_id[INSTR_DEFAULT_STR_SIZE];
-  snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", instr_new_paje_id());
-  this->ret->id = xbt_strdup (str_id);
-
-  xbt_dict_set (father->values, name, ret, nullptr);
-  XBT_DEBUG("new value %s, child of %s", ret->name, ret->father->name);
-  LogEntityValue(this->ret);
-};
-
-val_t paje_value :: PJ_value_get_or_new (const char *name, const char *color, type_t father)
-{ paje_value pj_value;
-  val_t ret = 0;
-  try {
-    ret = pj_value.PJ_value_get(name, father);
-  }
-  catch(xbt_ex& e) {
-    s_val rett(name, color, father);
-    ret = rett.ret;
-  }
-  return ret;
 }
-
-val_t paje_value::PJ_value_get (const char *name, type_t father)
-{
-  if (name == nullptr || father == nullptr){
-    THROWF (tracing_error, 0, "can't get a value with a nullptr name (or a nullptr father)");
-  }
-
-  if (father->kind == TYPE_VARIABLE)
-    THROWF(tracing_error, 0, "variables can't have different values (%s)", father->name);
-  val_t ret = (val_t)xbt_dict_get_or_null (father->values, name);
-  if (ret == nullptr) {
-    THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name, father->name);
-  }
-  return ret;
 }