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
try to reduce the ugliness of file management
[simgrid.git]
/
src
/
s4u
/
s4u_file.cpp
diff --git
a/src/s4u/s4u_file.cpp
b/src/s4u/s4u_file.cpp
index
65c4557
..
e63eba2
100644
(file)
--- a/
src/s4u/s4u_file.cpp
+++ b/
src/s4u/s4u_file.cpp
@@
-1,57
+1,61
@@
-/* Copyright (c) 2015
. The SimGrid Team. All rights reserved.
*/
+/* Copyright (c) 2015
-2017. The SimGrid Team. All rights reserved.
*/
/* 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 "
xbt/log
.h"
+#include "
simgrid/simix
.h"
#include "src/msg/msg_private.h"
#include "src/msg/msg_private.h"
+#include "xbt/log.h"
-#include "simgrid/s4u/actor.hpp"
-#include "simgrid/s4u/comm.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/s4u/mailbox.hpp"
+#include "simgrid/s4u/Actor.hpp"
+#include "simgrid/s4u/Comm.hpp"
+#include "simgrid/s4u/File.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
+#include "simgrid/s4u/Storage.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_file,"S4U files");
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_file,"S4U files");
-#include "simgrid/s4u/file.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/simix.h"
-
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
-File::File(const char*fullpath, void *userdata) {
+File::File(const char* fullpath, void* userdata) : path_(fullpath), userdata_(userdata)
+{
// this cannot fail because we get a xbt_die if the mountpoint does not exist
// this cannot fail because we get a xbt_die if the mountpoint does not exist
- inferior_ = simcall_file_open(fullpath, Host::current());
- path_ = fullpath;
+ pimpl_ = simcall_file_open(fullpath, Host::current());
+ xbt_dynar_t info = simcall_file_get_info(pimpl_);
+ storage_type = xbt_dynar_pop_as(info, char*);
+ storageId = xbt_dynar_pop_as(info, char*);
+ mount_point = xbt_dynar_pop_as(info, char*);
}
File::~File() {
}
File::~File() {
- simcall_file_close(inferior_, Host::current());
+ // Host::current()->extension<simgrid::MsgHostExt>()->file_descriptor_table->push_back(desc_id_);
+ simcall_file_close(pimpl_, Host::current());
}
sg_size_t File::read(sg_size_t size) {
}
sg_size_t File::read(sg_size_t size) {
- return simcall_file_read(
inferior
_, size, Host::current());
+ return simcall_file_read(
pimpl
_, size, Host::current());
}
sg_size_t File::write(sg_size_t size) {
}
sg_size_t File::write(sg_size_t size) {
- return simcall_file_write(
inferior
_,size, Host::current());
+ return simcall_file_write(
pimpl
_,size, Host::current());
}
sg_size_t File::size() {
}
sg_size_t File::size() {
- return simcall_file_get_size(
inferior
_);
+ return simcall_file_get_size(
pimpl
_);
}
void File::seek(sg_size_t pos) {
}
void File::seek(sg_size_t pos) {
- simcall_file_seek(
inferior
_,pos,SEEK_SET);
+ simcall_file_seek(
pimpl
_,pos,SEEK_SET);
}
sg_size_t File::tell() {
}
sg_size_t File::tell() {
- return simcall_file_tell(
inferior
_);
+ return simcall_file_tell(
pimpl
_);
}
void File::move(const char*fullpath) {
}
void File::move(const char*fullpath) {
- simcall_file_move(
inferior
_,fullpath);
+ simcall_file_move(
pimpl
_,fullpath);
}
void File::unlink() {
sg_host_t attached = Host::current(); // FIXME: we should check where this file is attached
}
void File::unlink() {
sg_host_t attached = Host::current(); // FIXME: we should check where this file is attached
- simcall_file_unlink(
inferior
_,attached);
+ simcall_file_unlink(
pimpl
_,attached);
}
}} // namespace simgrid::s4u
}
}} // namespace simgrid::s4u