-/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2018. 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 <simgrid/plugins/file_system.h>
#include <simgrid/s4u.hpp>
-#include <src/plugins/file_system/FileSystem.hpp>
#include <string>
#define INMEGA (1024 * 1024)
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2018. 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 <string>
#include <unordered_map>
+#include "simgrid/plugins/file_system.h"
#include "simgrid/s4u.hpp"
-#include "src/plugins/file_system/FileSystem.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "a sample log category");
-/* Copyright (c) 2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2017-2018. 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 "simgrid/s4u.hpp"
-#include "src/plugins/file_system/FileSystem.hpp"
-#include <boost/algorithm/string/join.hpp>
#include <simgrid/plugins/file_system.h>
+#include <simgrid/s4u.hpp>
#include <xbt/replay.hpp>
#include <xbt/str.h>
+#include <boost/algorithm/string/join.hpp>
+
XBT_LOG_NEW_DEFAULT_CATEGORY(replay_storage, "Messages specific for this example");
static std::unordered_map<std::string, simgrid::s4u::File*> opened_files;
-/* Copyright (c) 2017-2018. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2017-2018. 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 <simgrid/forward.h>
#include <xbt/base.h>
+#include <xbt/dict.h>
-SG_BEGIN_DECL()
+// C interface
+////////////////
+SG_BEGIN_DECL()
XBT_PUBLIC void sg_storage_file_system_init();
XBT_PUBLIC sg_file_t sg_file_open(const char* fullpath, void* data);
XBT_PUBLIC sg_size_t sg_file_read(sg_file_t fd, sg_size_t size);
SG_END_DECL()
+// C++ interface
+//////////////////
+
+#ifdef __cplusplus
+#include <xbt/Extendable.hpp>
+
+#include <map>
+#include <string>
+
+namespace simgrid {
+namespace s4u {
+
+/** @brief A simulated file
+ *
+ * Used to simulate the time it takes to access to a file, but does not really store any information.
+ *
+ * They are located on @ref simgrid::s4u::Storage that are accessed from a given @ref simgrid::s4u::Host through
+ * mountpoints.
+ * For now, you cannot change the mountpoints programatically, and must declare them from your platform file.
+ */
+class XBT_PUBLIC File {
+public:
+ File(std::string fullpath, void* userdata);
+ File(std::string fullpath, sg_host_t host, void* userdata);
+ ~File();
+
+ /** Retrieves the path to the file */
+ const char* getPath() { return fullpath_.c_str(); }
+
+ /** Simulates a local read action. Returns the size of data actually read */
+ sg_size_t read(sg_size_t size);
+
+ /** Simulates a write action. Returns the size of data actually written. */
+ sg_size_t write(sg_size_t size);
+
+ /** Allows to store user data on that host */
+ void setUserdata(void* data) { userdata_ = data; }
+ /** Retrieves the previously stored data */
+ void* getUserdata() { return userdata_; }
+
+ sg_size_t size();
+ void seek(sg_offset_t pos); /** Sets the file head to the given position. */
+ void seek(sg_offset_t pos, int origin); /** Sets the file head to the given position from a given origin. */
+ sg_size_t tell(); /** Retrieves the current file position */
+
+ /** Rename a file. WARNING: It is forbidden to move the file to another mount point */
+ void move(std::string fullpath);
+ int remoteCopy(sg_host_t host, const char* fullpath);
+ int remoteMove(sg_host_t host, const char* fullpath);
+
+ int unlink(); /** Remove a file from the contents of a disk */
+ void dump();
+
+ int desc_id = 0;
+ Storage* localStorage;
+ std::string mount_point_;
+
+private:
+ sg_size_t size_;
+ std::string path_;
+ std::string fullpath_;
+ sg_size_t current_position_ = SEEK_SET;
+ void* userdata_ = nullptr;
+};
+
+class XBT_PUBLIC FileSystemStorageExt {
+public:
+ static simgrid::xbt::Extension<Storage, FileSystemStorageExt> EXTENSION_ID;
+ explicit FileSystemStorageExt(Storage* ptr);
+ ~FileSystemStorageExt();
+ std::map<std::string, sg_size_t>* parseContent(std::string filename);
+ std::map<std::string, sg_size_t>* getContent() { return content_; }
+ sg_size_t getSize() { return size_; }
+ sg_size_t getUsedSize() { return usedSize_; }
+ void decrUsedSize(sg_size_t size) { usedSize_ -= size; }
+ void incrUsedSize(sg_size_t size) { usedSize_ += size; }
+
+private:
+ std::map<std::string, sg_size_t>* content_;
+ sg_size_t usedSize_ = 0;
+ sg_size_t size_ = 0;
+};
+
+class XBT_PUBLIC FileDescriptorHostExt {
+public:
+ static simgrid::xbt::Extension<Host, FileDescriptorHostExt> EXTENSION_ID;
+ FileDescriptorHostExt() = default;
+ ~FileDescriptorHostExt() { delete file_descriptor_table; }
+ std::vector<int>* file_descriptor_table = nullptr; // Created lazily on need
+};
+} // namespace s4u
+} // namespace simgrid
+#endif
#endif
+++ /dev/null
-/* Copyright (c) 2006-2018. 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. */
-
-#ifndef SIMGRID_S4U_FILE_HPP
-#define SIMGRID_S4U_FILE_HPP
-
-#include "simgrid/plugins/file_system.h"
-#include <xbt/Extendable.hpp>
-#include <xbt/base.h>
-
-#include <simgrid/simix.h>
-#include <string>
-
-namespace simgrid {
-namespace s4u {
-
-/** @brief A simulated file
- *
- * Used to simulate the time it takes to access to a file, but does not really store any information.
- *
- * They are located on @ref simgrid::s4u::Storage that are accessed from a given @ref simgrid::s4u::Host through
- * mountpoints.
- * For now, you cannot change the mountpoints programatically, and must declare them from your platform file.
- */
-class XBT_PUBLIC File {
-public:
- File(std::string fullpath, void* userdata);
- File(std::string fullpath, sg_host_t host, void* userdata);
- ~File();
-
- /** Retrieves the path to the file */
- const char* getPath() { return fullpath_.c_str(); }
-
- /** Simulates a local read action. Returns the size of data actually read */
- sg_size_t read(sg_size_t size);
-
- /** Simulates a write action. Returns the size of data actually written. */
- sg_size_t write(sg_size_t size);
-
- /** Allows to store user data on that host */
- void setUserdata(void* data) { userdata_ = data; }
- /** Retrieves the previously stored data */
- void* getUserdata() { return userdata_; }
-
- sg_size_t size();
- void seek(sg_offset_t pos); /** Sets the file head to the given position. */
- void seek(sg_offset_t pos, int origin); /** Sets the file head to the given position from a given origin. */
- sg_size_t tell(); /** Retrieves the current file position */
-
- /** Rename a file. WARNING: It is forbidden to move the file to another mount point */
- void move(std::string fullpath);
- int remoteCopy(sg_host_t host, const char* fullpath);
- int remoteMove(sg_host_t host, const char* fullpath);
-
- int unlink(); /** Remove a file from the contents of a disk */
- void dump();
-
- int desc_id = 0;
- Storage* localStorage;
- std::string mount_point_;
-
-private:
- sg_size_t size_;
- std::string path_;
- std::string fullpath_;
- sg_size_t current_position_ = SEEK_SET;
- void* userdata_ = nullptr;
-};
-
-class XBT_PUBLIC FileSystemStorageExt {
-public:
- static simgrid::xbt::Extension<Storage, FileSystemStorageExt> EXTENSION_ID;
- explicit FileSystemStorageExt(Storage* ptr);
- ~FileSystemStorageExt();
- std::map<std::string, sg_size_t>* parseContent(std::string filename);
- std::map<std::string, sg_size_t>* getContent() { return content_; }
- sg_size_t getSize() { return size_; }
- sg_size_t getUsedSize() { return usedSize_; }
- void decrUsedSize(sg_size_t size) { usedSize_ -= size; }
- void incrUsedSize(sg_size_t size) { usedSize_ += size; }
-private:
- std::map<std::string, sg_size_t>* content_;
- sg_size_t usedSize_ = 0;
- sg_size_t size_ = 0;
-};
-
-class XBT_PUBLIC FileDescriptorHostExt {
-public:
- static simgrid::xbt::Extension<Host, FileDescriptorHostExt> EXTENSION_ID;
- FileDescriptorHostExt() = default;
- ~FileDescriptorHostExt() { delete file_descriptor_table; }
- std::vector<int>* file_descriptor_table = nullptr; // Created lazily on need
-};
-}
-} // namespace simgrid::s4u
-
-#endif /* SIMGRID_S4U_HOST_HPP */
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2018. 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/plugins/file_system.h"
#include "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.hpp"
-#include "src/plugins/file_system/FileSystem.hpp"
#include "src/surf/HostImpl.hpp"
#include <algorithm>
#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/msg.h"
+#include "simgrid/plugins/file_system.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "simgrid/simix.hpp"
-#include "src/plugins/file_system/FileSystem.hpp"
#include "src/surf/StorageImpl.hpp"
#include <unordered_map>
-/* Copyright (c) 2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2015-2018. 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. */
* and the MC does not find the counter-example.
*/
-#include "mc/mc.h"
+#include "simgrid/modelchecker.h"
#include "simgrid/msg.h"
#include <xbt/synchro.h>
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2018. 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 "simgrid/s4u.hpp"
-#include "src/plugins/file_system/FileSystem.hpp"
-#include <string>
+#include <simgrid/plugins/file_system.h>
+#include <simgrid/s4u.hpp>
#include <xbt/string.hpp>
+#include <string>
+
XBT_LOG_NEW_DEFAULT_CATEGORY(storage, "Messages specific for this simulation");
static void display_storage_properties(simgrid::s4u::Storage* storage)
-/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2018. 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. */
//teshsuite/simdag/platforms/evaluate_parse_time ../examples/platforms/nancy.xml
#include <stdio.h>
-#include "src/internal_config.h"
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
#include "simgrid/simdag.h"
#include "xbt/xbt_os_time.h"
printf("Workstation number: %zu, link number: %d\n", sg_host_count(), sg_link_count());
if(argv[2]){
printf("Wait for %ss\n",argv[2]);
- sleep(atoi(argv[2]));
+ xbt_os_sleep(atoi(argv[2]));
}
-/* Copyright (c) 2012-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2012-2018. 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 "src/internal_config.h" // HAVE_FUTEX_H
+#include "xbt/parmap.hpp"
#include <simgrid/msg.h>
#include <xbt.h>
-#include <xbt/parmap.hpp>
#include <cstdlib>
#include <numeric> // std::iota
)
set(PLUGINS_SRC
- src/plugins/file_system/FileSystem.hpp
src/plugins/file_system/s4u_FileSystem.cpp
src/plugins/vm/VirtualMachineImpl.hpp
src/plugins/vm/s4u_VirtualMachine.cpp
