}
void MSG_function_register(const char* name, int (*code)(int, char**))
{
- simgrid::s4u::Engine::get_instance()->register_function(
- name, [code](std::vector<std::string> args) { return simgrid::xbt::wrap_main(code, std::move(args)); });
+ simgrid::kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+ return simgrid::xbt::wrap_main(code, std::move(args));
+ };
+ simgrid::s4u::Engine::get_instance()->register_function(name, code_factory);
}
void MSG_function_register_default(int (*code)(int, char**))
{
}
/* ************************** Actors *************************** */
+void MSG_process_on_exit(int_f_int_pvoid_t fun, void* data)
+{
+ /* We can't use the sg_actor_on_exit, as the return type of the callback changed: the int in MSG is ignored and was
+ * removed in sg */
+ simgrid::s4u::this_actor::on_exit([fun, data](bool failed) { fun(failed ? 1 /*FAILURE*/ : 0 /*SUCCESS*/, data); });
+}
+
int MSG_process_get_PID(const_sg_actor_t actor)
{
return sg_actor_get_PID(actor);
{
sg_actor_resume(actor);
}
-int MSG_process_is_suspended(sg_actor_t actor)
+int MSG_process_is_suspended(const_sg_actor_t actor)
{
return sg_actor_is_suspended(actor);
}
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
/* get from SIMIX the MSG process data, and then the user data */
- return sg_actor_data(process);
+ return sg_actor_get_data(process);
}
/** @brief Sets the user data of a process.
msg_error_t MSG_process_set_data(msg_process_t process, void* data)
{
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
- sg_actor_data_set(process, data);
+ sg_actor_set_data(process, data);
return MSG_OK;
}
sg_actor_unref(process);
}
/** @brief Return the current number MSG processes. */
-int MSG_process_get_number()
+int MSG_process_get_number() // XBT_ATTRIB_DEPRECATED_v330
{
- return simgrid_get_actor_count();
+ return sg_actor_count();
}
/* ************************** NetZones *************************** */
sg_netzone_t MSG_zone_get_root()
}
/* ************************** hosts *************************** */
-xbt_dynar_t MSG_hosts_as_dynar()
+xbt_dynar_t MSG_hosts_as_dynar() // XBT_ATTRIB_DEPRECATED_v330
{
- return sg_hosts_as_dynar();
+ size_t host_count = sg_host_count();
+ sg_host_t* list = sg_host_list();
+
+ xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
+ for (size_t i = 0; i < host_count; i++)
+ xbt_dynar_push_as(res, sg_host_t, list[i]);
+ xbt_free(list);
+
+ return res;
}
size_t MSG_get_host_number()
{
}
void* MSG_host_get_data(const_sg_host_t host)
{
- return sg_host_data(host);
+ return sg_host_get_data(host);
}
void MSG_host_set_data(sg_host_t host, void* data)
{
- return sg_host_data_set(host, data);
+ return sg_host_set_data(host, data);
}
-xbt_dict_t MSG_host_get_mounted_storage_list(sg_host_t host)
+xbt_dict_t MSG_host_get_mounted_storage_list(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330
{
return sg_host_get_mounted_storage_list(host);
}