-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-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. */
~s_simdata_task_t()
{
/* parallel tasks only */
- delete[] this->host_list;
- /* flops_parallel_amount and bytes_parallel_amount are automatically deleted in ~L07Action */
+ delete[] host_list;
+ delete[] flops_parallel_amount;
+ delete[] bytes_parallel_amount;
}
void setUsed();
void setNotUsed() { this->isused = false; }
simgrid::kernel::activity::ExecImplPtr compute = nullptr; /* SIMIX modeling of computation */
- simgrid::kernel::activity::CommImplPtr comm = nullptr; /* SIMIX modeling of communication */
+ simgrid::s4u::CommPtr comm = nullptr; /* S4U modeling of communication */
double bytes_amount = 0.0; /* Data size */
double flops_amount = 0.0; /* Computation size */
msg_process_t sender = nullptr;
namespace simgrid {
namespace msg {
-class ActorExt {
-public:
- explicit ActorExt(void* d) : data(d) {}
- msg_error_t errno_ = MSG_OK; /* the last value returned by a MSG_function */
- void* data = nullptr; /* user data */
-};
class Comm {
public:
msg_task_t task_sent; /* task sent (NULL for the receiver) */
msg_task_t* task_received; /* where the task will be received (NULL for the sender) */
- smx_activity_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
+ s4u::CommPtr s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
msg_error_t status = MSG_OK; /* status of the communication once finished */
- Comm(msg_task_t sent, msg_task_t* received, smx_activity_t comm)
+ Comm(msg_task_t sent, msg_task_t* received, s4u::CommPtr comm)
: task_sent(sent), task_received(received), s_comm(std::move(comm))
{
}
XBT_PUBLIC_DATA MSG_Global_t msg_global;
/*************************************************************/
-XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc);
-XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function<void()> code, void* data,
- sg_host_t host,
- std::unordered_map<std::string, std::string>* properties,
- smx_actor_t parent_process);
-XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_activity_t comm, void* buff, size_t buff_size);
+XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size);
/********** Tracing **********/
/* declaration of instrumentation functions from msg_task_instr.c */
XBT_PRIVATE void TRACE_msg_set_task_category(msg_task_t task, const char* category);
-XBT_PRIVATE void TRACE_msg_task_create(msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_execute_start(msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_execute_end(msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_destroy(msg_task_t task);
XBT_PRIVATE void TRACE_msg_task_get_end(msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_get_start();
XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_put_end();
inline void s_simdata_task_t::setUsed()