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
allow to cancel a s4u::Exec
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Exec.hpp
diff --git
a/include/simgrid/s4u/Exec.hpp
b/include/simgrid/s4u/Exec.hpp
index
ca7ed92
..
b47ac41
100644
(file)
--- a/
include/simgrid/s4u/Exec.hpp
+++ b/
include/simgrid/s4u/Exec.hpp
@@
-26,34
+26,44
@@
public:
Activity* start() override;
Activity* wait() override;
Activity* wait(double timeout) override;
Activity* start() override;
Activity* wait() override;
Activity* wait(double timeout) override;
+ Activity* cancel() override;
bool test();
ExecPtr set_priority(double priority);
ExecPtr set_bound(double bound);
ExecPtr set_host(Host* host);
bool test();
ExecPtr set_priority(double priority);
ExecPtr set_bound(double bound);
ExecPtr set_host(Host* host);
+ ExecPtr set_name(std::string name);
+ ExecPtr set_tracing_category(std::string category);
Host* get_host();
double get_remaining() override;
double get_remaining_ratio();
//////////////// Deprecated functions
Host* get_host();
double get_remaining() override;
double get_remaining_ratio();
//////////////// Deprecated functions
+ /** @deprecated See Exec::set_priority() */
XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_priority()") ExecPtr setPriority(double priority)
{
return set_priority(priority);
}
XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_priority()") ExecPtr setPriority(double priority)
{
return set_priority(priority);
}
+ /** @deprecated See Exec::set_bound() */
XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_bound()") ExecPtr setBound(double bound) { return set_bound(bound); }
XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_bound()") ExecPtr setBound(double bound) { return set_bound(bound); }
+ /** @deprecated See Exec::set_host() */
XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_host()") ExecPtr setHost(Host* host) { return set_host(host); }
XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_host()") ExecPtr setHost(Host* host) { return set_host(host); }
+ /** @deprecated See Exec::get_host() */
XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_host()") Host* getHost() { return get_host(); }
XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_host()") Host* getHost() { return get_host(); }
+ /** @deprecated See Exec::get_remaining_ratio() */
XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_remaining_ratio()") double getRemainingRatio()
{
return get_remaining_ratio();
}
private:
XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_remaining_ratio()") double getRemainingRatio()
{
return get_remaining_ratio();
}
private:
- Host* host_ = nullptr;
- double flops_amount_ = 0.0;
- double priority_ = 1.0;
- double bound_ = 0.0;
+ Host* host_ = nullptr;
+ double flops_amount_ = 0.0;
+ double priority_ = 1.0;
+ double bound_ = 0.0;
+ std::string name_ = "";
+ std::string tracing_category_ = "";
std::atomic_int_fast32_t refcount_{0};
}; // class
}
std::atomic_int_fast32_t refcount_{0};
}; // class
}