X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3203ed1f4fb6f4617e94d5351661ba07e8b8f833..600e50aa1f50cbdfd2d20c6b2bcea8a0908d4416:/src/s4u/s4u_file.cpp

diff --git a/src/s4u/s4u_file.cpp b/src/s4u/s4u_file.cpp
index 94a594745d..e63eba2f63 100644
--- a/src/s4u/s4u_file.cpp
+++ b/src/s4u/s4u_file.cpp
@@ -1,58 +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. */
 
-#include "xbt/log.h"
+#include "simgrid/simix.h"
 #include "src/msg/msg_private.h"
-#include "src/msg/msg_mailbox.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");
 
-#include "simgrid/s4u/file.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/simix.h"
-
 namespace simgrid {
 namespace s4u {
 
-File::File(const char*fullpath, void *userdata) {
-	// this cannot fail because we get a xbt_die if the mountpoint does not exist
-	p_inferior = simcall_file_open(fullpath, Host::current()->inferior());
-	p_path = fullpath;
+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
+  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() {
-	simcall_file_close(p_inferior, Host::current()->inferior());
+  //  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) {
-	return simcall_file_read(p_inferior, size, Host::current()->inferior());
+  return simcall_file_read(pimpl_, size, Host::current());
 }
 sg_size_t File::write(sg_size_t size) {
-	return simcall_file_write(p_inferior,size, Host::current()->inferior());
+  return simcall_file_write(pimpl_,size, Host::current());
 }
 sg_size_t File::size() {
-	return simcall_file_get_size(p_inferior);
+  return simcall_file_get_size(pimpl_);
 }
 
 void File::seek(sg_size_t pos) {
-	simcall_file_seek(p_inferior,pos,SEEK_SET);
+  simcall_file_seek(pimpl_,pos,SEEK_SET);
 }
 sg_size_t File::tell() {
-	return simcall_file_tell(p_inferior);
+  return simcall_file_tell(pimpl_);
 }
 void File::move(const char*fullpath) {
-	simcall_file_move(p_inferior,fullpath);
+  simcall_file_move(pimpl_,fullpath);
 }
 void File::unlink() {
-	sg_host_t attached = Host::current()->inferior(); // FIXME: we should check where this file is attached
-	simcall_file_unlink(p_inferior,attached);
+  sg_host_t attached = Host::current(); // FIXME: we should check where this file is attached
+  simcall_file_unlink(pimpl_,attached);
 }
 
 }} // namespace simgrid::s4u