-/* Copyright (c) 2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2017-2019. 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. */
#ifndef SIMGRID_S4U_EXEC_HPP
#define SIMGRID_S4U_EXEC_HPP
-#include "src/kernel/activity/ExecImpl.hpp"
#include <simgrid/forward.h>
-#include <simgrid/s4u/forward.hpp>
+#include <simgrid/s4u/Activity.hpp>
+
+#include <atomic>
namespace simgrid {
namespace s4u {
-XBT_PUBLIC_CLASS Exec : public Activity
-{
- Exec() : Activity() {}
-public:
- friend void intrusive_ptr_release(simgrid::s4u::Exec * e)
- {
- if (e->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
- std::atomic_thread_fence(std::memory_order_acquire);
- delete e;
- }
- }
+/** Computation Activity, representing the asynchronous executions.
+ *
+ * They are generated from this_actor::exec_init() or Host::execute(), and can be used to model pools of threads or
+ * similar mechanisms.
+ */
- friend void intrusive_ptr_add_ref(simgrid::s4u::Exec * e) { e->refcount_.fetch_add(1, std::memory_order_relaxed); }
+class XBT_PUBLIC Exec : public Activity {
+ 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};
+
+ explicit Exec(sg_host_t host, double flops_amount);
- friend Actor; // Factory of Exec
+public:
+ friend XBT_PUBLIC void intrusive_ptr_release(Exec* e);
+ friend XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
+ friend XBT_PUBLIC ExecPtr this_actor::exec_init(double flops_amount);
~Exec() = default;
- void start() override
+ static xbt::signal<void(ActorPtr)> on_start;
+ static xbt::signal<void(ActorPtr)> on_completion;
+
+ Exec* start() override;
+ Exec* wait() override;
+ Exec* wait_for(double timeout) override;
+ Exec* cancel() override;
+ bool test() override;
+
+ 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();
+
+#ifndef DOXYGEN
+ //////////////// Deprecated functions
+ XBT_ATTRIB_DEPRECATED_v324("Please use Exec::wait_for()") void wait(double t) override { wait_for(t); }
+ XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_priority()") ExecPtr setPriority(double priority)
{
- pimpl_ = simcall_execution_start(nullptr, flops_amount_, 1 / priority_, 0.);
- state_ = started;
+ return set_priority(priority);
}
- void wait() override { this->wait(-1); }
- void wait(double timeout) override { simcall_execution_wait(pimpl_); }
-
- double getRemains()
+ 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_host()") ExecPtr setHost(Host* host) { return set_host(host); }
+ XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_host()") Host* getHost() { return get_host(); }
+ XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_remaining_ratio()") double getRemainingRatio()
{
- return simgrid::simix::kernelImmediate(
- [this]() { return boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(pimpl_)->remains(); });
+ return get_remaining_ratio();
}
-
-private:
- smx_actor_t runner_ = nullptr;
- double flops_amount_ = 0.0;
- double priority_ = 1.0;
- double bound_ = 0.0;
-
- std::atomic_int_fast32_t refcount_{0};
-}; // class
-}
-}; // Namespace simgrid::s4u
+#endif
+};
+} // namespace s4u
+} // namespace simgrid
#endif /* SIMGRID_S4U_EXEC_HPP */
