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
Remove redundant operations.
[simgrid.git]
/
src
/
instr
/
instr_paje_containers.cpp
diff --git
a/src/instr/instr_paje_containers.cpp
b/src/instr/instr_paje_containers.cpp
index
2413837
..
13f4198
100644
(file)
--- a/
src/instr/instr_paje_containers.cpp
+++ b/
src/instr/instr_paje_containers.cpp
@@
-10,10
+10,13
@@
#include "src/instr/instr_private.h"
#include "src/instr/instr_private.h"
+#include <unordered_map>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
static container_t rootContainer = nullptr; /* the root container */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
static container_t rootContainer = nullptr; /* the root container */
-static xbt_dict_t allContainers = nullptr; /* all created containers indexed by name */
+static std::unordered_map<std::string, simgrid::instr::Container*>
+ allContainers; /* all created containers indexed by name */
std::set<std::string> trivaNodeTypes; /* all host types defined */
std::set<std::string> trivaEdgeTypes; /* all link types defined */
std::set<std::string> trivaNodeTypes; /* all host types defined */
std::set<std::string> trivaEdgeTypes; /* all link types defined */
@@
-23,41
+26,24
@@
long long int instr_new_paje_id ()
return type_id++;
}
return type_id++;
}
-void PJ_container_alloc ()
-{
- allContainers = xbt_dict_new_homogeneous(nullptr);
-}
-
-void PJ_container_release ()
-{
- xbt_dict_free (&allContainers);
-}
-
void PJ_container_set_root (container_t root)
{
rootContainer = root;
}
simgrid::instr::Container::Container(const char* name, simgrid::instr::e_container_types kind, Container* father)
void PJ_container_set_root (container_t root)
{
rootContainer = root;
}
simgrid::instr::Container::Container(const char* name, simgrid::instr::e_container_types kind, Container* father)
+ : name_(xbt_strdup(name)), father_(father)
{
{
- if (name == nullptr){
- THROWF (tracing_error, 0, "can't create a container with a nullptr name");
- }
+ xbt_assert(name != nullptr, "Container name cannot be nullptr");
static long long int container_id = 0;
static long long int container_id = 0;
- char id_str[INSTR_DEFAULT_STR_SIZE];
- snprintf (id_str, INSTR_DEFAULT_STR_SIZE, "%lld", container_id);
+ id_ = bprintf("%lld", container_id); // id (or alias) of the container
container_id++;
container_id++;
- name_ = xbt_strdup(name); // name of the container
- id_ = xbt_strdup(id_str); // id (or alias) of the container
- father_ = father;
- sg_host_t sg_host = sg_host_by_name(name);
-
//Search for network_element_t
switch (kind){
case simgrid::instr::INSTR_HOST:
//Search for network_element_t
switch (kind){
case simgrid::instr::INSTR_HOST:
- this->netpoint_ = sg_host->pimpl_netpoint;
+ this->netpoint_ = sg_host
_by_name(name)
->pimpl_netpoint;
xbt_assert(this->netpoint_, "Element '%s' not found", name);
break;
case simgrid::instr::INSTR_ROUTER:
xbt_assert(this->netpoint_, "Element '%s' not found", name);
break;
case simgrid::instr::INSTR_ROUTER:
@@
-73,13
+59,11
@@
simgrid::instr::Container::Container(const char* name, simgrid::instr::e_contain
break;
}
break;
}
- // level depends on level of father
- if (this->father_) {
- this->level_ = this->father_->level_ + 1;
+ if (father_) {
+ this->level_ = father_->level_ + 1;
XBT_DEBUG("new container %s, child of %s", name, father->name_);
XBT_DEBUG("new container %s, child of %s", name, father->name_);
- }else{
- this->level_ = 0;
}
}
+
// type definition (method depends on kind of this new container)
this->kind_ = kind;
if (this->kind_ == simgrid::instr::INSTR_AS) {
// type definition (method depends on kind of this new container)
this->kind_ = kind;
if (this->kind_ == simgrid::instr::INSTR_AS) {
@@
-137,11
+121,10
@@
simgrid::instr::Container::Container(const char* name, simgrid::instr::e_contain
}
//register all kinds by name
}
//register all kinds by name
- if (
xbt_dict_get_or_null(allContainers, this->name_) != nullptr
) {
+ if (
not allContainers.emplace(this->name_, this).second
) {
THROWF(tracing_error, 1, "container %s already present in allContainers data structure", this->name_);
}
THROWF(tracing_error, 1, "container %s already present in allContainers data structure", this->name_);
}
- xbt_dict_set(allContainers, this->name_, this, nullptr);
XBT_DEBUG("Add container name '%s'", this->name_);
//register NODE types for triva configuration
XBT_DEBUG("Add container name '%s'", this->name_);
//register NODE types for triva configuration
@@
-167,7
+150,7
@@
simgrid::instr::Container::~Container()
}
// remove it from allContainers data structure
}
// remove it from allContainers data structure
-
xbt_dict_remove(allContainers,
name_);
+
allContainers.erase(
name_);
// free
xbt_free(name_);
// free
xbt_free(name_);
@@
-175,7
+158,7
@@
simgrid::instr::Container::~Container()
xbt_dict_free(&children_);
}
xbt_dict_free(&children_);
}
-
container_t PJ_container_get (const char *
name)
+
simgrid::instr::Container* PJ_container_get(const char*
name)
{
container_t ret = PJ_container_get_or_null (name);
if (ret == nullptr){
{
container_t ret = PJ_container_get_or_null (name);
if (ret == nullptr){
@@
-184,12
+167,13
@@
container_t PJ_container_get (const char *name)
return ret;
}
return ret;
}
-
container_t PJ_container_get_or_null (const char *
name)
+
simgrid::instr::Container* PJ_container_get_or_null(const char*
name)
{
{
- return static_cast<container_t>(name != nullptr ? xbt_dict_get_or_null(allContainers, name) : nullptr);
+ auto cont = allContainers.find(name);
+ return cont == allContainers.end() ? nullptr : cont->second;
}
}
-
container_t PJ_container_get_root
()
+
simgrid::instr::Container* PJ_container_get_root
()
{
return rootContainer;
}
{
return rootContainer;
}
@@
-232,7
+216,7
@@
void PJ_container_free_all ()
rootContainer = nullptr;
//checks
rootContainer = nullptr;
//checks
- if (not
xbt_dict_is_empty(allContainers
)) {
+ if (not
allContainers.empty(
)) {
THROWF(tracing_error, 0, "some containers still present even after destroying all of them");
}
}
THROWF(tracing_error, 0, "some containers still present even after destroying all of them");
}
}