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
Leak-- (seen in maestro-set).
[simgrid.git]
/
src
/
s4u
/
s4u_file.cpp
diff --git
a/src/s4u/s4u_file.cpp
b/src/s4u/s4u_file.cpp
index
5eaf55c
..
14c73e0
100644
(file)
--- a/
src/s4u/s4u_file.cpp
+++ b/
src/s4u/s4u_file.cpp
@@
-17,19
+17,19
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_file,"S4U files");
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
-File::File(
const char*
fullpath, void* userdata) : File(fullpath, Host::current(), userdata){};
+File::File(
std::string
fullpath, void* userdata) : File(fullpath, Host::current(), userdata){};
-File::File(
const char* fullpath, sg_host_t host, void* userdata) : path_(fullpath), userdata_(userdata), host_(host
)
+File::File(
std::string fullpath, sg_host_t host, void* userdata) : path_(fullpath), userdata_(userdata
)
{
// this cannot fail because we get a xbt_die if the mountpoint does not exist
Storage* st = nullptr;
size_t longest_prefix_length = 0;
std::string path;
{
// this cannot fail because we get a xbt_die if the mountpoint does not exist
Storage* st = nullptr;
size_t longest_prefix_length = 0;
std::string path;
- XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath
, host->c
name());
+ XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath
.c_str(), host->getC
name());
- for (auto
mnt : host->m
ountedStorages()) {
+ for (auto
const& mnt : host->getM
ountedStorages()) {
XBT_DEBUG("See '%s'", mnt.first.c_str());
XBT_DEBUG("See '%s'", mnt.first.c_str());
- mount_point =
std::string(fullpath).substr(0, mnt.first.size
());
+ mount_point =
fullpath.substr(0, mnt.first.length
());
if (mount_point == mnt.first && mnt.first.length() > longest_prefix_length) {
/* The current mount name is found in the full path and is bigger than the previous*/
if (mount_point == mnt.first && mnt.first.length() > longest_prefix_length) {
/* The current mount name is found in the full path and is bigger than the previous*/
@@
-38,34
+38,30
@@
File::File(const char* fullpath, sg_host_t host, void* userdata) : path_(fullpat
}
}
if (longest_prefix_length > 0) { /* Mount point found, split fullpath into mount_name and path+filename*/
}
}
if (longest_prefix_length > 0) { /* Mount point found, split fullpath into mount_name and path+filename*/
- mount_point =
std::string(fullpath)
.substr(0, longest_prefix_length);
- path =
std::string(fullpath).substr(longest_prefix_length, strlen(fullpath
));
+ mount_point =
fullpath
.substr(0, longest_prefix_length);
+ path =
fullpath.substr(longest_prefix_length, fullpath.length(
));
} else
} else
- xbt_die("Can't find mount point for '%s' on '%s'", fullpath
, host->c
name());
+ xbt_die("Can't find mount point for '%s' on '%s'", fullpath
.c_str(), host->getC
name());
- pimpl_ = simcall_file_open(mount_point.c_str(), path.c_str(), st);
- storage_type = st->type();
- storageId = st->name();
+ pimpl_ =
+ simgrid::simix::kernelImmediate([this, st, path] { return new simgrid::surf::FileImpl(st, path, mount_point); });
+ storage_type = st->getType();
+ storageId = st->getName();
}
File::~File()
{
}
File::~File()
{
- sim
call_file_close(pimpl_, host_
);
+ sim
grid::simix::kernelImmediate([this] { delete pimpl_; }
);
}
sg_size_t File::read(sg_size_t size)
{
}
sg_size_t File::read(sg_size_t size)
{
- return simcall_file_read(pimpl_, size
, Host::current()
);
+ return simcall_file_read(pimpl_, size);
}
sg_size_t File::write(sg_size_t size)
{
}
sg_size_t File::write(sg_size_t size)
{
- return simcall_file_write(pimpl_,size, Host::current());
-}
-
-sg_size_t File::write(sg_size_t size, sg_host_t host)
-{
- return simcall_file_write(pimpl_, size, host);
+ return simcall_file_write(pimpl_, size);
}
sg_size_t File::size()
}
sg_size_t File::size()
@@
-73,29
+69,29
@@
sg_size_t File::size()
return simgrid::simix::kernelImmediate([this] { return pimpl_->size(); });
}
return simgrid::simix::kernelImmediate([this] { return pimpl_->size(); });
}
-void File::seek(sg_
size
_t pos)
+void File::seek(sg_
offset
_t pos)
{
simgrid::simix::kernelImmediate([this, pos] { pimpl_->seek(pos, SEEK_SET); });
}
{
simgrid::simix::kernelImmediate([this, pos] { pimpl_->seek(pos, SEEK_SET); });
}
-
sg_size_t File::tell(
)
+
void File::seek(sg_offset_t pos, int origin
)
{
{
-
return simgrid::simix::kernelImmediate([this] { return pimpl_->tell(
); });
+
simgrid::simix::kernelImmediate([this, pos, origin] { pimpl_->seek(pos, origin
); });
}
}
-
void File::move(const char* fullpath
)
+
sg_size_t File::tell(
)
{
{
-
simcall_file_move(pimpl_,fullpath
);
+
return simgrid::simix::kernelImmediate([this] { return pimpl_->tell(); }
);
}
}
-void File::
unlink(
)
+void File::
move(std::string fullpath
)
{
{
- sim
call_file_unlink(pimpl_, Host::current()
);
+ sim
grid::simix::kernelImmediate([this, fullpath] { pimpl_->move(fullpath); }
);
}
}
-
void File::unlink(sg_host_t host
)
+
int File::unlink(
)
{
{
-
simcall_file_unlink(pimpl_, host
);
+
return simgrid::simix::kernelImmediate([this] { return pimpl_->unlink(); }
);
}
}} // namespace simgrid::s4u
}
}} // namespace simgrid::s4u