-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2022. 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. */
#include "msg_private.hpp"
#include "simgrid/Exception.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "src/instr/instr_private.hpp"
-#include "src/simix/smx_private.hpp"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)");
-
-std::string instr_pid(simgrid::s4u::Actor const& proc)
-{
- return std::string(proc.get_name()) + "-" + std::to_string(proc.get_pid());
-}
+#include "src/kernel/EngineImpl.hpp"
/******************************** Process ************************************/
/** @brief Creates and runs a new #msg_process_t.
* Does exactly the same as #MSG_process_create_with_arguments but without providing standard arguments
* (@a argc, @a argv, @a start_time, @a kill_time).
*/
-msg_process_t MSG_process_create(const char *name, xbt_main_func_t code, void *data, msg_host_t host)
+msg_process_t MSG_process_create(const char* name, int (*code)(int, char**), void* data, msg_host_t host)
{
return MSG_process_create_with_environment(name == nullptr ? "" : name, code, data, host, 0, nullptr, nullptr);
}
* @param name a name for the object. It is for user-level information and can be nullptr.
* @param code is a function describing the behavior of the process.
* @param data a pointer to any data one may want to attach to the new object. It is for user-level information and
- * can be nullptr. It can be retrieved with the function @ref MSG_process_get_data.
+ * can be nullptr. It can be retrieved with the function MSG_process_get_data().
* @param host the location where the new process is executed.
* @param argc first argument passed to @a code
* @param argv second argument passed to @a code
*/
-msg_process_t MSG_process_create_with_arguments(const char *name, xbt_main_func_t code, void *data, msg_host_t host,
- int argc, char **argv)
+msg_process_t MSG_process_create_with_arguments(const char* name, int (*code)(int, char**), void* data, msg_host_t host,
+ int argc, char** argv)
{
return MSG_process_create_with_environment(name, code, data, host, argc, argv, nullptr);
}
* @param name a name for the object. It is for user-level information and can be nullptr.
* @param code is a function describing the behavior of the process.
* @param data a pointer to any data one may want to attach to the new object. It is for user-level information and
- * can be nullptr. It can be retrieved with the function @ref MSG_process_get_data.
+ * can be nullptr. It can be retrieved with the function MSG_process_get_data().
* @param host the location where the new process is executed.
* @param argc first argument passed to @a code
* @param argv second argument passed to @a code. WARNING, these strings are freed by the SimGrid kernel when the
* @see msg_process_t
* @return The new corresponding object.
*/
-msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_func_t code, void *data, msg_host_t host,
- int argc, char **argv, xbt_dict_t properties)
+msg_process_t MSG_process_create_with_environment(const char* name, int (*code)(int, char**), void* data,
+ msg_host_t host, int argc, char** argv, xbt_dict_t properties)
{
xbt_assert(host != nullptr, "Invalid parameters: host param must not be nullptr");
sg_actor_t actor = sg_actor_init(std::move(name), host);
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;
xbt_dict_foreach (properties, cursor, key, value)
actor->set_property(key, value);
}
- sg_actor_start(actor, code, argc, argv);
+ actor->start(std::move(simgrid::xbt::wrap_main(code, argc, argv)));
} catch (simgrid::HostFailureException const&) {
xbt_die("Could not launch a new process on failed host %s.", host->get_cname());
}
{
msg_global->process_data_cleanup = data_cleanup;
}
-
-/** @brief returns a list of all currently existing processes */
-xbt_dynar_t MSG_processes_as_dynar() {
- xbt_dynar_t res = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
- for (auto const& kv : simix_global->process_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); });
-}