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
Action::finish() is never used without setState().
[simgrid.git]
/
src
/
surf
/
surf_interface.hpp
diff --git
a/src/surf/surf_interface.hpp
b/src/surf/surf_interface.hpp
index
8ab050f
..
0d3c6fd
100644
(file)
--- a/
src/surf/surf_interface.hpp
+++ b/
src/surf/surf_interface.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
6
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
7
. 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. */
@@
-25,7
+25,6
@@
/* user-visible parameters */
extern XBT_PRIVATE double sg_tcp_gamma;
/* user-visible parameters */
extern XBT_PRIVATE double sg_tcp_gamma;
-extern XBT_PRIVATE double sg_sender_gap;
extern XBT_PRIVATE double sg_latency_factor;
extern XBT_PRIVATE double sg_bandwidth_factor;
extern XBT_PRIVATE double sg_weight_S_parameter;
extern XBT_PRIVATE double sg_latency_factor;
extern XBT_PRIVATE double sg_bandwidth_factor;
extern XBT_PRIVATE double sg_weight_S_parameter;
@@
-42,9
+41,6
@@
XBT_PUBLIC(double) surf_get_clock();
*/
XBT_PUBLIC_DATA(std::vector<sg_host_t>) host_that_restart;
*/
XBT_PUBLIC_DATA(std::vector<sg_host_t>) host_that_restart;
-
-extern XBT_PRIVATE double sg_sender_gap;
-
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
@@
-122,8
+118,12
@@
public:
/** @brief Destructor */
virtual ~Action();
/** @brief Destructor */
virtual ~Action();
- /** @brief Mark that the action is now finished */
- void finish();
+ /**
+ * @brief Mark that the action is now finished
+ *
+ * @param state the new [state](\ref simgrid::surf::Action::State) of the current Action
+ */
+ void finish(Action::State state);
/** @brief Get the [state](\ref simgrid::surf::Action::State) of the current Action */
Action::State getState(); /**< get the state*/
/** @brief Get the [state](\ref simgrid::surf::Action::State) of the current Action */
Action::State getState(); /**< get the state*/
@@
-367,7
+367,7
@@
public:
* @param name The name of the Resource
* @param constraint The lmm constraint associated to this Resource if it is part of a LMM component
*/
* @param name The name of the Resource
* @param constraint The lmm constraint associated to this Resource if it is part of a LMM component
*/
- Resource(Model *
model, const char *
name, lmm_constraint_t constraint);
+ Resource(Model *
model, const std::string&
name, lmm_constraint_t constraint);
virtual ~Resource();
virtual ~Resource();
@@
-416,13
+416,9
@@
protected:
}
namespace std {
}
namespace std {
- template <>
- struct hash<simgrid::surf::Resource>
- {
- std::size_t operator()(const simgrid::surf::Resource& r) const
- {
- return (std::size_t) xbt_str_hash(r.cname());
- }
+template <> class hash<simgrid::surf::Resource> {
+public:
+ std::size_t operator()(const simgrid::surf::Resource& r) const { return (std::size_t)xbt_str_hash(r.cname()); }
};
}
};
}