#endif
// ========= storage related functions ============
-/** @brief Return the list of mount point names on a host.
- * @param host a host
- * @return a dict containing all mount point on the host (mount_name => sg_storage_t)
- */
-XBT_PUBLIC xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host);
-
-/** @brief Return the list of storages attached to a host.
- * @param host a host
- * @return a dynar containing all storages (name) attached to the host
- */
-XBT_PUBLIC xbt_dynar_t sg_host_get_attached_storage_list(const_sg_host_t host);
XBT_PUBLIC void sg_host_get_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks);
// =========== user-level functions ===============
/** @ingroup SURF_interface
* @brief SURF resource interface class
- * @details This is the ancestor class of every resources in SimGrid, such as links, CPU or storage
+ * @details This is the ancestor class of every resources in SimGrid, such as links, CPU or disk
*/
class XBT_PUBLIC Resource {
std::string name_;
#define MSG_file_rmove(file, host, fullpath) sg_file_rmove((file), (host), (fullpath))
#define MSG_storage_file_system_init() sg_storage_file_system_init()
-#define MSG_storage_get_free_size(st) sg_storage_get_size_free(st)
-#define MSG_storage_get_used_size(st) sg_storage_get_size_used(st)
-#define MSG_storage_get_size(st) sg_storage_get_size(st)
-#define MSG_storage_get_content(st) sg_storage_get_content(st)
-
-#define MSG_host_get_storage_content(st) sg_host_get_storage_content(st)
#endif // SIMGRID_HAVE_MSG
*
* 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 programmatically, and must declare them from your platform file.
+ * They are located on @ref simgrid::s4u::Disk that are accessed from a given @ref simgrid::s4u::Host
*/
class XBT_PUBLIC File : public xbt::Extendable<File> {
sg_size_t size_ = 0;
#define SD_route_get_latency sg_host_get_route_latency
#define SD_route_get_bandwidth sg_host_get_route_bandwidth
-#define SD_workstation_get_mounted_storage_list sg_host_get_mounted_storage_list // XBT_ATTRIB_DEPRECATED_v330
// Lost functions
//SD_workstation_get_access_mode
//SD_workstation_set_access_mode
/** @brief a PropertyHolder can be given a set of textual properties
*
- * Common PropertyHolders are elements of the platform file, such as Host, Link or Storage.
+ * Common PropertyHolders are elements of the platform file, such as Host, Link, or Disk.
*/
class PropertyHolder { // DO NOT DERIVE THIS CLASS, or the diamond inheritance mayhem will get you
std::unique_ptr<std::unordered_map<std::string, std::string>> properties_ = nullptr;
JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber (JNIEnv *env, jobject jhost);
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getProperty(JNIEnv *env, jobject jhost, jobject jname);
JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname, jobject jvalue);
-JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getMountedStorage(JNIEnv * env, jobject jhost);
-JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getAttachedStorage(JNIEnv * env, jobject jhost);
-JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getStorageContent(JNIEnv * env, jobject jhost);
JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv *env, jclass cls);
JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setAsyncMailbox(JNIEnv * env, jclass cls_arg, jobject jname);
lmm::Constraint* get_read_constraint() const { return constraint_read_; }
lmm::Constraint* get_write_constraint() const { return constraint_write_; }
- /** @brief Check if the Storage is used (if an action currently uses its resources) */
+ /** @brief Check if the Disk is used (if an action currently uses its resources) */
bool is_used() const override;
void apply_event(profile::Event* event, double value) override;
void turn_on() override;
/**
* @brief diskAction constructor
*
- * @param model The StorageModel associated to this DiskAction
+ * @param model The DiskModel associated to this DiskAction
* @param cost The cost of this DiskAction in bytes
* @param failed [description]
* @param var The lmm variable associated to this DiskAction if it is part of a LMM component
- * @param storage The Storage associated to this DiskAction
+ * @param disk The Disk associated to this DiskAction
* @param type [description]
*/
DiskAction(kernel::resource::Model* model, double cost, bool failed, kernel::lmm::Variable* var, DiskImpl* disk,
************/
/** @ingroup SURF_host_interface
* @brief SURF Host interface class
- * @details A host represents a machine with an aggregation of a Cpu, a RoutingEdge and a Storage
+ * @details A host represents a machine with an aggregation of a Cpu, a RoutingEdge and Disk(s)
*/
class XBT_PRIVATE HostImpl : public xbt::PropertyHolder {
std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
double lat;
};
-class StorageCreationArgs {
-public:
- std::string filename;
- int lineno;
- std::string id;
- std::string type_id;
- std::string content;
- std::unordered_map<std::string, std::string>* properties;
- std::string attach;
-};
-
-class StorageTypeCreationArgs {
-public:
- std::string id;
- std::string model;
- std::string content;
- std::unordered_map<std::string, std::string>* properties;
- std::unordered_map<std::string, std::string>* model_properties;
- sg_size_t size;
-};
-
class DiskCreationArgs {
public:
std::string id;
double write_bw;
};
-class MountCreationArgs {
-public:
- std::string storageId;
- std::string name;
-};
-
class ProfileCreationArgs {
public:
std::string id;
