X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f23b0fb864cb60978c1fcfd48d50f62dd054fe31..a2d16cd78c8d1a779948aa69d6e396028c788a5e:/src/msg/msg_legacy.cpp diff --git a/src/msg/msg_legacy.cpp b/src/msg/msg_legacy.cpp index bb1148f6cf..4d0d80acc4 100644 --- a/src/msg/msg_legacy.cpp +++ b/src/msg/msg_legacy.cpp @@ -1,38 +1,45 @@ -/* Copyright (c) 2004-2018. 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) /* ************************** Engine *************************** */ void MSG_create_environment(const char* filename) { - sg_engine_load_platform(filename); + simgrid_load_platform(filename); } void MSG_launch_application(const char* filename) { - sg_engine_load_deployment(filename); + simgrid_load_deployment(filename); } msg_error_t MSG_main() { - sg_engine_run(); + 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**)) { - sg_engine_register_function(name, code); + simgrid::kernel::actor::ActorCodeFactory code_factory = [code](std::vector 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**)) { - sg_engine_register_default(code); + simgrid::s4u::Engine::get_instance()->register_default( + [code](std::vector args) { return simgrid::xbt::wrap_main(code, std::move(args)); }); } double MSG_get_clock() { - return sg_engine_get_clock(); + return simgrid_get_clock(); } /* ************************** Mailboxes ************************ */ @@ -46,11 +53,18 @@ int MSG_task_listen(const char* alias) } /* ************************** Actors *************************** */ -int MSG_process_get_PID(sg_actor_t actor) +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); } -int MSG_process_get_PPID(sg_actor_t actor) +int MSG_process_get_PPID(const_sg_actor_t actor) { return sg_actor_get_PPID(actor); } @@ -58,19 +72,19 @@ msg_process_t MSG_process_from_PID(int PID) { return sg_actor_by_PID(PID); } -const char* MSG_process_get_name(sg_actor_t actor) +const char* MSG_process_get_name(const_sg_actor_t actor) { return sg_actor_get_name(actor); } -sg_host_t MSG_process_get_host(sg_actor_t actor) +sg_host_t MSG_process_get_host(const_sg_actor_t actor) { return sg_actor_get_host(actor); } -xbt_dict_t MSG_process_get_properties(sg_actor_t actor) +xbt_dict_t MSG_process_get_properties(const_sg_actor_t actor) { return sg_actor_get_properties(actor); } -const char* MSG_process_get_property_value(sg_actor_t actor, const char* name) +const char* MSG_process_get_property_value(const_sg_actor_t actor, const char* name) { return sg_actor_get_property_value(actor, name); } @@ -82,7 +96,7 @@ void MSG_process_resume(sg_actor_t 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); } @@ -101,7 +115,7 @@ void MSG_process_daemonize(sg_actor_t actor) } void MSG_process_migrate(sg_actor_t actor, sg_host_t host) { - sg_actor_migrate(actor, host); + sg_actor_set_host(actor, host); } void MSG_process_join(sg_actor_t actor, double timeout) { @@ -124,12 +138,98 @@ void MSG_process_yield() sg_actor_yield(); } +msg_error_t MSG_process_sleep(double duration) +{ + try { + sg_actor_sleep_for(duration); + return MSG_OK; + } catch (const simgrid::HostFailureException&) { + return MSG_HOST_FAILURE; + } +} + +/** @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. + */ +void* MSG_process_get_data(const_sg_actor_t process) +{ + 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_get_data(process); +} + +/** @brief Sets the user data of a process. + * + * This function checks whether @a process is a valid pointer and sets the user data associated to this 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_set_data(process, data); + + return MSG_OK; +} + +msg_process_t MSG_process_attach(const char* name, void* data, msg_host_t host, xbt_dict_t properties) +{ + return sg_actor_attach(name, data, host, properties); +} + +void MSG_process_detach() +{ + sg_actor_detach(); +} +aid_t MSG_process_self_PID() +{ + return sg_actor_self_get_pid(); +} + +/** @brief Return the PPID of the current process. + * + * This function returns the PID of the parent of the currently running #msg_process_t. + */ +aid_t MSG_process_self_PPID() +{ + return sg_actor_self_get_ppid(); +} + +/** @brief Return the name of the current process. */ +const char* MSG_process_self_name() +{ + return sg_actor_self_get_name(); +} +/** @brief Return the current process. + * + * This function returns the currently running #msg_process_t. + */ +msg_process_t MSG_process_self() +{ + return sg_actor_self(); +} + +/** @brief Take an extra reference on that process to prevent it to be garbage-collected */ +void MSG_process_ref(const_sg_actor_t process) +{ + sg_actor_ref(process); +} +/** @brief Release a reference on that process so that it can get be garbage-collected */ +void MSG_process_unref(const_sg_actor_t process) +{ + sg_actor_unref(process); +} +/** @brief Return the current number MSG processes. */ +int MSG_process_get_number() // XBT_ATTRIB_DEPRECATED_v330 +{ + return sg_actor_count(); +} /* ************************** NetZones *************************** */ sg_netzone_t MSG_zone_get_root() { return sg_zone_get_root(); } -const char* MSG_zone_get_name(sg_netzone_t zone) +const char* MSG_zone_get_name(const_sg_netzone_t zone) { return sg_zone_get_name(zone); } @@ -137,25 +237,25 @@ sg_netzone_t MSG_zone_get_by_name(const char* name) { return sg_zone_get_by_name(name); } -void MSG_zone_get_sons(sg_netzone_t zone, xbt_dict_t whereto) +void MSG_zone_get_sons(const_sg_netzone_t zone, xbt_dict_t whereto) { return sg_zone_get_sons(zone, whereto); } -const char* MSG_zone_get_property_value(sg_netzone_t zone, const char* name) +const char* MSG_zone_get_property_value(const_sg_netzone_t zone, const char* name) { return sg_zone_get_property_value(zone, name); } -void MSG_zone_set_property_value(sg_netzone_t zone, const char* name, char* value) +void MSG_zone_set_property_value(sg_netzone_t zone, const char* name, const char* value) { sg_zone_set_property_value(zone, name, value); } -void MSG_zone_get_hosts(sg_netzone_t zone, xbt_dynar_t whereto) +void MSG_zone_get_hosts(const_sg_netzone_t zone, xbt_dynar_t whereto) { sg_zone_get_hosts(zone, whereto); } /* ************************** Storages *************************** */ -const char* MSG_storage_get_name(sg_storage_t storage) +const char* MSG_storage_get_name(const_sg_storage_t storage) { return sg_storage_get_name(storage); } @@ -163,7 +263,7 @@ sg_storage_t MSG_storage_get_by_name(const char* name) { return sg_storage_get_by_name(name); } -xbt_dict_t MSG_storage_get_properties(sg_storage_t storage) +xbt_dict_t MSG_storage_get_properties(const_sg_storage_t storage) { return sg_storage_get_properties(storage); } @@ -171,7 +271,7 @@ void MSG_storage_set_property_value(sg_storage_t storage, const char* name, cons { sg_storage_set_property_value(storage, name, value); } -const char* MSG_storage_get_property_value(sg_storage_t storage, const char* name) +const char* MSG_storage_get_property_value(const_sg_storage_t storage, const char* name) { return sg_storage_get_property_value(storage, name); } @@ -183,11 +283,11 @@ void MSG_storage_set_data(sg_storage_t storage, void* data) { sg_storage_set_data(storage, data); } -void* MSG_storage_get_data(sg_storage_t storage) +void* MSG_storage_get_data(const_sg_storage_t storage) { return sg_storage_get_data(storage); } -const char* MSG_storage_get_host(sg_storage_t storage) +const char* MSG_storage_get_host(const_sg_storage_t storage) { return sg_storage_get_host(storage); } @@ -201,9 +301,17 @@ sg_size_t MSG_storage_write(sg_storage_t storage, sg_size_t size) } /* ************************** 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() { @@ -217,43 +325,43 @@ sg_host_t MSG_host_by_name(const char* name) { return sg_host_by_name(name); } -const char* MSG_host_get_name(sg_host_t host) +const char* MSG_host_get_name(const_sg_host_t host) { return sg_host_get_name(host); } -void* MSG_host_get_data(sg_host_t host) +void* MSG_host_get_data(const_sg_host_t host) { - return sg_host_user(host); + return sg_host_get_data(host); } void MSG_host_set_data(sg_host_t host, void* data) { - return sg_host_user_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); } -xbt_dynar_t MSG_host_get_attached_storage_lists(sg_host_t host) +xbt_dynar_t MSG_host_get_attached_storage_lists(const_sg_host_t host) { return sg_host_get_attached_storage_list(host); } -double MSG_host_get_speed(sg_host_t host) +double MSG_host_get_speed(const_sg_host_t host) { - return sg_host_speed(host); + return sg_host_get_speed(host); } -double MSG_host_get_power_peak_at(sg_host_t host, int pstate_index) +double MSG_host_get_power_peak_at(const_sg_host_t host, int pstate_index) { return sg_host_get_pstate_speed(host, pstate_index); } -int MSG_host_get_core_number(sg_host_t host) +int MSG_host_get_core_number(const_sg_host_t host) { return sg_host_core_count(host); } -int MSG_host_get_nb_pstates(sg_host_t host) +int MSG_host_get_nb_pstates(const_sg_host_t host) { return sg_host_get_nb_pstates(host); } -int MSG_host_get_pstate(sg_host_t host) +int MSG_host_get_pstate(const_sg_host_t host) { return sg_host_get_pstate(host); } @@ -269,19 +377,15 @@ void MSG_host_off(sg_host_t h) { sg_host_turn_off(h); } -int MSG_host_is_on(sg_host_t h) +int MSG_host_is_on(const_sg_host_t h) { return sg_host_is_on(h); } -int MSG_host_is_off(sg_host_t h) -{ - return sg_host_is_off(h); -} -xbt_dict_t MSG_host_get_properties(sg_host_t host) +xbt_dict_t MSG_host_get_properties(const_sg_host_t host) { return sg_host_get_properties(host); } -const char* MSG_host_get_property_value(sg_host_t host, const char* name) +const char* MSG_host_get_property_value(const_sg_host_t host, const char* name) { return sg_host_get_property_value(host, name); } @@ -289,7 +393,7 @@ void MSG_host_set_property_value(sg_host_t host, const char* name, const char* v { sg_host_set_property_value(host, name, value); } -void MSG_host_get_process_list(sg_host_t host, xbt_dynar_t whereto) +void MSG_host_get_process_list(const_sg_host_t host, xbt_dynar_t whereto) { sg_host_get_actor_list(host, whereto); } @@ -297,6 +401,11 @@ sg_host_t MSG_host_self() { return sg_host_self(); } + +double MSG_host_get_load(const_sg_host_t host) +{ + return sg_host_get_load(host); +} /* ************************** Virtual Machines *************************** */ sg_vm_t MSG_vm_create_core(sg_host_t pm, const char* name) { @@ -318,7 +427,7 @@ int MSG_vm_is_suspended(sg_vm_t vm) { return sg_vm_is_suspended(vm); } -const char* MSG_vm_get_name(sg_vm_t vm) +const char* MSG_vm_get_name(const_sg_vm_t vm) { return sg_vm_get_name(vm); } @@ -326,11 +435,11 @@ void MSG_vm_set_ramsize(sg_vm_t vm, size_t size) { sg_vm_set_ramsize(vm, size); } -size_t MSG_vm_get_ramsize(sg_vm_t vm) +size_t MSG_vm_get_ramsize(const_sg_vm_t vm) { return sg_vm_get_ramsize(vm); } -sg_host_t MSG_vm_get_pm(sg_vm_t vm) +sg_host_t MSG_vm_get_pm(const_sg_vm_t vm) { return sg_vm_get_pm(vm); } @@ -358,3 +467,47 @@ void MSG_vm_destroy(sg_vm_t vm) { sg_vm_destroy(vm); } +/********* barriers ************/ +sg_bar_t MSG_barrier_init(unsigned int count) +{ + return sg_barrier_init(count); +} + +void MSG_barrier_destroy(const_sg_bar_t bar) +{ + sg_barrier_destroy(bar); +} + +int MSG_barrier_wait(sg_bar_t bar) +{ + return sg_barrier_wait(bar); +} + +sg_sem_t MSG_sem_init(int initial_value) +{ + return sg_sem_init(initial_value); +} +void MSG_sem_acquire(sg_sem_t sem) +{ + sg_sem_acquire(sem); +} +int MSG_sem_acquire_timeout(sg_sem_t sem, double timeout) +{ + return sg_sem_acquire_timeout(sem, timeout); +} +void MSG_sem_release(sg_sem_t sem) +{ + sg_sem_release(sem); +} +int MSG_sem_get_capacity(sg_sem_t sem) +{ + return sg_sem_get_capacity(sem); +} +void MSG_sem_destroy(const_sg_sem_t sem) +{ + sg_sem_destroy(sem); +} +int MSG_sem_would_block(sg_sem_t sem) +{ + return sg_sem_would_block(sem); +}