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
cut another bunch of include
[simgrid.git]
/
src
/
s4u
/
s4u_storage.cpp
diff --git
a/src/s4u/s4u_storage.cpp
b/src/s4u/s4u_storage.cpp
index
78b3013
..
780d5c7
100644
(file)
--- a/
src/s4u/s4u_storage.cpp
+++ b/
src/s4u/s4u_storage.cpp
@@
-3,12
+3,9
@@
/* 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. */
/* 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/kernel/resource/Resource.hpp"
-#include "simgrid/plugins/file_system.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
-#include "simgrid/simix.hpp"
#include "simgrid/storage.h"
#include "src/surf/StorageImpl.hpp"
#include "simgrid/storage.h"
#include "src/surf/StorageImpl.hpp"
@@
-27,7
+24,7
@@
void XBT_ATTRIB_DEPRECATED_v322(
getStorageList(std::map<std::string, Storage*>* whereTo)
{
for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages())
getStorageList(std::map<std::string, Storage*>* whereTo)
{
for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages())
- whereTo->insert({s->get
N
ame(), s});
+ whereTo->insert({s->get
_n
ame(), s});
}
Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
}
Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
@@
-40,12
+37,12
@@
Storage* Storage::byName(std::string name)
return Engine::getInstance()->storageByNameOrNull(name);
}
return Engine::getInstance()->storageByNameOrNull(name);
}
-const std::string& Storage::get
N
ame() const
+const std::string& Storage::get
_n
ame() const
{
return name_;
}
{
return name_;
}
-const char* Storage::get
C
name() const
+const char* Storage::get
_c
name() const
{
return name_.c_str();
}
{
return name_.c_str();
}
@@
-109,13
+106,13
@@
simgrid::xbt::signal<void(s4u::Storage&)> Storage::onDestruction;
const char* sg_storage_get_name(sg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters");
const char* sg_storage_get_name(sg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters");
- return storage->get
C
name();
+ return storage->get
_c
name();
}
const char* sg_storage_get_host(sg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters");
}
const char* sg_storage_get_host(sg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters");
- return storage->getHost()->get
C
name();
+ return storage->getHost()->get
_c
name();
}
/** \ingroup sg_storage_management
}
/** \ingroup sg_storage_management