#include "storage_interface.hpp"
#include "surf_private.h"
#include "xbt/file.h" /* xbt_getline */
+#include <boost/algorithm/string/join.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
xbt_lib_t file_lib;
+int MSG_FILE_LEVEL = -1; // Msg file level
+
xbt_lib_t storage_lib;
-int ROUTING_STORAGE_LEVEL = -1; //Routing for storagelevel
-int ROUTING_STORAGE_HOST_LEVEL = -1;
+int SIMIX_STORAGE_LEVEL = -1; // Simix storage level
+int MSG_STORAGE_LEVEL = -1; // Msg storage level
+int ROUTING_STORAGE_LEVEL = -1; // Routing for storage level
int SURF_STORAGE_LEVEL = -1;
xbt_lib_t storage_type_lib;
int ROUTING_STORAGE_TYPE_LEVEL = -1; //Routing for storage_type level
StorageModel::StorageModel(): Model()
{
+ maxminSystem_ = lmm_system_new(true /* lazy update */);
}
StorageModel::~StorageModel(){
* Resource *
************/
-Storage::Storage(Model *model, const char *name, xbt_dict_t props,
- const char* type_id, const char *content_name, const char *content_type,
- sg_size_t size)
- : Resource(model, name)
- , PropertyHolder(props)
- , contentType_(xbt_strdup(content_type))
- , size_(size), usedSize_(0)
- , typeId_(xbt_strdup(type_id))
- , writeActions_(std::vector<StorageAction*>())
-{
- content_ = parseContent(content_name);
- turnOn();
-}
-
-Storage::Storage(Model *model, const char *name, xbt_dict_t props,
- lmm_system_t maxminSystem, double bread, double bwrite,
- double bconnection, const char* type_id, const char *content_name,
- const char *content_type, sg_size_t size, const char *attach)
- : Resource(model, name, lmm_constraint_new(maxminSystem, this, bconnection))
- , PropertyHolder(props)
- , contentType_(xbt_strdup(content_type))
- , size_(size), usedSize_(0)
- , typeId_(xbt_strdup(type_id))
- , writeActions_(std::vector<StorageAction*>())
+Storage::Storage(Model* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite,
+ double bconnection, const char* type_id, const char* content_name, const char* content_type,
+ sg_size_t size, const char* attach)
+ : Resource(model, name, lmm_constraint_new(maxminSystem, this, bconnection))
+ , contentType_(xbt_strdup(content_type))
+ , size_(size)
+ , usedSize_(0)
+ , typeId_(xbt_strdup(type_id))
+ , writeActions_(std::vector<StorageAction*>())
{
content_ = parseContent(content_name);
attach_ = xbt_strdup(attach);
xbt_dict_t parse_content = xbt_dict_new_homogeneous(xbt_free_f);
FILE *file = surf_fopen(filename, "r");
- xbt_assert(file, "Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":"));
+ xbt_assert(file, "Cannot open file '%s' (path=%s)", filename, (boost::join(surf_path, ":")).c_str());
char *line = nullptr;
size_t len = 0;
/**********
* Action *
**********/
-StorageAction::StorageAction(Model *model, double cost, bool failed,
- Storage *storage, e_surf_action_storage_type_t type)
-: Action(model, cost, failed)
-, m_type(type), p_storage(storage), p_file(nullptr){
- progress = 0;
+StorageAction::StorageAction(Model* model, double cost, bool failed, Storage* storage,
+ e_surf_action_storage_type_t type)
+ : Action(model, cost, failed), type_(type), storage_(storage), file_(nullptr)
+{
+ progress_ = 0;
};
-StorageAction::StorageAction(Model *model, double cost, bool failed, lmm_variable_t var,
- Storage *storage, e_surf_action_storage_type_t type)
- : Action(model, cost, failed, var)
- , m_type(type), p_storage(storage), p_file(nullptr){
- progress = 0;
+StorageAction::StorageAction(Model* model, double cost, bool failed, lmm_variable_t var, Storage* storage,
+ e_surf_action_storage_type_t type)
+ : Action(model, cost, failed, var), type_(type), storage_(storage), file_(nullptr)
+{
+ progress_ = 0;
}
void StorageAction::setState(Action::State state){