#ifndef SIMGRID_PLUGINS_FILE_SYSTEM_H_
#define SIMGRID_PLUGINS_FILE_SYSTEM_H_
+#include <simgrid/config.h>
#include <simgrid/forward.h>
#include <xbt/base.h>
#include <xbt/dict.h>
// C interface
////////////////
-typedef sg_file_t msg_file_t; // MSG backwards compatibility
SG_BEGIN_DECL
XBT_PUBLIC void sg_storage_file_system_init();
XBT_PUBLIC const char* sg_file_get_name(const_sg_file_t fd);
XBT_PUBLIC sg_size_t sg_file_get_size(const_sg_file_t fd);
-XBT_PUBLIC void sg_file_dump(sg_file_t fd);
+XBT_PUBLIC void sg_file_dump(const_sg_file_t fd);
XBT_PUBLIC void* sg_file_get_data(const_sg_file_t fd);
XBT_PUBLIC void sg_file_set_data(sg_file_t fd, void* data);
XBT_PUBLIC void sg_file_seek(sg_file_t fd, sg_offset_t offset, int origin);
XBT_PUBLIC xbt_dict_t sg_host_get_storage_content(sg_host_t host);
+#if SIMGRID_HAVE_MSG
+
+typedef sg_file_t msg_file_t; // MSG backwards compatibility
+
#define MSG_file_open(fullpath, data) sg_file_open((fullpath), (data))
#define MSG_file_read(fd, size) sg_file_read((fd), (size))
#define MSG_file_write(fd, size) sg_file_write((fd), (size))
#define MSG_host_get_storage_content(st) sg_host_get_storage_content(st)
+#endif // SIMGRID_HAVE_MSG
+
SG_END_DECL
// C++ interface
* For now, you cannot change the mountpoints programmatically, and must declare them from your platform file.
*/
class XBT_PUBLIC File : public xbt::Extendable<File> {
- sg_size_t size_;
+ sg_size_t size_ = 0;
std::string path_;
std::string fullpath_;
sg_size_t current_position_ = SEEK_SET;
/** Rename a file. WARNING: It is forbidden to move the file to another mount point */
void move(const std::string& fullpath) const;
- int remote_copy(sg_host_t host, const char* fullpath);
- int remote_move(sg_host_t host, const char* fullpath);
+ int remote_copy(sg_host_t host, const std::string& fullpath);
+ int remote_move(sg_host_t host, const std::string& fullpath);
int unlink() const; /** Remove a file from the contents of a disk */
void dump() const;
};
class XBT_PUBLIC FileSystemDiskExt {
- std::unique_ptr<std::map<std::string, sg_size_t>> content_;
+ std::unique_ptr<std::map<std::string, sg_size_t, std::less<>>> content_;
std::map<Host*, std::string> remote_mount_points_;
std::string mount_point_;
sg_size_t used_size_ = 0;
explicit FileSystemDiskExt(const Disk* ptr);
FileSystemDiskExt(const FileSystemDiskExt&) = delete;
FileSystemDiskExt& operator=(const FileSystemDiskExt&) = delete;
- std::map<std::string, sg_size_t>* parse_content(const std::string& filename);
- std::map<std::string, sg_size_t>* get_content() const { return content_.get(); }
+ std::map<std::string, sg_size_t, std::less<>>* parse_content(const std::string& filename);
+ std::map<std::string, sg_size_t, std::less<>>* get_content() const { return content_.get(); }
const char* get_mount_point() const { return mount_point_.c_str(); }
const char* get_mount_point(s4u::Host* remote_host) { return remote_mount_points_[remote_host].c_str(); }
void add_remote_mount(Host* host, const std::string& mount_point)
};
class XBT_PUBLIC FileSystemStorageExt {
- std::unique_ptr<std::map<std::string, sg_size_t>> content_;
+ std::unique_ptr<std::map<std::string, sg_size_t, std::less<>>> content_;
sg_size_t used_size_ = 0;
sg_size_t size_ = 0;
explicit FileSystemStorageExt(const Storage* ptr);
FileSystemStorageExt(const FileSystemStorageExt&) = delete;
FileSystemStorageExt& operator=(const FileSystemStorageExt&) = delete;
- std::map<std::string, sg_size_t>* parse_content(const std::string& filename);
- std::map<std::string, sg_size_t>* get_content() { return content_.get(); }
+ std::map<std::string, sg_size_t, std::less<>>* parse_content(const std::string& filename);
+ std::map<std::string, sg_size_t, std::less<>>* get_content() { return content_.get(); }
sg_size_t get_size() const { return size_; }
sg_size_t get_used_size() const { return used_size_; }
void decr_used_size(sg_size_t size);