no need for a lib to store the netcards. A dict is easier

[simgrid.git] / src / msg / msg_process.cpp

diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index cf77537..6189fe7 100644 (file)
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -29,7 +29,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
  */
  * \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;
 
 {
   simdata_process_t msg_proc;
 


@@ -55,14 +55,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 */
 }
 
 /* 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,
   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);
   if (p) {
     MSG_process_set_kill_time(p,kill_time);
     MSG_process_auto_restart_set(p,auto_restart);


@@ -161,7 +159,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(
   /* 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 */
 
   if (!process) {
     /* Undo everything we have just changed */


@@ -201,7 +199,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 */
   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);
   if (!process)
     xbt_die("Could not attach");
   simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);


@@ -214,7 +212,7 @@ msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host,
  *  Used in the main thread, it waits for the simulation to finish before  returning. When it returns, the other
  *  simulated processes and the maestro are destroyed.
  */
  *  Used in the main thread, it waits for the simulation to finish before  returning. When it returns, the other
  *  simulated processes and the maestro are destroyed.
  */

-void MSG_process_detach(void)
+void MSG_process_detach()

 {
   SIMIX_process_detach();
 }
 {
   SIMIX_process_detach();
 }


@@ -332,12 +330,12 @@ msg_process_t MSG_process_from_PID(int PID)
 }
 
 /** @brief returns a list of all currently existing processes */
 }
 
 /** @brief returns a list of all currently existing processes */

-xbt_dynar_t MSG_processes_as_dynar(void) {
+xbt_dynar_t MSG_processes_as_dynar() {

   return SIMIX_processes_as_dynar();
 }
 
 /** @brief Return the current number MSG processes. */
   return SIMIX_processes_as_dynar();
 }
 
 /** @brief Return the current number MSG processes. */

-int MSG_process_get_number(void)
+int MSG_process_get_number()

 {
   return SIMIX_process_count();
 }
 {
   return SIMIX_process_count();
 }


@@ -417,7 +415,7 @@ xbt_dict_t MSG_process_get_properties(msg_process_t process)
  *
  * This function returns the PID of the currently running #msg_process_t.
  */
  *
  * This function returns the PID of the currently running #msg_process_t.
  */

-int MSG_process_self_PID(void)
+int MSG_process_self_PID()

 {
   return MSG_process_get_PID(MSG_process_self());
 }
 {
   return MSG_process_get_PID(MSG_process_self());
 }


@@ -427,7 +425,7 @@ int MSG_process_self_PID(void)
  *
  * This function returns the PID of the parent of the currently running #msg_process_t.
  */
  *
  * This function returns the PID of the parent of the currently running #msg_process_t.
  */

-int MSG_process_self_PPID(void)
+int MSG_process_self_PPID()

 {
   return MSG_process_get_PPID(MSG_process_self());
 }
 {
   return MSG_process_get_PPID(MSG_process_self());
 }


@@ -437,7 +435,7 @@ int MSG_process_self_PPID(void)
  *
  * This function returns the currently running #msg_process_t.
  */
  *
  * This function returns the currently running #msg_process_t.
  */

-msg_process_t MSG_process_self(void)
+msg_process_t MSG_process_self()

 {
   return SIMIX_process_self();
 }
 {
   return SIMIX_process_self();
 }