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 unnecessary calls to c_str().
[simgrid.git]
/
src
/
surf
/
sg_platf.cpp
diff --git
a/src/surf/sg_platf.cpp
b/src/surf/sg_platf.cpp
index
1abeb14
..
5eac4b4
100644
(file)
--- a/
src/surf/sg_platf.cpp
+++ b/
src/surf/sg_platf.cpp
@@
-19,7
+19,6
@@
#include "src/include/simgrid/sg_config.hpp"
#include "src/include/surf/surf.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/include/simgrid/sg_config.hpp"
#include "src/include/surf/surf.hpp"
#include "src/kernel/EngineImpl.hpp"
-#include "src/simix/smx_host_private.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/xml/platf_private.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/xml/platf_private.hpp"
@@
-28,7
+27,7
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
-XBT_PRIVATE std::map<std::string, simgrid::
surf
::StorageImpl*> mount_list;
+XBT_PRIVATE std::map<std::string, simgrid::
kernel::resource
::StorageImpl*> mount_list;
XBT_PRIVATE std::vector<std::string> known_storages;
namespace simgrid {
XBT_PRIVATE std::vector<std::string> known_storages;
namespace simgrid {
@@
-39,7
+38,7
@@
simgrid::xbt::signal<void(kernel::routing::ClusterCreationArgs*)> on_cluster;
}
static int surf_parse_models_setup_already_called = 0;
}
static int surf_parse_models_setup_already_called = 0;
-std::map<std::string, simgrid::
surf
::StorageType*> storage_types;
+std::map<std::string, simgrid::
kernel::resource
::StorageType*> storage_types;
/** The current AS in the parsing */
static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr;
/** The current AS in the parsing */
static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr;
@@
-92,15
+91,15
@@
void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args)
}
/** @brief Add a "router" to the network element list */
}
/** @brief Add a "router" to the network element list */
-simgrid::kernel::routing::NetPoint* sg_platf_new_router(
std::string
name, const char* coords)
+simgrid::kernel::routing::NetPoint* sg_platf_new_router(
const std::string&
name, const char* coords)
{
if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::base;
xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name),
"Refusing to create a router named '%s': this name already describes a node.", name.c_str());
{
if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::base;
xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name),
"Refusing to create a router named '%s': this name already describes a node.", name.c_str());
- simgrid::kernel::routing::NetPoint* netpoint =
new simgrid::kernel::routing::NetPoint(
-
std::move(name)
, simgrid::kernel::routing::NetPoint::Type::Router, current_routing);
+ simgrid::kernel::routing::NetPoint* netpoint =
+
new simgrid::kernel::routing::NetPoint(name
, simgrid::kernel::routing::NetPoint::Type::Router, current_routing);
XBT_DEBUG("Router '%s' has the id %u", netpoint->get_cname(), netpoint->id());
if (coords && strcmp(coords, ""))
XBT_DEBUG("Router '%s' has the id %u", netpoint->get_cname(), netpoint->id());
if (coords && strcmp(coords, ""))
@@
-334,7
+333,7
@@
void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage
xbt_assert(std::find(known_storages.begin(), known_storages.end(), storage->id) == known_storages.end(),
"Refusing to add a second storage named \"%s\"", storage->id.c_str());
xbt_assert(std::find(known_storages.begin(), known_storages.end(), storage->id) == known_storages.end(),
"Refusing to add a second storage named \"%s\"", storage->id.c_str());
- simgrid::
surf
::StorageType* stype;
+ simgrid::
kernel::resource
::StorageType* stype;
auto st = storage_types.find(storage->type_id);
if (st != storage_types.end()) {
stype = st->second;
auto st = storage_types.find(storage->type_id);
if (st != storage_types.end()) {
stype = st->second;
@@
-374,9
+373,9
@@
void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs
xbt_assert(storage_types.find(storage_type->id) == storage_types.end(),
"Reading a storage type, processing unit \"%s\" already exists", storage_type->id.c_str());
xbt_assert(storage_types.find(storage_type->id) == storage_types.end(),
"Reading a storage type, processing unit \"%s\" already exists", storage_type->id.c_str());
- simgrid::
surf::StorageType* stype =
-
new simgrid::surf::StorageType(storage_type->id, storage_type->model, storage_type->content
,
-
storage_type->properties,
storage_type->model_properties, storage_type->size);
+ simgrid::
kernel::resource::StorageType* stype = new simgrid::kernel::resource::StorageType(
+
storage_type->id, storage_type->model, storage_type->content, storage_type->properties
,
+ storage_type->model_properties, storage_type->size);
XBT_DEBUG("Create a storage type id '%s' with model '%s', content '%s'", storage_type->id.c_str(),
storage_type->model.c_str(), storage_type->content.c_str());
XBT_DEBUG("Create a storage type id '%s' with model '%s', content '%s'", storage_type->id.c_str(),
storage_type->model.c_str(), storage_type->content.c_str());
@@
-637,7
+636,7
@@
void sg_platf_new_Zone_seal()
/** @brief Add a link connecting a host to the rest of its AS (which must be cluster or vivaldi) */
void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostlink)
{
/** @brief Add a link connecting a host to the rest of its AS (which must be cluster or vivaldi) */
void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostlink)
{
- simgrid::kernel::routing::NetPoint* netpoint = s
g_host_by_name(hostlink->id.c_str()
)->pimpl_netpoint;
+ simgrid::kernel::routing::NetPoint* netpoint = s
imgrid::s4u::Host::by_name(hostlink->id
)->pimpl_netpoint;
xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str());
xbt_assert(dynamic_cast<simgrid::kernel::routing::ClusterZone*>(current_routing),
"Only hosts from Cluster and Vivaldi ASes can get a host_link.");
xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str());
xbt_assert(dynamic_cast<simgrid::kernel::routing::ClusterZone*>(current_routing),
"Only hosts from Cluster and Vivaldi ASes can get a host_link.");