X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9104957deccc59e0e804215d5db498fabfd40d29..c972ddd5a74b83c183357f707e7dfba87d48e750:/src/msg/msg_process.cpp diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp index 1c349b03bb..1bf454f27a 100644 --- a/src/msg/msg_process.cpp +++ b/src/msg/msg_process.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2021. 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. */ @@ -6,7 +6,7 @@ #include "msg_private.hpp" #include "simgrid/Exception.hpp" #include "simgrid/s4u/Host.hpp" -#include "src/simix/smx_private.hpp" +#include "src/kernel/EngineImpl.hpp" /******************************** Process ************************************/ /** @brief Creates and runs a new #msg_process_t. @@ -63,7 +63,7 @@ msg_process_t MSG_process_create_with_environment(const char* name, int (*code)( try { if (data != nullptr) { - sg_actor_data_set(actor, data); + sg_actor_set_data(actor, data); xbt_dict_cursor_t cursor = nullptr; char* key; char* value; @@ -93,20 +93,12 @@ XBT_PUBLIC void MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup) } /** @brief returns a list of all currently existing processes */ -xbt_dynar_t MSG_processes_as_dynar() { +xbt_dynar_t MSG_processes_as_dynar() // XBT_ATTRIB_DEPRECATED_v330 +{ xbt_dynar_t res = xbt_dynar_new(sizeof(smx_actor_t), nullptr); - for (auto const& kv : simix_global->process_list) { + for (auto const& kv : simgrid::kernel::EngineImpl::get_instance()->get_actor_list()) { smx_actor_t actor = kv.second; xbt_dynar_push(res, &actor); } return res; } - -/** @brief Add a function to the list of "on_exit" functions for the current process. - * The on_exit functions are the functions executed when your process is killed. - * You should use them to free the data used by your process. - */ -void MSG_process_on_exit(int_f_int_pvoid_t fun, void* data) -{ - simgrid::s4u::this_actor::on_exit([fun, data](bool failed) { fun(failed ? 1 /*FAILURE*/ : 0 /*SUCCESS*/, data); }); -}