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
snake_casing file system plugin
[simgrid.git]
/
src
/
plugins
/
file_system
/
s4u_FileSystem.cpp
diff --git
a/src/plugins/file_system/s4u_FileSystem.cpp
b/src/plugins/file_system/s4u_FileSystem.cpp
index
b1b6baf
..
056ffa9
100644
(file)
--- a/
src/plugins/file_system/s4u_FileSystem.cpp
+++ b/
src/plugins/file_system/s4u_FileSystem.cpp
@@
-3,10
+3,10
@@
/* 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/plugins/file_system.h"
#include "simgrid/s4u/Actor.hpp"
#include "src/surf/HostImpl.hpp"
#include "simgrid/plugins/file_system.h"
#include "simgrid/s4u/Actor.hpp"
#include "src/surf/HostImpl.hpp"
+#include "xbt/config.hpp"
#include <algorithm>
#include <boost/algorithm/string.hpp>
#include <algorithm>
#include <boost/algorithm/string.hpp>
@@
-48,7
+48,7
@@
File::File(std::string fullpath, sg_host_t host, void* userdata) : fullpath_(ful
} else
xbt_die("Can't find mount point for '%s' on '%s'", fullpath.c_str(), host->get_cname());
} else
xbt_die("Can't find mount point for '%s' on '%s'", fullpath.c_str(), host->get_cname());
- local
Storage
= st;
+ local
_storage_
= st;
// assign a file descriptor id to the newly opened File
FileDescriptorHostExt* ext = host->extension<simgrid::s4u::FileDescriptorHostExt>();
// assign a file descriptor id to the newly opened File
FileDescriptorHostExt* ext = host->extension<simgrid::s4u::FileDescriptorHostExt>();
@@
-61,7
+61,7
@@
File::File(std::string fullpath, sg_host_t host, void* userdata) : fullpath_(ful
ext->file_descriptor_table->pop_back();
XBT_DEBUG("\tOpen file '%s'", path_.c_str());
ext->file_descriptor_table->pop_back();
XBT_DEBUG("\tOpen file '%s'", path_.c_str());
- std::map<std::string, sg_size_t>* content = local
Storage->extension<FileSystemStorageExt>()->getC
ontent();
+ std::map<std::string, sg_size_t>* content = local
_storage_->extension<FileSystemStorageExt>()->get_c
ontent();
// if file does not exist create an empty file
auto sz = content->find(path_);
if (sz != content->end()) {
// if file does not exist create an empty file
auto sz = content->find(path_);
if (sz != content->end()) {
@@
-87,7
+87,7
@@
void File::dump()
"\t\tStorage Id: '%s'\n"
"\t\tStorage Type: '%s'\n"
"\t\tFile Descriptor Id: %d",
"\t\tStorage Id: '%s'\n"
"\t\tStorage Type: '%s'\n"
"\t\tFile Descriptor Id: %d",
- get
Path(), size_, mount_point_.c_str(), localStorage->get_cname(), localStorage
->getType(), desc_id);
+ get
_path(), size_, mount_point_.c_str(), local_storage_->get_cname(), local_storage_
->getType(), desc_id);
}
sg_size_t File::read(sg_size_t size)
}
sg_size_t File::read(sg_size_t size)
@@
-96,10
+96,10
@@
sg_size_t File::read(sg_size_t size)
return 0;
/* Find the host where the file is physically located and read it */
return 0;
/* Find the host where the file is physically located and read it */
- Host* host = local
Storage
->getHost();
- XBT_DEBUG("READ %s on disk '%s'", get
Path(), localStorage
->get_cname());
+ Host* host = local
_storage_
->getHost();
+ XBT_DEBUG("READ %s on disk '%s'", get
_path(), local_storage_
->get_cname());
// if the current position is close to the end of the file, we may not be able to read the requested size
// if the current position is close to the end of the file, we may not be able to read the requested size
- sg_size_t read_size = local
Storage
->read(std::min(size, size_ - current_position_));
+ sg_size_t read_size = local
_storage_
->read(std::min(size, size_ - current_position_));
current_position_ += read_size;
if (strcmp(host->get_cname(), Host::current()->get_cname())) {
current_position_ += read_size;
if (strcmp(host->get_cname(), Host::current()->get_cname())) {
@@
-127,7
+127,7
@@
sg_size_t File::write(sg_size_t size)
return 0;
/* Find the host where the file is physically located (remote or local)*/
return 0;
/* Find the host where the file is physically located (remote or local)*/
- Host* host = local
Storage
->getHost();
+ Host* host = local
_storage_
->getHost();
if (strcmp(host->get_cname(), Host::current()->get_cname())) {
/* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
if (strcmp(host->get_cname(), Host::current()->get_cname())) {
/* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
@@
-139,19
+139,19
@@
sg_size_t File::write(sg_size_t size)
this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount);
}
this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount);
}
- XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu'", get
Path(), localStorage
->get_cname(), size, size_);
+ XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu'", get
_path(), local_storage_
->get_cname(), size, size_);
// If the storage is full before even starting to write
// If the storage is full before even starting to write
- if (sg_storage_get_size_used(local
Storage) >= sg_storage_get_size(localStorage
))
+ if (sg_storage_get_size_used(local
_storage_) >= sg_storage_get_size(local_storage_
))
return 0;
/* Substract the part of the file that might disappear from the used sized on the storage element */
return 0;
/* Substract the part of the file that might disappear from the used sized on the storage element */
- local
Storage->extension<FileSystemStorageExt>()->decrUsedS
ize(size_ - current_position_);
+ local
_storage_->extension<FileSystemStorageExt>()->decr_used_s
ize(size_ - current_position_);
- sg_size_t write_size = local
Storage
->write(size);
- local
Storage->extension<FileSystemStorageExt>()->incrUsedS
ize(write_size);
+ sg_size_t write_size = local
_storage_
->write(size);
+ local
_storage_->extension<FileSystemStorageExt>()->incr_used_s
ize(write_size);
current_position_ += write_size;
size_ = current_position_;
current_position_ += write_size;
size_ = current_position_;
- std::map<std::string, sg_size_t>* content = local
Storage->extension<FileSystemStorageExt>()->getC
ontent();
+ std::map<std::string, sg_size_t>* content = local
_storage_->extension<FileSystemStorageExt>()->get_c
ontent();
content->erase(path_);
content->insert({path_, size_});
content->erase(path_);
content->insert({path_, size_});
@@
-195,7
+195,7
@@
void File::move(std::string fullpath)
{
/* Check if the new full path is on the same mount point */
if (not strncmp(mount_point_.c_str(), fullpath.c_str(), mount_point_.length())) {
{
/* Check if the new full path is on the same mount point */
if (not strncmp(mount_point_.c_str(), fullpath.c_str(), mount_point_.length())) {
- std::map<std::string, sg_size_t>* content = local
Storage->extension<FileSystemStorageExt>()->getC
ontent();
+ std::map<std::string, sg_size_t>* content = local
_storage_->extension<FileSystemStorageExt>()->get_c
ontent();
auto sz = content->find(path_);
if (sz != content->end()) { // src file exists
sg_size_t new_size = sz->second;
auto sz = content->find(path_);
if (sz != content->end()) { // src file exists
sg_size_t new_size = sz->second;
@@
-214,14
+214,14
@@
void File::move(std::string fullpath)
int File::unlink()
{
/* Check if the file is on local storage */
int File::unlink()
{
/* Check if the file is on local storage */
- std::map<std::string, sg_size_t>* content = local
Storage->extension<FileSystemStorageExt>()->getC
ontent();
+ std::map<std::string, sg_size_t>* content = local
_storage_->extension<FileSystemStorageExt>()->get_c
ontent();
if (content->find(path_) == content->end()) {
if (content->find(path_) == content->end()) {
- XBT_WARN("File %s is not on disk %s. Impossible to unlink", path_.c_str(), local
Storage
->get_cname());
+ XBT_WARN("File %s is not on disk %s. Impossible to unlink", path_.c_str(), local
_storage_
->get_cname());
return -1;
} else {
return -1;
} else {
- XBT_DEBUG("UNLINK %s on disk '%s'", path_.c_str(), local
Storage
->get_cname());
- local
Storage->extension<FileSystemStorageExt>()->decrUsedS
ize(size_);
+ XBT_DEBUG("UNLINK %s on disk '%s'", path_.c_str(), local
_storage_
->get_cname());
+ local
_storage_->extension<FileSystemStorageExt>()->decr_used_s
ize(size_);
// Remove the file from storage
content->erase(fullpath_);
// Remove the file from storage
content->erase(fullpath_);
@@
-230,15
+230,15
@@
int File::unlink()
}
}
}
}
-int File::remote
C
opy(sg_host_t host, const char* fullpath)
+int File::remote
_c
opy(sg_host_t host, const char* fullpath)
{
/* Find the host where the file is physically located and read it */
{
/* Find the host where the file is physically located and read it */
- Storage* storage_src = local
Storage
;
+ Storage* storage_src = local
_storage_
;
Host* src_host = storage_src->getHost();
seek(0, SEEK_SET);
Host* src_host = storage_src->getHost();
seek(0, SEEK_SET);
- XBT_DEBUG("READ %s on disk '%s'", get
Path(), localStorage
->get_cname());
+ XBT_DEBUG("READ %s on disk '%s'", get
_path(), local_storage_
->get_cname());
// if the current position is close to the end of the file, we may not be able to read the requested size
// if the current position is close to the end of the file, we may not be able to read the requested size
- sg_size_t read_size = local
Storage
->read(size_);
+ sg_size_t read_size = local
_storage_
->read(size_);
current_position_ += read_size;
/* Find the host that owns the storage where the file has to be copied */
current_position_ += read_size;
/* Find the host that owns the storage where the file has to be copied */
@@
-273,23
+273,23
@@
int File::remoteCopy(sg_host_t host, const char* fullpath)
/* Create file on remote host, write it and close it */
File* fd = new File(fullpath, dst_host, nullptr);
/* Create file on remote host, write it and close it */
File* fd = new File(fullpath, dst_host, nullptr);
- sg_size_t write_size = fd->local
Storage
->write(read_size);
- fd->local
Storage->extension<FileSystemStorageExt>()->incrUsedS
ize(write_size);
- (*(fd->local
Storage->extension<FileSystemStorageExt>()->getC
ontent()))[path_] = size_;
+ sg_size_t write_size = fd->local
_storage_
->write(read_size);
+ fd->local
_storage_->extension<FileSystemStorageExt>()->incr_used_s
ize(write_size);
+ (*(fd->local
_storage_->extension<FileSystemStorageExt>()->get_c
ontent()))[path_] = size_;
delete fd;
return 0;
}
delete fd;
return 0;
}
-int File::remote
M
ove(sg_host_t host, const char* fullpath)
+int File::remote
_m
ove(sg_host_t host, const char* fullpath)
{
{
- int res = remote
C
opy(host, fullpath);
+ int res = remote
_c
opy(host, fullpath);
unlink();
return res;
}
FileSystemStorageExt::FileSystemStorageExt(simgrid::s4u::Storage* ptr)
{
unlink();
return res;
}
FileSystemStorageExt::FileSystemStorageExt(simgrid::s4u::Storage* ptr)
{
- content_ = parse
C
ontent(ptr->getImpl()->content_name);
+ content_ = parse
_c
ontent(ptr->getImpl()->content_name);
size_ = ptr->getImpl()->size_;
}
size_ = ptr->getImpl()->size_;
}
@@
-298,7
+298,7
@@
FileSystemStorageExt::~FileSystemStorageExt()
delete content_;
}
delete content_;
}
-std::map<std::string, sg_size_t>* FileSystemStorageExt::parse
C
ontent(std::string filename)
+std::map<std::string, sg_size_t>* FileSystemStorageExt::parse
_c
ontent(std::string filename)
{
if (filename.empty())
return nullptr;
{
if (filename.empty())
return nullptr;
@@
-317,7
+317,7
@@
std::map<std::string, sg_size_t>* FileSystemStorageExt::parseContent(std::string
xbt_assert(tokens.size() == 2, "Parse error in %s: %s", filename.c_str(), line.c_str());
sg_size_t size = std::stoull(tokens.at(1));
xbt_assert(tokens.size() == 2, "Parse error in %s: %s", filename.c_str(), line.c_str());
sg_size_t size = std::stoull(tokens.at(1));
- used
S
ize_ += size;
+ used
_s
ize_ += size;
parse_content->insert({tokens.front(), size});
}
} while (not fs->eof());
parse_content->insert({tokens.front(), size});
}
} while (not fs->eof());
@@
-330,17
+330,17
@@
std::map<std::string, sg_size_t>* FileSystemStorageExt::parseContent(std::string
using simgrid::s4u::FileSystemStorageExt;
using simgrid::s4u::FileDescriptorHostExt;
using simgrid::s4u::FileSystemStorageExt;
using simgrid::s4u::FileDescriptorHostExt;
-static void on
StorageC
reation(simgrid::s4u::Storage& st)
+static void on
_storage_c
reation(simgrid::s4u::Storage& st)
{
st.extension_set(new FileSystemStorageExt(&st));
}
{
st.extension_set(new FileSystemStorageExt(&st));
}
-static void on
StorageD
estruction(simgrid::s4u::Storage& st)
+static void on
_storage_d
estruction(simgrid::s4u::Storage& st)
{
delete st.extension<FileSystemStorageExt>();
}
{
delete st.extension<FileSystemStorageExt>();
}
-static void on
HostC
reation(simgrid::s4u::Host& host)
+static void on
_host_c
reation(simgrid::s4u::Host& host)
{
host.extension_set<FileDescriptorHostExt>(new FileDescriptorHostExt());
}
{
host.extension_set<FileDescriptorHostExt>(new FileDescriptorHostExt());
}
@@
-348,15
+348,19
@@
static void onHostCreation(simgrid::s4u::Host& host)
/* **************************** Public interface *************************** */
void sg_storage_file_system_init()
{
/* **************************** Public interface *************************** */
void sg_storage_file_system_init()
{
+ sg_storage_max_file_descriptors = 1024;
+ simgrid::config::bind_flag(sg_storage_max_file_descriptors, "storage/max_file_descriptors",
+ "Maximum number of concurrently opened files per host. Default is 1024");
+
if (not FileSystemStorageExt::EXTENSION_ID.valid()) {
FileSystemStorageExt::EXTENSION_ID = simgrid::s4u::Storage::extension_create<FileSystemStorageExt>();
if (not FileSystemStorageExt::EXTENSION_ID.valid()) {
FileSystemStorageExt::EXTENSION_ID = simgrid::s4u::Storage::extension_create<FileSystemStorageExt>();
- simgrid::s4u::Storage::onCreation.connect(&on
StorageC
reation);
- simgrid::s4u::Storage::onDestruction.connect(&on
StorageD
estruction);
+ simgrid::s4u::Storage::onCreation.connect(&on
_storage_c
reation);
+ simgrid::s4u::Storage::onDestruction.connect(&on
_storage_d
estruction);
}
if (not FileDescriptorHostExt::EXTENSION_ID.valid()) {
FileDescriptorHostExt::EXTENSION_ID = simgrid::s4u::Host::extension_create<FileDescriptorHostExt>();
}
if (not FileDescriptorHostExt::EXTENSION_ID.valid()) {
FileDescriptorHostExt::EXTENSION_ID = simgrid::s4u::Host::extension_create<FileDescriptorHostExt>();
- simgrid::s4u::Host::onCreation.connect(&on
HostC
reation);
+ simgrid::s4u::Host::onCreation.connect(&on
_host_c
reation);
}
}
}
}
@@
-383,7
+387,7
@@
void sg_file_close(sg_file_t fd)
const char* sg_file_get_name(sg_file_t fd)
{
xbt_assert((fd != nullptr), "Invalid file descriptor");
const char* sg_file_get_name(sg_file_t fd)
{
xbt_assert((fd != nullptr), "Invalid file descriptor");
- return fd->get
P
ath();
+ return fd->get
_p
ath();
}
sg_size_t sg_file_get_size(sg_file_t fd)
}
sg_size_t sg_file_get_size(sg_file_t fd)
@@
-398,16
+402,16
@@
void sg_file_dump(sg_file_t fd)
void* sg_file_get_data(sg_file_t fd)
{
void* sg_file_get_data(sg_file_t fd)
{
- return fd->get
U
serdata();
+ return fd->get
_u
serdata();
}
void sg_file_set_data(sg_file_t fd, void* data)
{
}
void sg_file_set_data(sg_file_t fd, void* data)
{
- fd->set
U
serdata(data);
+ fd->set
_u
serdata(data);
}
/**
}
/**
- * \brief Set the file position indicator in the
m
sg_file_t by adding offset bytes
+ * \brief Set the file position indicator in the sg_file_t by adding offset bytes
* to the position specified by origin (either SEEK_SET, SEEK_CUR, or SEEK_END).
*
* \param fd : file object that identifies the stream
* to the position specified by origin (either SEEK_SET, SEEK_CUR, or SEEK_END).
*
* \param fd : file object that identifies the stream
@@
-446,7
+450,7
@@
void sg_file_unlink(sg_file_t fd)
*/
int sg_file_rcopy(sg_file_t file, sg_host_t host, const char* fullpath)
{
*/
int sg_file_rcopy(sg_file_t file, sg_host_t host, const char* fullpath)
{
- return file->remote
C
opy(host, fullpath);
+ return file->remote
_c
opy(host, fullpath);
}
/**
}
/**
@@
-458,27
+462,27
@@
int sg_file_rcopy(sg_file_t file, sg_host_t host, const char* fullpath)
*/
int sg_file_rmove(sg_file_t file, sg_host_t host, const char* fullpath)
{
*/
int sg_file_rmove(sg_file_t file, sg_host_t host, const char* fullpath)
{
- return file->remote
M
ove(host, fullpath);
+ return file->remote
_m
ove(host, fullpath);
}
sg_size_t sg_storage_get_size_free(sg_storage_t st)
{
}
sg_size_t sg_storage_get_size_free(sg_storage_t st)
{
- return st->extension<FileSystemStorageExt>()->get
Size() - st->extension<FileSystemStorageExt>()->getUsedS
ize();
+ return st->extension<FileSystemStorageExt>()->get
_size() - st->extension<FileSystemStorageExt>()->get_used_s
ize();
}
sg_size_t sg_storage_get_size_used(sg_storage_t st)
{
}
sg_size_t sg_storage_get_size_used(sg_storage_t st)
{
- return st->extension<FileSystemStorageExt>()->get
UsedS
ize();
+ return st->extension<FileSystemStorageExt>()->get
_used_s
ize();
}
sg_size_t sg_storage_get_size(sg_storage_t st)
{
}
sg_size_t sg_storage_get_size(sg_storage_t st)
{
- return st->extension<FileSystemStorageExt>()->get
S
ize();
+ return st->extension<FileSystemStorageExt>()->get
_s
ize();
}
xbt_dict_t sg_storage_get_content(sg_storage_t storage)
{
}
xbt_dict_t sg_storage_get_content(sg_storage_t storage)
{
- std::map<std::string, sg_size_t>* content = storage->extension<simgrid::s4u::FileSystemStorageExt>()->get
C
ontent();
+ std::map<std::string, sg_size_t>* content = storage->extension<simgrid::s4u::FileSystemStorageExt>()->get
_c
ontent();
// Note: ::operator delete is ok here (no destructor called) since the dict elements are of POD type sg_size_t.
xbt_dict_t content_as_dict = xbt_dict_new_homogeneous(::operator delete);
// Note: ::operator delete is ok here (no destructor called) since the dict elements are of POD type sg_size_t.
xbt_dict_t content_as_dict = xbt_dict_new_homogeneous(::operator delete);