-/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2020. 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 "simgrid/Exception.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/instr/instr_private.hpp"
+#include <sys/stat.h>
+#ifdef WIN32
+#include <direct.h> // _mkdir
+#endif
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_containers, instr, "Paje tracing event system (containers)");
return rootContainer;
}
-NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZoneContainer* father)
- : Container::Container(std::move(name), "", father)
+NetZoneContainer::NetZoneContainer(const std::string& name, unsigned int level, NetZoneContainer* father)
+ : Container::Container(name, "", father)
{
netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name());
xbt_assert(netpoint_, "Element '%s' not found", get_cname());
}
}
-RouterContainer::RouterContainer(std::string name, Container* father)
- : Container::Container(std::move(name), "ROUTER", father)
+RouterContainer::RouterContainer(const std::string& name, Container* father)
+ : Container::Container(name, "ROUTER", father)
{
xbt_assert(father, "Only the Root container has no father");
trivaNodeTypes.insert(type_->get_name());
}
-HostContainer::HostContainer(simgrid::s4u::Host& host, NetZoneContainer* father)
+HostContainer::HostContainer(simgrid::s4u::Host const& host, NetZoneContainer* father)
: Container::Container(host.get_name(), "HOST", father)
{
xbt_assert(father, "Only the Root container has no father");
- netpoint_ = host.pimpl_netpoint;
+ netpoint_ = host.get_netpoint();
xbt_assert(netpoint_, "Element '%s' not found", host.get_cname());
trivaNodeTypes.insert(type_->get_name());
}
-Container::Container(std::string name, const std::string& type_name, Container* father)
- : name_(std::move(name)), father_(father)
+Container::Container(const std::string& name, const std::string& type_name, Container* father)
+ : name_(name), father_(father)
{
static long long int container_id = 0;
id_ = container_id; // id (or alias) of the container
//register all kinds by name
if (not allContainers.emplace(name_, this).second)
- THROWF(tracing_error, 1, "container %s already present in allContainers data structure", get_cname());
+ throw simgrid::TracingError(
+ XBT_THROW_POINT,
+ simgrid::xbt::string_printf("container %s already present in allContainers data structure", get_cname()));
XBT_DEBUG("Add container name '%s'", get_cname());
allContainers.erase(name_);
}
-void Container::create_child(std::string name, const std::string& type_name)
+void Container::create_child(const std::string& name, const std::string& type_name)
{
- new Container(std::move(name), type_name, this);
+ new Container(name, type_name, this);
}
Container* Container::by_name_or_null(const std::string& name)