X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f6cbb176d4301cae36a945dfa57e6b6a9cbafef..4bd1f48f0bf1ad1703be680ec2a38d626c6a2668:/src/instr/instr_paje_containers.cpp?ds=sidebyside

diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp
index 31f825e466..9dea3fde79 100644
--- a/src/instr/instr_paje_containers.cpp
+++ b/src/instr/instr_paje_containers.cpp
@@ -1,39 +1,36 @@
-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2017. 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 "src/instr/instr_private.h"
-#include "xbt/lib.h"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
+
 #include "surf/surf.h"
-#include "surf/surf_routing.h"
+
+#include "src/instr/instr_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
 
-static container_t rootContainer = NULL;    /* the root container */
-static xbt_dict_t allContainers = NULL;     /* all created containers indexed by name */
-xbt_dict_t trivaNodeTypes = NULL;     /* all host types defined */
-xbt_dict_t trivaEdgeTypes = NULL;     /* all link types defined */
+static container_t rootContainer = nullptr;    /* the root container */
+static xbt_dict_t allContainers = nullptr;     /* all created containers indexed by name */
+std::set<std::string> trivaNodeTypes;           /* all host types defined */
+std::set<std::string> trivaEdgeTypes;           /* all link types defined */
 
-long long int instr_new_paje_id (void)
+long long int instr_new_paje_id ()
 {
   static long long int type_id = 0;
   return type_id++;
 }
 
-void PJ_container_alloc (void)
+void PJ_container_alloc ()
 {
-  allContainers = xbt_dict_new_homogeneous(NULL);
-  trivaNodeTypes = xbt_dict_new_homogeneous(xbt_free_f);
-  trivaEdgeTypes = xbt_dict_new_homogeneous(xbt_free_f);
+  allContainers = xbt_dict_new_homogeneous(nullptr);
 }
 
-void PJ_container_release (void)
+void PJ_container_release ()
 {
   xbt_dict_free (&allContainers);
-  xbt_dict_free (&trivaNodeTypes);
-  xbt_dict_free (&trivaEdgeTypes);
 }
 
 void PJ_container_set_root (container_t root)
@@ -41,99 +38,117 @@ void PJ_container_set_root (container_t root)
   rootContainer = root;
 }
 
-container_t PJ_container_new (const char *name, e_container_types kind, container_t father)
+container_t PJ_container_new(const char* name, simgrid::instr::e_container_types kind, container_t father)
 {
-  if (name == NULL){
-    THROWF (tracing_error, 0, "can't create a container with a NULL name");
+  if (name == nullptr){
+    THROWF (tracing_error, 0, "can't create a container with a nullptr name");
   }
 
   static long long int container_id = 0;
   char id_str[INSTR_DEFAULT_STR_SIZE];
-  snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", container_id++);
+  snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", container_id);
+  container_id++;
 
-  container_t newContainer = xbt_new0(s_container_t, 1);
-  newContainer->name = xbt_strdup (name); // name of the container
-  newContainer->id = xbt_strdup (id_str); // id (or alias) of the container
-  newContainer->father = father;
+  container_t newContainer = xbt_new0(simgrid::instr::Container, 1);
+  newContainer->name_      = xbt_strdup(name);   // name of the container
+  newContainer->id_        = xbt_strdup(id_str); // id (or alias) of the container
+  newContainer->father_    = father;
   sg_host_t sg_host = sg_host_by_name(name);
 
   //Search for network_element_t
   switch (kind){
-    case INSTR_HOST:
-      newContainer->netcard = sg_host->pimpl_netcard;
-      if(!newContainer->netcard) xbt_die("Element '%s' not found",name);
+    case simgrid::instr::INSTR_HOST:
+      newContainer->netpoint_ = sg_host->pimpl_netpoint;
+      xbt_assert(newContainer->netpoint_, "Element '%s' not found", name);
       break;
-    case INSTR_ROUTER:
-      newContainer->netcard = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL);
-      if(!newContainer->netcard) xbt_die("Element '%s' not found",name);
+    case simgrid::instr::INSTR_ROUTER:
+      newContainer->netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
+      xbt_assert(newContainer->netpoint_, "Element '%s' not found", name);
       break;
-    case INSTR_AS:
-      newContainer->netcard = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,name,ROUTING_ASR_LEVEL);
-      if(!newContainer->netcard) xbt_die("Element '%s' not found",name);
+    case simgrid::instr::INSTR_AS:
+      newContainer->netpoint_ = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
+      xbt_assert(newContainer->netpoint_, "Element '%s' not found", name);
       break;
     default:
-      newContainer->netcard = NULL;
+      newContainer->netpoint_ = nullptr;
       break;
   }
 
   // level depends on level of father
