* under the terms of the license (GNU LGPL) which comes with this package. */
#include "msg_private.hpp"
-#include "src/simix/smx_private.hpp"
+#include "src/instr/instr_private.hpp"
#include <simgrid/s4u/Comm.hpp>
+#include <simgrid/s4u/Exec.hpp>
#include <simgrid/s4u/Host.hpp>
+#include <simgrid/s4u/Mailbox.hpp>
#include <algorithm>
#include <vector>
xbt_assert(std::isfinite(flops_amount), "flops_amount is not finite!");
msg_error_t status = MSG_OK;
- s4u::Host* host = SIMIX_process_self()->get_host();
+ if (flops_amount <= 0.0)
+ return MSG_OK;
set_used();
-
- compute = simix::simcall([this, host] {
- return kernel::activity::ExecImplPtr(new kernel::activity::ExecImpl(name_, tracing_category_, host));
- });
-
try {
- compute->start(flops_amount, priority_, bound_);
- e_smx_state_t comp_state = simcall_execution_wait(compute);
+ s4u::ExecPtr e = s4u::this_actor::exec_init(flops_amount)
+ ->set_priority(1 / priority_)
+ ->set_bound(bound_)
+ ->set_tracing_category(tracing_category_)
+ ->start();
+ compute = boost::static_pointer_cast<kernel::activity::ExecImpl>(e->get_impl());
+
+ e->wait();
set_not_used();
- XBT_DEBUG("Execution task '%s' finished in state %d", get_cname(), (int)comp_state);
+ XBT_DEBUG("Execution task '%s' finished", get_cname());
} catch (HostFailureException& e) {
status = MSG_HOST_FAILURE;
} catch (TimeoutError& e) {
return status;
}
+s4u::CommPtr Task::send_async(std::string alias, void_f_pvoid_t cleanup, bool detached)
+{
+ if (TRACE_actor_is_enabled()) {
+ container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self()));
+ std::string key = std::string("p") + std::to_string(get_id());
+ simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key);
+ }
+
+ /* Prepare the task to send */
+ set_used();
+ this->comm = nullptr;
+ msg_global->sent_msg++;
+
+ s4u::CommPtr comm = s4u::Mailbox::by_name(alias)->put_init(this, bytes_amount)->set_rate(get_rate());
+ this->comm = comm;
+
+ if (detached)
+ comm->detach(cleanup);
+ else
+ comm->start();
+
+ if (TRACE_is_enabled() && has_tracing_category())
+ simgrid::simix::simcall([comm, this] { comm->get_impl()->set_category(std::move(tracing_category_)); });
+
+ return comm;
+}
+
void Task::cancel()
{
if (compute) {
*/
msg_error_t MSG_task_execute(msg_task_t task)
{
- return task->execute();
+ return task->is_parallel() ? MSG_parallel_task_execute(task) : task->execute();
+}
+/**
+ * @brief Sends a task on a mailbox.
+ *
+ * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test() to end the communication.
+ *
+ * @param task a #msg_task_t to send on another location.
+ * @param alias name of the mailbox to sent the task to
+ * @return the msg_comm_t communication created
+ */
+msg_comm_t MSG_task_isend(msg_task_t task, const char* alias)
+{
+ return new simgrid::msg::Comm(task, nullptr, task->send_async(alias, nullptr, false));
+}
+
+/**
+ * @brief Sends a task on a mailbox with a maximum rate
+ *
+ * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test() to end the communication. The maxrate
+ * parameter allows the application to limit the bandwidth utilization of network links when sending the task.
+ *
+ * @param task a #msg_task_t to send on another location.
+ * @param alias name of the mailbox to sent the task to
+ * @param maxrate the maximum communication rate for sending this task (byte/sec).
+ * @return the msg_comm_t communication created
+ */
+msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char* alias, double maxrate)
+{
+ task->set_rate(maxrate);
+ return new simgrid::msg::Comm(task, nullptr, task->send_async(alias, nullptr, false));
+}
+
+/**
+ * @brief Sends a task on a mailbox.
+ *
+ * This is a non blocking detached send function.
+ * Think of it as a best effort send. Keep in mind that the third parameter is only called if the communication fails.
+ * If the communication does work, it is responsibility of the receiver code to free anything related to the task, as
+ * usual. More details on this can be obtained on
+ * <a href="http://lists.gforge.inria.fr/pipermail/simgrid-user/2011-November/002649.html">this thread</a>
+ * in the SimGrid-user mailing list archive.
+ *
+ * @param task a #msg_task_t to send on another location.
+ * @param alias name of the mailbox to sent the task to
+ * @param cleanup a function to destroy the task if the communication fails, e.g. MSG_task_destroy
+ * (if nullptr, no function will be called)
+ */
+void MSG_task_dsend(msg_task_t task, const char* alias, void_f_pvoid_t cleanup)
+{
+ task->send_async(alias, cleanup, true);
+}
+
+/**
+ * @brief Sends a task on a mailbox with a maximal rate.
+ *
+ * This is a non blocking detached send function.
+ * Think of it as a best effort send. Keep in mind that the third parameter is only called if the communication fails.
+ * If the communication does work, it is responsibility of the receiver code to free anything related to the task, as
+ * usual. More details on this can be obtained on
+ * <a href="http://lists.gforge.inria.fr/pipermail/simgrid-user/2011-November/002649.html">this thread</a>
+ * in the SimGrid-user mailing list archive.
+ *
+ * The rate parameter can be used to send a task with a limited bandwidth (smaller than the physical available value).
+ * Use MSG_task_dsend() if you don't limit the rate (or pass -1 as a rate value do disable this feature).
+ *
+ * @param task a #msg_task_t to send on another location.
+ * @param alias name of the mailbox to sent the task to
+ * @param cleanup a function to destroy the task if the communication fails, e.g. MSG_task_destroy (if nullptr, no
+ * function will be called)
+ * @param maxrate the maximum communication rate for sending this task (byte/sec)
+ *
+ */
+void MSG_task_dsend_bounded(msg_task_t task, const char* alias, void_f_pvoid_t cleanup, double maxrate)
+{
+ task->set_rate(maxrate);
+ task->send_async(alias, cleanup, true);
}
/** @brief Destroys the given task.