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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
s4u
/
s4u_file.cpp
diff --git
a/src/s4u/s4u_file.cpp
b/src/s4u/s4u_file.cpp
index
7f9a7d5
..
043f6d5
100644
(file)
--- a/
src/s4u/s4u_file.cpp
+++ b/
src/s4u/s4u_file.cpp
@@
-19,15
+19,15
@@
namespace s4u {
File::File(const char* fullpath, void* userdata) : File(fullpath, Host::current(), userdata){};
File::File(const char* 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(const char* 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, host->
getC
name());
- for (auto mnt : host->
m
ountedStorages()) {
+ for (auto mnt : host->
getM
ountedStorages()) {
XBT_DEBUG("See '%s'", mnt.first.c_str());
mount_point = std::string(fullpath).substr(0, mnt.first.size());
XBT_DEBUG("See '%s'", mnt.first.c_str());
mount_point = std::string(fullpath).substr(0, mnt.first.size());
@@
-41,31
+41,27
@@
File::File(const char* fullpath, sg_host_t host, void* userdata) : path_(fullpat
mount_point = std::string(fullpath).substr(0, longest_prefix_length);
path = std::string(fullpath).substr(longest_prefix_length, strlen(fullpath));
} else
mount_point = std::string(fullpath).substr(0, longest_prefix_length);
path = std::string(fullpath).substr(longest_prefix_length, strlen(fullpath));
} 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, 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()
@@
-90,17
+86,12
@@
sg_size_t File::tell()
void File::move(const char* fullpath)
{
void File::move(const char* fullpath)
{
- sim
call_file_move(pimpl_,fullpath
);
+ sim
grid::simix::kernelImmediate([this, fullpath] { pimpl_->move(fullpath); }
);
}
int File::unlink()
{
}
int File::unlink()
{
- return simgrid::simix::kernelImmediate([this] { return pimpl_->unlink(Host::current()); });
-}
-
-int File::unlink(sg_host_t host)
-{
- return simgrid::simix::kernelImmediate([this, host] { return pimpl_->unlink(host); });
+ return simgrid::simix::kernelImmediate([this] { return pimpl_->unlink(); });
}
}} // namespace simgrid::s4u
}
}} // namespace simgrid::s4u