-  if (newContainer->father){
-    newContainer->level = newContainer->father->level+1;
-    XBT_DEBUG("new container %s, child of %s", name, father->name);
+  if (newContainer->father_) {
+    newContainer->level_ = newContainer->father_->level_ + 1;
+    XBT_DEBUG("new container %s, child of %s", name, father->name_);
   }else{
-    newContainer->level = 0;
+    newContainer->level_ = 0;
   }
   // type definition (method depends on kind of this new container)
-  newContainer->kind = kind;
-  if (newContainer->kind == INSTR_AS){
+  newContainer->kind_ = kind;
+  if (newContainer->kind_ == simgrid::instr::INSTR_AS) {
     //if this container is of an AS, its type name depends on its level
     char as_typename[INSTR_DEFAULT_STR_SIZE];
-    snprintf (as_typename, INSTR_DEFAULT_STR_SIZE, "L%d", newContainer->level);
-    if (newContainer->father){
-      newContainer->type = PJ_type_get_or_null (as_typename, newContainer->father->type);
-      if (newContainer->type == NULL){
-        newContainer->type = PJ_type_container_new (as_typename, newContainer->father->type);
+    snprintf(as_typename, INSTR_DEFAULT_STR_SIZE, "L%d", newContainer->level_);
+    if (newContainer->father_) {
+      newContainer->type_ = simgrid::instr::Type::getOrNull(as_typename, newContainer->father_->type_);
+      if (newContainer->type_ == nullptr) {
+        newContainer->type_ = simgrid::instr::Type::containerNew(as_typename, newContainer->father_->type_);
       }
     }else{
-      newContainer->type = PJ_type_container_new ("0", NULL);
+      newContainer->type_ = simgrid::instr::Type::containerNew("0", nullptr);
     }
   }else{
     //otherwise, the name is its kind
     char typeNameBuff[INSTR_DEFAULT_STR_SIZE];
-    switch (newContainer->kind){
-      case INSTR_HOST:        snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "HOST");        break;
-      case INSTR_LINK:        snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "LINK");        break;
-      case INSTR_ROUTER:      snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "ROUTER");      break;
-      case INSTR_SMPI:        snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MPI");         break;
-      case INSTR_MSG_PROCESS: snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_PROCESS"); break;
-      case INSTR_MSG_VM:      snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_VM"); break;
-      case INSTR_MSG_TASK:    snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_TASK");    break;
-      default: THROWF (tracing_error, 0, "new container kind is unknown."); break;
+    switch (newContainer->kind_) {
+      case simgrid::instr::INSTR_HOST:
+        snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "HOST");
+        break;
+      case simgrid::instr::INSTR_LINK:
+        snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "LINK");
+        break;
+      case simgrid::instr::INSTR_ROUTER:
+        snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "ROUTER");
+        break;
+      case simgrid::instr::INSTR_SMPI:
+        snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MPI");
+        break;
+      case simgrid::instr::INSTR_MSG_PROCESS:
+        snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_PROCESS");
+        break;
+      case simgrid::instr::INSTR_MSG_VM:
+        snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_VM");
+        break;
+      case simgrid::instr::INSTR_MSG_TASK:
+        snprintf (typeNameBuff, INSTR_DEFAULT_STR_SIZE, "MSG_TASK");
+        break;
+      default:
+        THROWF (tracing_error, 0, "new container kind is unknown.");
+        break;
     }
-    type_t type = PJ_type_get_or_null (typeNameBuff, newContainer->father->type);
-    if (type == NULL){
-      newContainer->type = PJ_type_container_new (typeNameBuff, newContainer->father->type);
+    simgrid::instr::Type* type = simgrid::instr::Type::getOrNull(typeNameBuff, newContainer->father_->type_);
+    if (type == nullptr){
+      newContainer->type_ = simgrid::instr::Type::containerNew(typeNameBuff, newContainer->father_->type_);
     }else{
-      newContainer->type = type;
+      newContainer->type_ = type;
     }
   }
