-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2020. 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. */
#include "simgrid/Exception.hpp"
+#include "simgrid/s4u/Engine.hpp"
#include "src/msg/msg_private.hpp"
+#include "xbt/functional.hpp"
#define MSG_CALL(type, oldname, args)
simgrid_run();
return MSG_OK;
}
-void MSG_function_register(const char* name, xbt_main_func_t code)
+void MSG_function_register(const char* name, int (*code)(int, char**))
{
- simgrid_register_function(name, code);
+ 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(xbt_main_func_t code)
+void MSG_function_register_default(int (*code)(int, char**))
{
- simgrid_register_default(code);
+ simgrid::s4u::Engine::get_instance()->register_default(
+ [code](std::vector<std::string> args) { return simgrid::xbt::wrap_main(code, std::move(args)); });
}
double MSG_get_clock()
{
}
/* ************************** Actors *************************** */
+void MSG_process_on_exit(int_f_int_pvoid_t fun, void* data)
+{
+ sg_actor_on_exit(fun, data);
+}
+
int MSG_process_get_PID(const_sg_actor_t actor)
{
return sg_actor_get_PID(actor);
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()
{
{
return sg_host_data_set(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);
}