X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9df6a0ce7023e4e22d83bb6c50f27bd21fab329..8c13bb27e65a53b8d533858a8c764ce5f7a3f067:/src/msg/msg_process.cpp

diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index baf54c810d..d02ae9c7ae 100644
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -4,14 +4,9 @@
 /* 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)");
 
@@ -29,7 +24,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (proc
  * \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;
 
@@ -55,14 +50,12 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_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);
@@ -161,7 +154,7 @@ msg_process_t MSG_process_create_with_environment(
   /* 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 */
@@ -201,7 +194,7 @@ msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host,
   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);
@@ -226,11 +219,6 @@ void MSG_process_detach()
  */
 void MSG_process_kill(msg_process_t process)
 {
-//  /* FIXME: why do we only cancel communication actions? is this useful? */
-//  simdata_process_t p_simdata = simcall_process_get_data(process);
-//  if (p_simdata->waiting_task && p_simdata->waiting_task->simdata->comm) {
-//    simcall_comm_cancel(p_simdata->waiting_task->simdata->comm);
-//  }
   simcall_process_kill(process);
 }
 
@@ -261,6 +249,12 @@ msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
   return MSG_OK;
 }
 
+/** Yield the current actor; let the other actors execute first */
+void MSG_process_yield()
+{
+  simgrid::simix::kernelImmediate([] { /* do nothing*/ });
+}
+
 /** \ingroup m_process_management
  * \brief Returns the user data of a process.
  *