-  newContainer->children = xbt_dict_new_homogeneous(NULL);
-  if (newContainer->father){
-    xbt_dict_set(newContainer->father->children, newContainer->name, newContainer, NULL);
-    new_pajeCreateContainer (newContainer);
+  newContainer->children_ = xbt_dict_new_homogeneous(nullptr);
+  if (newContainer->father_) {
+    xbt_dict_set(newContainer->father_->children_, newContainer->name_, newContainer, nullptr);
+    LogContainerCreation(newContainer);
   }
 
   //register all kinds by name
-  if (xbt_dict_get_or_null(allContainers, newContainer->name) != NULL){
-    THROWF(tracing_error, 1, "container %s already present in allContainers data structure", newContainer->name);
+  if (xbt_dict_get_or_null(allContainers, newContainer->name_) != nullptr) {
+    THROWF(tracing_error, 1, "container %s already present in allContainers data structure", newContainer->name_);
   }
 
-  xbt_dict_set (allContainers, newContainer->name, newContainer, NULL);
-  XBT_DEBUG("Add container name '%s'",newContainer->name);
+  xbt_dict_set(allContainers, newContainer->name_, newContainer, nullptr);
+  XBT_DEBUG("Add container name '%s'", newContainer->name_);
 
   //register NODE types for triva configuration
-  if (newContainer->kind == INSTR_HOST || newContainer->kind == INSTR_LINK || newContainer->kind == INSTR_ROUTER) {
-    xbt_dict_set (trivaNodeTypes, newContainer->type->name, xbt_strdup("1"), NULL);
+  if (newContainer->kind_ == simgrid::instr::INSTR_HOST || newContainer->kind_ == simgrid::instr::INSTR_LINK ||
+      newContainer->kind_ == simgrid::instr::INSTR_ROUTER) {
+    trivaNodeTypes.insert(newContainer->type_->name_);
   }
   return newContainer;
 }
@@ -141,7 +156,7 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe
 container_t PJ_container_get (const char *name)
 {
   container_t ret = PJ_container_get_or_null (name);
-  if (ret == NULL){
+  if (ret == nullptr){
     THROWF(tracing_error, 1, "container with name %s not found", name);
   }
   return ret;
@@ -149,7 +164,7 @@ container_t PJ_container_get (const char *name)
 
 container_t PJ_container_get_or_null (const char *name)
 {
-  return (container_t)(name ? xbt_dict_get_or_null(allContainers, name) : NULL);
+  return static_cast<container_t>(name != nullptr ? xbt_dict_get_or_null(allContainers, name) : nullptr);
 }
 
 container_t PJ_container_get_root ()
@@ -159,25 +174,23 @@ container_t PJ_container_get_root ()
 
 void PJ_container_remove_from_parent (container_t child)
 {
-  if (child == NULL){
-    THROWF (tracing_error, 0, "can't remove from parent with a NULL child");
+  if (child == nullptr){
+    THROWF (tracing_error, 0, "can't remove from parent with a nullptr child");
   }
 
-  container_t parent = child->father;
+  container_t parent = child->father_;
   if (parent){
-    XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ",
-        child->name,
-        parent->name);
-    xbt_dict_remove (parent->children, child->name);
+    XBT_DEBUG("removeChildContainer (%s) FromContainer (%s) ", child->name_, parent->name_);
+    xbt_dict_remove(parent->children_, child->name_);
   }
 }
 
 void PJ_container_free (container_t container)
 {
-  if (container == NULL){
-    THROWF (tracing_error, 0, "trying to free a NULL container");
+  if (container == nullptr){
+    THROWF (tracing_error, 0, "trying to free a nullptr container");
   }
-  XBT_DEBUG("destroy container %s", container->name);
+  XBT_DEBUG("destroy container %s", container->name_);
 
   //obligation to dump previous events because they might
   //reference the container that is about to be destroyed
@@ -185,33 +198,33 @@ void PJ_container_free (container_t container)
   TRACE_paje_dump_buffer(1);
 
   //trace my destruction
-  if (!TRACE_disable_destroy() && container != PJ_container_get_root()){
+  if (not TRACE_disable_destroy() && container != PJ_container_get_root()) {
     //do not trace the container destruction if user requests
     //or if the container is root
-    new_pajeDestroyContainer(container);
+    LogContainerDestruction(container);
   }
 
   //remove it from allContainers data structure
-  xbt_dict_remove (allContainers, container->name);
+  xbt_dict_remove(allContainers, container->name_);
 
   //free
-  xbt_free (container->name);
-  xbt_free (container->id);
-  xbt_dict_free (&container->children);
+  xbt_free(container->name_);
+  xbt_free(container->id_);
+  xbt_dict_free(&container->children_);
   xbt_free (container);
-  container = NULL;
+  container = nullptr;
 }
 
 static void recursiveDestroyContainer (container_t container)
 {
-  if (container == NULL){
-    THROWF (tracing_error, 0, "trying to recursively destroy a NULL container");
+  if (container == nullptr){
+    THROWF (tracing_error, 0, "trying to recursively destroy a nullptr container");
   }
-  XBT_DEBUG("recursiveDestroyContainer %s", container->name);
-  xbt_dict_cursor_t cursor = NULL;
+  XBT_DEBUG("recursiveDestroyContainer %s", container->name_);
+  xbt_dict_cursor_t cursor = nullptr;
   container_t child;
   char *child_name;
-  xbt_dict_foreach(container->children, cursor, child_name, child) {
+  xbt_dict_foreach (container->children_, cursor, child_name, child) {
     recursiveDestroyContainer (child);
   }
   PJ_container_free (container);
@@ -220,14 +233,14 @@ static void recursiveDestroyContainer (container_t container)
 void PJ_container_free_all ()
 {
   container_t root = PJ_container_get_root();
-  if (root == NULL){
-    THROWF (tracing_error, 0, "trying to free all containers, but root is NULL");
+  if (root == nullptr){
+    THROWF (tracing_error, 0, "trying to free all containers, but root is nullptr");
   }
   recursiveDestroyContainer (root);
-  rootContainer = NULL;
+  rootContainer = nullptr;
 
   //checks
-  if (!xbt_dict_is_empty(allContainers)){
+  if (not xbt_dict_is_empty(allContainers)) {
     THROWF(tracing_error, 0, "some containers still present even after destroying all of them");
   }
 }