objectify simdata_task_t

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

diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index 279ebff..83fbcdb 100644 (file)
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2019. 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. */
@@ -13,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (proc
 
 std::string instr_pid(msg_process_t proc)
 {
-  return std::string(proc->get_cname()) + "-" + std::to_string(proc->get_pid());
+  return std::string(proc->get_name()) + "-" + std::to_string(proc->get_pid());
 }
 
 /******************************** Process ************************************/
@@ -81,7 +81,12 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun
     props[key] = value;
   xbt_dict_free(&properties);
 
-  smx_actor_t process = simcall_process_create(name, std::move(function), data, host, &props);
+  smx_actor_t self    = SIMIX_process_self();
+  smx_actor_t process = simgrid::simix::simcall([name, function, data, host, &props, self] {
+    return simgrid::kernel::actor::ActorImpl::create(std::move(name), std::move(function), data, host, &props, self)
+        .get();
+  });
+
   for (int i = 0; i != argc; ++i)
     xbt_free(argv[i]);
   xbt_free(argv);
@@ -93,43 +98,6 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun
   return process->ciface();
 }
 
-/* Become a process in the simulation
- *
- * Currently this can only be called by the main thread (once) and only work with some thread factories
- * (currently ThreadContextFactory).
- *
- * In the future, it might be extended in order to attach other threads created by a third party library.
- */
-msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host, xbt_dict_t properties)
-{
-  xbt_assert(host != nullptr, "Invalid parameters: host and code params must not be nullptr");
-  std::unordered_map<std::string, std::string> props;
-  xbt_dict_cursor_t cursor = nullptr;
-  char* key;
-  char* value;
-  xbt_dict_foreach (properties, cursor, key, value)
-    props[key] = value;
-  xbt_dict_free(&properties);
-
-  /* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */
-  smx_actor_t process = SIMIX_process_attach(name, data, host->get_cname(), &props, nullptr);
-  if (not process)
-    xbt_die("Could not attach");
-  MSG_process_yield();
-  return process->ciface();
-}
-
-/** @brief Detach a process attached with `MSG_process_attach()`
- *
- *  This is called when the current process has finished its job.
- *  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()
-{
-  SIMIX_process_detach();
-}
-
 /** @brief Returns the user data of a process.
  *
  * This function checks whether @a process is a valid pointer and returns the user data associated to this process.
@@ -186,7 +154,7 @@ int MSG_process_get_number()
 int MSG_process_self_PID()
 {
   smx_actor_t self = SIMIX_process_self();
-  return self == nullptr ? 0 : self->pid_;
+  return self == nullptr ? 0 : self->get_pid();
 }
 
 /** @brief Return the PPID of the current process.