X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4052a44a5685301df48bad9da42bfa33f094a745..de29f3985505e3db5a0aba8d0ef844f21e971f11:/src/msg/msg_private.hpp diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index e4280f6fd8..31734b6010 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2017. 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. */ @@ -10,35 +10,23 @@ #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" -#include "xbt/Extendable.hpp" - -#include /**************** datatypes **********************************/ -/**************************** Host Extension *********************************/ -namespace simgrid { -class MsgHostExt { -public: - static simgrid::xbt::Extension EXTENSION_ID; - - ~MsgHostExt() { delete file_descriptor_table; } - std::vector* file_descriptor_table = nullptr; // Created lazily on need -}; -} /********************************* Task **************************************/ struct s_simdata_task_t { ~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; @@ -64,20 +52,14 @@ private: 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)) { } @@ -87,59 +69,31 @@ public: /************************** Global variables ********************************/ struct s_MSG_Global_t { - int debug_multiple_use; /* whether we want an error message when reusing the same Task for 2 things */ + bool debug_multiple_use; /* whether we want an error message when reusing the same Task for 2 things */ std::atomic_int_fast32_t sent_msg; /* Total amount of messages sent during the simulation */ void (*task_copy_callback)(msg_task_t task, msg_process_t src, msg_process_t dst); void_f_pvoid_t process_data_cleanup; }; typedef s_MSG_Global_t* MSG_Global_t; -XBT_PRIVATE std::string instr_pid(msg_process_t proc); -XBT_PRIVATE void TRACE_msg_process_create(std::string process_name, int process_pid, msg_host_t host); -XBT_PRIVATE void TRACE_msg_process_destroy(std::string process_name, int process_pid); - -extern "C" { - -XBT_PUBLIC_DATA(MSG_Global_t) msg_global; +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 code, void* data, - sg_host_t host, std::map* 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_host_add_task(msg_host_t host, msg_task_t task); -XBT_PRIVATE void MSG_host_del_task(msg_host_t host, msg_task_t task); +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(double start_time, 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 int TRACE_msg_task_put_start(msg_task_t task); // returns TRUE if the task_put_end must be called +XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task); XBT_PRIVATE void TRACE_msg_task_put_end(); -/* declaration of instrumentation functions from msg_process_instr.c */ -XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host); -XBT_PRIVATE void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process); -XBT_PRIVATE void TRACE_msg_process_suspend(msg_process_t process); -XBT_PRIVATE void TRACE_msg_process_resume(msg_process_t process); -XBT_PRIVATE void TRACE_msg_process_sleep_in(msg_process_t process); // called from msg/gos.c -XBT_PRIVATE void TRACE_msg_process_sleep_out(msg_process_t process); -} inline void s_simdata_task_t::setUsed() { if (this->isused) this->reportMultipleUse(); - if (msg_global->debug_multiple_use) { - // TODO, backtrace - } this->isused = true; }