> 4 14 0 6 6 ACTOR_TASK_LINK
> 6 0.000000 33 6 1 "policeman-2"
> 12 0.000000 7 32 9
-> 12 0.000000 7 33 11
> 15 0.000000 14 0 SR 33 p0
+> 12 0.000000 7 33 11
> 13 2.000000 7 32
> 12 2.000000 7 32 10
> 13 2.025708 7 33
-> 12 2.025708 7 33 11
> 15 2.025708 14 0 SR 33 p1
+> 12 2.025708 7 33 11
> 13 2.025708 7 32
> 16 2.025708 14 0 SR 32 p0
> 15 2.025708 13 0 M 32 0
> 13 4.025708 7 34
> 12 4.025708 7 34 10
> 13 4.025903 7 33
-> 12 4.025903 7 33 11
> 15 4.025903 14 0 SR 33 p2
+> 12 4.025903 7 33 11
> 13 4.025903 7 34
> 16 4.025903 14 0 SR 34 p1
> 15 4.025903 13 0 M 34 1
> 13 6.025903 7 35
> 12 6.025903 7 35 10
> 13 6.044918 7 33
-> 12 6.044918 7 33 11
> 15 6.044918 14 0 SR 33 p3
+> 12 6.044918 7 33 11
> 13 6.044918 7 35
> 16 6.044918 14 0 SR 35 p2
> 15 6.044918 13 0 M 35 2
> 13 8.044918 7 36
> 12 8.044918 7 36 10
> 13 8.070626 7 33
-> 12 8.070626 7 33 11
> 15 8.070626 14 0 SR 33 p4
+> 12 8.070626 7 33 11
> 13 8.070626 7 36
> 16 8.070626 14 0 SR 36 p3
> 15 8.070626 13 0 M 36 3
> 13 10.070626 7 37
> 12 10.070626 7 37 10
> 13 10.087178 7 33
-> 12 10.087178 7 33 11
> 15 10.087178 14 0 SR 33 p5
+> 12 10.087178 7 33 11
> 13 10.087178 7 37
> 16 10.087178 14 0 SR 37 p4
> 15 10.087178 13 0 M 37 4
> 13 12.087178 7 38
> 12 12.087178 7 38 10
> 13 12.112617 7 33
-> 12 12.112617 7 33 11
> 15 12.112617 14 0 SR 33 p6
+> 12 12.112617 7 33 11
> 13 12.112617 7 38
> 16 12.112617 14 0 SR 38 p5
> 15 12.112617 13 0 M 38 5
> 13 14.112617 7 39
> 12 14.112617 7 39 10
> 13 14.138325 7 33
-> 12 14.138325 7 33 11
> 15 14.138325 14 0 SR 33 p7
+> 12 14.138325 7 33 11
> 13 14.138325 7 39
> 16 14.138325 14 0 SR 39 p6
> 15 14.138325 13 0 M 39 6
> 13 16.138325 7 40
> 12 16.138325 7 40 10
> 13 16.138521 7 33
-> 12 16.138521 7 33 11
> 15 16.138521 14 0 SR 33 p8
+> 12 16.138521 7 33 11
> 13 16.138521 7 40
> 16 16.138521 14 0 SR 40 p7
> 15 16.138521 13 0 M 40 7
* This function is optional: you can call wait() even if you didn't call start()
*/
virtual Activity* start() = 0;
- /** Tests whether the given activity is terminated yet. This is a pure function. */
- //virtual bool test()=0;
/** Blocks until the activity is terminated */
virtual Activity* wait() = 0;
/** Blocks until the activity is terminated, or until the timeout is elapsed
virtual Activity* cancel() = 0;
/** Retrieve the current state of the activity */
Activity::State get_state() { return state_; }
- /** Returns whether this activity is completed */
+ /** Tests whether the given activity is terminated yet. This is a pure function. */
virtual bool test() = 0;
/** Get the remaining amount of work that this Activity entails. When it's 0, it's done. */
/** Retrieve the user data of the Activity */
void* get_user_data() { return user_data_; }
- simgrid::kernel::activity::ActivityImplPtr get_impl() { return pimpl_; }
+ kernel::activity::ActivityImplPtr get_impl() { return pimpl_; }
#ifndef DOXYGEN
XBT_ATTRIB_DEPRECATED_v324("Please use Activity::wait_for()") virtual void wait(double timeout) = 0;
#endif
private:
- simgrid::kernel::activity::ActivityImplPtr pimpl_ = nullptr;
- Activity::State state_ = Activity::State::INITED;
- double remains_ = 0;
- void* user_data_ = nullptr;
-}; // class
-
-}}; // Namespace simgrid::s4u
+ kernel::activity::ActivityImplPtr pimpl_ = nullptr;
+ Activity::State state_ = Activity::State::INITED;
+ double remains_ = 0;
+ void* user_data_ = nullptr;
+};
+
+} // namespace s4u
+} // namespace simgrid
#endif /* SIMGRID_S4U_ACTIVITY_HPP */
* Represents all asynchronous communications, that you can test or wait onto.
*/
class XBT_PUBLIC Comm : public Activity {
+ MailboxPtr mailbox_ = nullptr;
+ kernel::actor::ActorImpl* sender_ = nullptr;
+ kernel::actor::ActorImpl* receiver_ = nullptr;
+ double rate_ = -1;
+ void* dst_buff_ = nullptr;
+ size_t dst_buff_size_ = 0;
+ void* src_buff_ = nullptr;
+ size_t src_buff_size_ = sizeof(void*);
+ std::atomic_int_fast32_t refcount_{0};
+
+ /* FIXME: expose these elements in the API */
+ int detached_ = 0;
+ int (*match_fun_)(void*, void*, kernel::activity::CommImpl*) = nullptr;
+ void (*clean_fun_)(void*) = nullptr;
+ void (*copy_data_function_)(kernel::activity::CommImpl*, void*, size_t) = nullptr;
+
Comm() : Activity() {}
+
public:
friend XBT_PUBLIC void intrusive_ptr_release(simgrid::s4u::Comm * c);
friend XBT_PUBLIC void intrusive_ptr_add_ref(simgrid::s4u::Comm * c);
virtual ~Comm();
- static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_sender_start;
- static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_receiver_start;
- static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_completion;
+ static xbt::signal<void(ActorPtr)> on_sender_start;
+ static xbt::signal<void(ActorPtr)> on_receiver_start;
+ static xbt::signal<void(ActorPtr)> on_completion;
/*! take a vector s4u::CommPtr and return when one of them is finished.
* The return value is the rank of the first finished CommPtr. */
Comm* start() override;
Comm* wait() override;
Comm* wait_for(double timeout) override;
+ Comm* cancel() override;
bool test() override;
/** Start the comm, and ignore its result. It can be completely forgotten after that. */
}
/** Sets the maximal communication rate (in byte/sec). Must be done before start */
- Comm* set_rate(double rate);
+ CommPtr set_rate(double rate);
/** Specify the data to send.
*
* you can send a short buffer in your simulator, that represents a very large message
* in the simulated world, or the opposite.
*/
- Comm* set_src_data(void* buff);
+ CommPtr set_src_data(void* buff);
/** Specify the size of the data to send. Not to be mixed with @ref Activity::set_remaining()
*
* That's the size of the data to actually copy in the simulator (ie, the data passed with Activity::set_src_data()).
* you can send a short buffer in your simulator, that represents a very large message
* in the simulated world, or the opposite.
*/
- Comm* set_src_data_size(size_t size);
+ CommPtr set_src_data_size(size_t size);
/** Specify the data to send and its size. Don't mix the size with @ref Activity::set_remaining()
*
* This is way will get actually copied over to the receiver.
* you can send a short buffer in your simulator, that represents a very large message
* in the simulated world, or the opposite.
*/
- Comm* set_src_data(void* buff, size_t size);
+ CommPtr set_src_data(void* buff, size_t size);
/** Specify where to receive the data.
*
* That's a buffer where the sent data will be copied */
- Comm* set_dst_data(void** buff);
+ CommPtr set_dst_data(void** buff);
/** Specify the buffer in which the data should be received
*
* That's a buffer where the sent data will be copied */
- Comm* set_dst_data(void** buff, size_t size);
- /** Retrieve the size of the received data. Not to be mixed with @ref Activity::set_remaining() */
- size_t get_dst_data_size();
-
- Comm* cancel() override;
+ CommPtr set_dst_data(void** buff, size_t size);
/** Retrieve the mailbox on which this comm acts */
MailboxPtr get_mailbox();
+ /** Retrieve the size of the received data. Not to be mixed with @ref Activity::set_remaining() */
+ size_t get_dst_data_size();
#ifndef DOXYGEN
XBT_ATTRIB_DEPRECATED_v324("Please use Comm::wait_for()") void wait(double t) override { wait_for(t); }
- XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_rate()") Activity* setRate(double rate) { return set_rate(rate); }
+ XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_rate()") Activity* setRate(double rate)
+ {
+ return set_rate(rate).get();
+ }
XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_src_data()") Activity* setSrcData(void* buff)
{
- return set_src_data(buff);
+ return set_src_data(buff).get();
}
XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_src_data()") Activity* setSrcData(void* buff, size_t size)
{
- return set_src_data(buff, size);
+ return set_src_data(buff, size).get();
}
XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_src_data_size()") Activity* setSrcDataSize(size_t size)
{
- return set_src_data_size(size);
+ return set_src_data_size(size).get();
}
XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_dst_data()") Activity* setDstData(void** buff)
{
- return set_dst_data(buff);
+ return set_dst_data(buff).get();
}
XBT_ATTRIB_DEPRECATED_v323("Please use Comm::set_dst_data()") Activity* setDstData(void** buff, size_t size)
{
- return set_dst_data(buff, size);
+ return set_dst_data(buff, size).get();
}
XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_dst_data_size()") size_t getDstDataSize()
{
}
XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_mailbox()") MailboxPtr getMailbox() { return get_mailbox(); }
#endif
-
-private:
- double rate_ = -1;
- void* dst_buff_ = nullptr;
- size_t dst_buff_size_ = 0;
- void* src_buff_ = nullptr;
- size_t src_buff_size_ = sizeof(void*);
-
- /* FIXME: expose these elements in the API */
- int detached_ = 0;
- int (*match_fun_)(void*, void*, simgrid::kernel::activity::CommImpl*) = nullptr;
- void (*clean_fun_)(void*) = nullptr;
- void (*copy_data_function_)(simgrid::kernel::activity::CommImpl*, void*, size_t) = nullptr;
-
- smx_actor_t sender_ = nullptr;
- smx_actor_t receiver_ = nullptr;
- MailboxPtr mailbox_ = nullptr;
-
- std::atomic_int_fast32_t refcount_{0};
};
} // namespace s4u
} // namespace simgrid
/** Computation Activity, representing the asynchronous executions.
*
- * They are generated from simgrid::s4u::this_actor::exec_init() or simgrid::s4u::Host::execute(),
- * and can be used to model pools of threads or similar mechanisms.
+ * They are generated from this_actor::exec_init() or Host::execute(), and can be used to model pools of threads or
+ * similar mechanisms.
*/
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);
public:
- friend XBT_PUBLIC void intrusive_ptr_release(simgrid::s4u::Exec * e);
- friend XBT_PUBLIC void intrusive_ptr_add_ref(simgrid::s4u::Exec * e);
+ 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;
- static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_start;
- static simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> on_completion;
+ static xbt::signal<void(ActorPtr)> on_start;
+ static xbt::signal<void(ActorPtr)> on_completion;
Exec* start() override;
Exec* wait() override;
return get_remaining_ratio();
}
#endif
-
-private:
- 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
-}
-}; // Namespace simgrid::s4u
+};
+} // namespace s4u
+} // namespace simgrid
#endif /* SIMGRID_S4U_EXEC_HPP */
#include <simgrid/s4u/Activity.hpp>
#include <atomic>
-#include <string>
namespace simgrid {
namespace s4u {
/** I/O Activity, representing the asynchronous disk access.
*
- * They are generated from simgrid::s4u::Storage::read() and simgrid::s4u::Storage::write().
+ * They are generated from Storage::io_init() or Storage::read() and Storage::write().
*/
class XBT_PUBLIC Io : public Activity {
public:
- friend XBT_PUBLIC void intrusive_ptr_release(simgrid::s4u::Io* i);
- friend XBT_PUBLIC void intrusive_ptr_add_ref(simgrid::s4u::Io* i);
- friend simgrid::s4u::Storage; // Factory of IOs
enum class OpType { READ, WRITE };
private:
+ Storage* storage_ = nullptr;
+ sg_size_t size_ = 0;
+ OpType type_ = OpType::READ;
+ std::string name_ = "";
+ std::atomic_int_fast32_t refcount_{0};
+
explicit Io(sg_storage_t storage, sg_size_t size, OpType type);
public:
+ friend XBT_PUBLIC void intrusive_ptr_release(simgrid::s4u::Io* i);
+ friend XBT_PUBLIC void intrusive_ptr_add_ref(simgrid::s4u::Io* i);
+ friend simgrid::s4u::Storage; // Factory of IOs
+
~Io() = default;
Io* start() override;
#endif
private:
- sg_storage_t storage_ = nullptr;
- sg_size_t size_ = 0;
- OpType type_ = OpType::READ;
- std::string name_ = "";
- std::atomic_int_fast32_t refcount_{0};
}; // class
-}
-}; // Namespace simgrid::s4u
+} // namespace s4u
+} // namespace simgrid
#endif /* SIMGRID_S4U_IO_HPP */
bool ready();
/** Gets the first element in the queue (without dequeuing it), or nullptr if none is there */
- smx_activity_t front();
+ kernel::activity::CommImplPtr front();
/** Declare that the specified actor is a permanent receiver on that mailbox
*
}
}
-/* MSG_task_get related functions */
void TRACE_msg_task_get_start()
{
XBT_DEBUG("GET,in");
if (TRACE_actor_is_enabled()) {
container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self()));
- process_container->get_state("ACTOR_STATE")->push_event("send");
-
std::string key = std::string("p") + std::to_string(task->counter);
simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key);
}
#include "simgrid/Exception.hpp"
#include <cmath>
+#include "simgrid/s4u/Comm.hpp"
#include "simgrid/s4u/Mailbox.hpp"
#include "src/instr/instr_private.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
double rate)
{
XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias);
- simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(alias);
msg_error_t ret = MSG_OK;
/* We no longer support getting a task from a specific host */
if (host)
THROW_UNIMPLEMENTED;
- TRACE_msg_task_get_start();
-
/* Sanity check */
xbt_assert(task, "Null pointer for the task storage");
/* Try to receive it by calling SIMIX network layer */
try {
- simcall_comm_recv(MSG_process_self()->get_impl(), mailbox->get_impl(), task, nullptr, nullptr, nullptr, nullptr,
- timeout, rate);
- XBT_DEBUG("Got task %s from %s", (*task)->name, mailbox->get_cname());
+ void* payload;
+ simgrid::s4u::Mailbox::by_name(alias)
+ ->get_init()
+ ->set_dst_data(&payload, sizeof(msg_task_t*))
+ ->set_rate(rate)
+ ->wait_for(timeout);
+ *task = static_cast<msg_task_t>(payload);
+ XBT_DEBUG("Got task %s from %s", (*task)->name, alias);
(*task)->simdata->setNotUsed();
} catch (simgrid::HostFailureException& e) {
ret = MSG_HOST_FAILURE;
msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, double timeout)
{
msg_error_t ret = MSG_OK;
- simdata_task_t t_simdata = nullptr;
- msg_process_t process = MSG_process_self();
- simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(alias);
TRACE_msg_task_put_start(task);
/* Prepare the task to send */
- t_simdata = task->simdata;
- t_simdata->sender = process;
+ simdata_task_t t_simdata = task->simdata;
+ t_simdata->sender = MSG_process_self();
t_simdata->source = MSG_host_self();
t_simdata->setUsed();
- t_simdata->comm = nullptr;
msg_global->sent_msg++;
- /* Try to send it by calling SIMIX network layer */
+ /* Try to send it */
try {
- smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simix call */
- comm = simcall_comm_isend(SIMIX_process_self(), mailbox->get_impl(), t_simdata->bytes_amount, t_simdata->rate, task,
- sizeof(void*), nullptr, nullptr, nullptr, nullptr, 0);
+ simgrid::s4u::CommPtr comm =
+ simgrid::s4u::Mailbox::by_name(alias)->put_init(task, t_simdata->bytes_amount)->set_rate(t_simdata->rate);
+ t_simdata->comm = boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(comm->get_impl());
+ comm->start();
if (TRACE_is_enabled() && task->category != nullptr)
- simgrid::simix::simcall([comm, task] { comm->set_category(task->category); });
- t_simdata->comm = boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(comm);
- simcall_comm_wait(comm, timeout);
+ simgrid::simix::simcall([comm, task] { comm->get_impl()->set_category(task->category); });
+ comm->wait_for(timeout);
} catch (simgrid::TimeoutError& e) {
ret = MSG_TIMEOUT;
} catch (simgrid::CancelException& e) {
t_simdata->setNotUsed();
}
- TRACE_msg_task_put_end();
return ret;
}
*/
int MSG_task_listen_from(const char *alias)
{
- simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(alias);
- simgrid::kernel::activity::CommImplPtr comm =
- boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(mbox->front());
-
- if (not comm)
- return -1;
+ simgrid::kernel::activity::CommImplPtr comm = simgrid::s4u::Mailbox::by_name(alias)->front();
- return MSG_process_get_PID(static_cast<msg_task_t>(comm->src_buff_)->simdata->sender);
+ return comm ? MSG_process_get_PID(static_cast<msg_task_t>(comm->src_buff_)->simdata->sender) : -1;
}
/**
comm->wait();
}
-Comm* Comm::set_rate(double rate)
+CommPtr Comm::set_rate(double rate)
{
xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
__FUNCTION__);
return this;
}
-Comm* Comm::set_src_data(void* buff)
+CommPtr Comm::set_src_data(void* buff)
{
xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
__FUNCTION__);
src_buff_ = buff;
return this;
}
-Comm* Comm::set_src_data_size(size_t size)
+
+CommPtr Comm::set_src_data_size(size_t size)
{
xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
__FUNCTION__);
src_buff_size_ = size;
return this;
}
-Comm* Comm::set_src_data(void* buff, size_t size)
+
+CommPtr Comm::set_src_data(void* buff, size_t size)
{
xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
__FUNCTION__);
src_buff_size_ = size;
return this;
}
-Comm* Comm::set_dst_data(void** buff)
+CommPtr Comm::set_dst_data(void** buff)
{
xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
__FUNCTION__);
dst_buff_ = buff;
return this;
}
+
size_t Comm::get_dst_data_size()
{
xbt_assert(state_ == State::FINISHED, "You cannot use %s before your communication terminated", __FUNCTION__);
return dst_buff_size_;
}
-Comm* Comm::set_dst_data(void** buff, size_t size)
+CommPtr Comm::set_dst_data(void** buff, size_t size)
{
xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
__FUNCTION__);
#include "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Exec.hpp"
+#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
#include <string>
return (process == nullptr) ? nullptr : process->get_host();
}
+/* needs to be public and without simcall for exceptions and logging events */
+const char* sg_host_self_get_name()
+{
+ sg_host_t host = sg_host_self();
+ if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process)
+ return "";
+
+ return host->get_cname();
+}
+
double sg_host_load(sg_host_t host)
{
return host->get_load();
return comm_ready;
}
-smx_activity_t Mailbox::front()
+kernel::activity::CommImplPtr Mailbox::front()
{
return pimpl_->comm_queue_.empty() ? nullptr : pimpl_->comm_queue_.front();
}
return;
}
- XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", get_cname(), host_->get_cname(), actor->get_cname(),
- actor->host_->get_cname());
+ XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", get_cname(), host_ ? host_->get_cname() : "", actor->get_cname(),
+ actor->host_ ? actor->host_->get_cname() : "");
actor->exit();
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
-/* needs to be public and without simcall for exceptions and logging events */
-const char* sg_host_self_get_name()
-{
- sg_host_t host = sg_host_self();
- if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process)
- return "";
-
- return host->get_cname();
-}
-
simgrid::kernel::activity::ExecImplPtr
SIMIX_execution_parallel_start(std::string name, int host_nb, const sg_host_t* host_list, const double* flops_amount,
const double* bytes_amount, double rate, double timeout)
