File::File(const std::string& fullpath, void* userdata) : File(fullpath, Host::current(), userdata){};
-File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpath_(fullpath), userdata_(userdata)
+File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpath_(fullpath)
{
+ this->set_data(userdata);
// this cannot fail because we get a xbt_die if the mountpoint does not exist
if (not host->get_mounted_storages().empty()) {
Storage* st = nullptr;
if (sg_storage_get_size_used(local_storage_) >= sg_storage_get_size(local_storage_))
return 0;
if (write_inside == 0) {
- /* Substract the part of the file that might disappear from the used sized on the storage element */
+ /* Subtract the part of the file that might disappear from the used sized on the storage element */
local_storage_->extension<FileSystemStorageExt>()->decr_used_size(size_ - current_position_);
write_size = local_storage_->write(size);
local_storage_->extension<FileSystemStorageExt>()->incr_used_size(write_size);
if (sg_disk_get_size_used(local_disk_) >= sg_disk_get_size(local_disk_))
return 0;
if (write_inside == 0) {
- /* Substract the part of the file that might disappear from the used sized on the storage element */
+ /* Subtract the part of the file that might disappear from the used sized on the storage element */
local_disk_->extension<FileSystemDiskExt>()->decr_used_size(size_ - current_position_);
write_size = local_disk_->write(size);
local_disk_->extension<FileSystemDiskExt>()->incr_used_size(write_size);
void* sg_file_get_data(sg_file_t fd)
{
- return fd->get_userdata();
+ return fd->get_data();
}
void sg_file_set_data(sg_file_t fd, void* data)
{
- fd->set_userdata(data);
+ fd->set_data(data);
}
/**
for (auto const& entry : *content) {
sg_size_t* psize = new sg_size_t;
*psize = entry.second;
- xbt_dict_set(content_as_dict, entry.first.c_str(), psize, nullptr);
+ xbt_dict_set(content_as_dict, entry.first.c_str(), psize);
}
return content_as_dict;
}
xbt_assert((host != nullptr), "Invalid parameters");
xbt_dict_t contents = xbt_dict_new_homogeneous(nullptr);
for (auto const& elm : host->get_mounted_storages())
- xbt_dict_set(contents, elm.first.c_str(), sg_storage_get_content(elm.second), nullptr);
+ xbt_dict_set(contents, elm.first.c_str(), sg_storage_get_content(elm.second));
return contents;
}