A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better message for this exception
[simgrid.git]
/
src
/
surf
/
StorageImpl.cpp
diff --git
a/src/surf/StorageImpl.cpp
b/src/surf/StorageImpl.cpp
index
5df10ec
..
55a31bd
100644
(file)
--- a/
src/surf/StorageImpl.cpp
+++ b/
src/surf/StorageImpl.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-201
9
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-20,7
+20,7
@@
namespace surf {
* Model *
*********/
* Model *
*********/
-StorageModel::StorageModel() : Model(Model::UpdateAlgo::F
ull
)
+StorageModel::StorageModel() : Model(Model::UpdateAlgo::F
ULL
)
{
set_maxmin_system(new simgrid::kernel::lmm::System(true /* selective update */));
}
{
set_maxmin_system(new simgrid::kernel::lmm::System(true /* selective update */));
}
@@
-34,15
+34,15
@@
StorageModel::~StorageModel()
* Resource *
************/
* Resource *
************/
-StorageImpl::StorageImpl(kernel::resource::Model* model,
std::string
name, kernel::lmm::System* maxminSystem,
+StorageImpl::StorageImpl(kernel::resource::Model* model,
const std::string&
name, kernel::lmm::System* maxminSystem,
double bread, double bwrite, std::string type_id, std::string content_name, sg_size_t size,
std::string attach)
double bread, double bwrite, std::string type_id, std::string content_name, sg_size_t size,
std::string attach)
- : Resource(model, name
.c_str()
, maxminSystem->constraint_new(this, std::max(bread, bwrite)))
+ : Resource(model, name, maxminSystem->constraint_new(this, std::max(bread, bwrite)))
, piface_(name, this)
, piface_(name, this)
- , typeId_(
type_id
)
- , content_name(
content_name
)
+ , typeId_(
std::move(type_id)
)
+ , content_name(
std::move(content_name)
)
, size_(size)
, size_(size)
- , attach_(
attach
)
+ , attach_(
std::move(attach)
)
{
StorageImpl::turn_on();
XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
{
StorageImpl::turn_on();
XBT_DEBUG("Create resource with Bread '%f' Bwrite '%f' and Size '%llu'", bread, bwrite, size);
@@
-71,17
+71,16
@@
void StorageImpl::destroy()
bool StorageImpl::is_used()
{
THROW_UNIMPLEMENTED;
bool StorageImpl::is_used()
{
THROW_UNIMPLEMENTED;
- return false;
}
}
-void StorageImpl::apply_event(
tmgr_trace_event_t
/*event*/, double /*value*/)
+void StorageImpl::apply_event(
kernel::profile::Event*
/*event*/, double /*value*/)
{
THROW_UNIMPLEMENTED;
}
void StorageImpl::turn_on()
{
{
THROW_UNIMPLEMENTED;
}
void StorageImpl::turn_on()
{
- if (
is_off
()) {
+ if (
not is_on
()) {
Resource::turn_on();
s4u::Storage::on_state_change(this->piface_);
}
Resource::turn_on();
s4u::Storage::on_state_change(this->piface_);
}