- xbt_assert(code != NULL && host != NULL, "Invalid parameters: host and code params must not be NULL");
- simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1);
- msg_process_t process;
-
- /* Simulator data for MSG */
- simdata->waiting_action = NULL;
- simdata->waiting_task = NULL;
- simdata->m_host = host;
- simdata->argc = argc;
- simdata->argv = argv;
- simdata->data = data;
- simdata->last_errno = MSG_OK;
-
- /* The TRACE process is created before the SIMIX one
- * to avoid issues when SIMIX decides to start the new
- * process right now (before returning the flow control). */
- unsigned int next_pid = SIMIX_process_get_maxpid();
- TRACE_msg_process_create(name, next_pid, host);
-
- /* 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, code, simdata, sg_host_get_name(host), -1,
- argc, argv, properties,0);
-
- if (!process) {
- /* Undo everything we have just changed */
- xbt_free(simdata);
- return NULL;
- // FIXME: is the TRACE process destroyed in this case?
- }
- else {
- xbt_assert(next_pid == process->pid, "Bad trace pid hack");
- simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);
+ std::function<void()> function;
+ if (code)
+ function = simgrid::xbt::wrapMain(code, argc, const_cast<const char*const*>(argv));
+ msg_process_t res = MSG_process_create_with_environment(name,
+ std::move(function), data, host, properties);
+ for (int i = 0; i != argc; ++i)
+ xbt_free(argv[i]);
+ xbt_free(argv);
+ return res;
+}
+
+msg_process_t MSG_process_create_with_environment(
+ const char *name, std::function<void()> code, void *data,
+ msg_host_t host, xbt_dict_t properties)
+{
+ xbt_assert(code != nullptr && host != nullptr, "Invalid parameters: host and code params must not be nullptr");
+ MsgActorExt* msgExt = new MsgActorExt(data);
+
+ msg_process_t process = simcall_process_create(name, std::move(code), msgExt, host, properties);
+
+ if (!process) { /* Undo everything */
+ delete msgExt;
+ return nullptr;