#include "storage_interface.hpp"
#include "surf_private.h"
-#include "xbt/file.h" /* xbt_getline */
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/join.hpp>
#include <boost/algorithm/string/split.hpp>
************/
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))
+ const char* type_id, const char* content_name, sg_size_t size, const char* attach)
+ : Resource(model, name, lmm_constraint_new(maxminSystem, this, MAX(bread, bwrite)))
, size_(size)
, usedSize_(0)
, typeId_(xbt_strdup(type_id))
content_ = parseContent(content_name);
attach_ = xbt_strdup(attach);
turnOn();
- XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
+ XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
constraintRead_ = lmm_constraint_new(maxminSystem, this, bread);
constraintWrite_ = lmm_constraint_new(maxminSystem, this, bwrite);
}
delete content_;
}
free(typeId_);
- free(contentType_);
free(attach_);
}
return false;
}
-void Storage::apply_event(tmgr_trace_iterator_t /*event*/, double /*value*/)
+void Storage::apply_event(tmgr_trace_event_t /*event*/, double /*value*/)
{
THROW_UNIMPLEMENTED;
}