/* 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 <functional>
-
#include "msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/functional.hpp"
+#include "simgrid/s4u/host.hpp"
#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)");
* \brief Cleans the MSG data of a process.
* \param smx_proc a SIMIX process
*/
-void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc)
+void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc)
{
simdata_process_t msg_proc;
}
/* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
-smx_process_t MSG_process_create_from_SIMIX(
- const char *name, std::function<void()> code, void *data, const char *hostname,
+smx_actor_t MSG_process_create_from_SIMIX(
+ const char *name, std::function<void()> code, void *data, sg_host_t host,
double kill_time, xbt_dict_t properties,
- int auto_restart, smx_process_t parent_process)
+ int auto_restart, smx_actor_t parent_process)
{
- msg_host_t host = MSG_host_by_name(hostname);
- msg_process_t p = MSG_process_create_with_environment(
- name, std::move(code), data, host, properties);
+ msg_process_t p = MSG_process_create_with_environment(name, std::move(code), data, host, properties);
if (p) {
MSG_process_set_kill_time(p,kill_time);
MSG_process_auto_restart_set(p,auto_restart);
/* Let's create the process: SIMIX may decide to start it right now,
* even before returning the flow control to us */
process = simcall_process_create(
- name, std::move(code), simdata, sg_host_get_name(host), -1, properties, 0);
+ name, std::move(code), simdata, host, -1, properties, 0);
if (!process) {
/* Undo everything we have just changed */
simdata->last_errno = MSG_OK;
/* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */
- process = SIMIX_process_attach(name, simdata, sg_host_get_name(host), properties, nullptr);
+ process = SIMIX_process_attach(name, simdata, host->cname(), properties, nullptr);
if (!process)
xbt_die("Could not attach");
simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);