From edca9509f1ec94a851e0265c1876a4733f4fff87 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 13 Jul 2018 21:41:13 +0200 Subject: [PATCH] deprecate some of simix.h C API --- include/simgrid/engine.h | 2 +- include/simgrid/simix.h | 11 +++++++---- src/msg/msg_legacy.cpp | 2 +- src/s4u/s4u_Engine.cpp | 2 +- src/simix/smx_deployment.cpp | 9 +++++---- src/simix/smx_environment.cpp | 6 ++++-- src/smpi/internals/smpi_deployment.cpp | 2 +- src/smpi/internals/smpi_global.cpp | 6 +++--- teshsuite/simix/generic-simcalls/generic-simcalls.cpp | 5 +++-- teshsuite/simix/stack-overflow/stack-overflow.cpp | 5 +++-- 10 files changed, 29 insertions(+), 21 deletions(-) diff --git a/include/simgrid/engine.h b/include/simgrid/engine.h index 216127a5c1..194e28c4b0 100644 --- a/include/simgrid/engine.h +++ b/include/simgrid/engine.h @@ -15,7 +15,7 @@ XBT_PUBLIC void simgrid_load_platform(const char* filename); XBT_PUBLIC void simgrid_load_deployment(const char* filename); XBT_PUBLIC void simgrid_run(); XBT_PUBLIC void simgrid_register_function(const char* name, int (*code)(int, char**)); -XBT_PUBLIC void sg_engine_register_default(int (*code)(int, char**)); +XBT_PUBLIC void simgrid_register_default(int (*code)(int, char**)); XBT_PUBLIC double simgrid_get_clock(); SG_END_DECL() diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 1af2dffb69..c216902ffa 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -113,7 +113,8 @@ SG_END_DECL() /******************************* Environment **********************************/ SG_BEGIN_DECL() -XBT_PUBLIC void SIMIX_create_environment(const char* file); +XBT_ATTRIB_DEPRECATED_v324("Please use simgrid_load_platform()") XBT_PUBLIC + void SIMIX_create_environment(const char* file); SG_END_DECL() #ifdef __cplusplus @@ -122,11 +123,13 @@ XBT_PUBLIC void SIMIX_create_environment(std::string file); /******************************** Deployment **********************************/ SG_BEGIN_DECL() -XBT_PUBLIC void SIMIX_function_register(const char* name, xbt_main_func_t code); +XBT_ATTRIB_DEPRECATED_v324("Please use simgrid_register_function()") XBT_PUBLIC + void SIMIX_function_register(const char* name, xbt_main_func_t code); +XBT_ATTRIB_DEPRECATED_v324("Please use simgrid_load_deployment()") XBT_PUBLIC + void SIMIX_launch_application(const char* file); XBT_PUBLIC void SIMIX_function_register_default(xbt_main_func_t code); -XBT_PUBLIC void SIMIX_init_application(); -XBT_PUBLIC void SIMIX_launch_application(const char* file); +XBT_PUBLIC void SIMIX_init_application(); XBT_PUBLIC void SIMIX_process_set_function(const char* process_host, const char* process_function, xbt_dynar_t arguments, double process_start_time, double process_kill_time); SG_END_DECL() diff --git a/src/msg/msg_legacy.cpp b/src/msg/msg_legacy.cpp index 72957cad06..297c8f4308 100644 --- a/src/msg/msg_legacy.cpp +++ b/src/msg/msg_legacy.cpp @@ -28,7 +28,7 @@ void MSG_function_register(const char* name, xbt_main_func_t code) } void MSG_function_register_default(xbt_main_func_t code) { - sg_engine_register_default(code); + simgrid_register_default(code); } double MSG_get_clock() { diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index 2afeecb270..4c7026b535 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -387,7 +387,7 @@ void simgrid_register_function(const char* name, int (*code)(int, char**)) { simgrid::s4u::Engine::get_instance()->register_function(name, code); } -void sg_engine_register_default(int (*code)(int, char**)) +void simgrid_register_default(int (*code)(int, char**)) { simgrid::s4u::Engine::get_instance()->register_default(code); } diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp index b40a64e670..d94d87f206 100644 --- a/src/simix/smx_deployment.cpp +++ b/src/simix/smx_deployment.cpp @@ -9,6 +9,7 @@ #include "simgrid/s4u/Host.hpp" #include "smx_private.hpp" #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)"); @@ -56,9 +57,9 @@ void SIMIX_launch_application(std::string file) } } -void SIMIX_launch_application(const char* file) +void SIMIX_launch_application(const char* file) // deprecated { - SIMIX_launch_application(std::string(file)); + simgrid_load_deployment(file); } // Wrap a main() function into a ActorCodeFactory: @@ -82,9 +83,9 @@ void SIMIX_function_register(std::string name, xbt_main_func_t code) simix_global->registered_functions[name] = toActorCodeFactory(code); } -void SIMIX_function_register(const char* name, xbt_main_func_t code) +void SIMIX_function_register(const char* name, xbt_main_func_t code) // deprecated { - SIMIX_function_register(std::string(name), code); + simgrid_register_function(name, code); } /** diff --git a/src/simix/smx_environment.cpp b/src/simix/smx_environment.cpp index 0eb0f4f09b..94b2e6ef0c 100644 --- a/src/simix/smx_environment.cpp +++ b/src/simix/smx_environment.cpp @@ -6,6 +6,8 @@ #include "smx_private.hpp" #include "src/include/surf/surf.hpp" #include "xbt/xbt_os_time.h" + +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix, "Logging specific to SIMIX (environment)"); @@ -44,9 +46,9 @@ void SIMIX_create_environment(std::string file) XBT_DEBUG("PARSE TIME: %g", (end - start)); } -void SIMIX_create_environment(const char* file) +void SIMIX_create_environment(const char* file) // deprecated { - SIMIX_create_environment(std::string(file)); + simgrid_load_platform(file); } void SIMIX_post_create_environment() diff --git a/src/smpi/internals/smpi_deployment.cpp b/src/smpi/internals/smpi_deployment.cpp index 72b798a9d2..203ed2aea6 100644 --- a/src/smpi/internals/smpi_deployment.cpp +++ b/src/smpi/internals/smpi_deployment.cpp @@ -50,7 +50,7 @@ extern int process_count; // How many processes have been allocated over all ins void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_processes) { if (code != nullptr) { // When started with smpirun, we will not execute a function - SIMIX_function_register(name, code); + simgrid::s4u::Engine::get_instance()->register_function(name, code); } static int already_called = 0; diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index f876f6a13c..e8e29abd47 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -633,12 +633,12 @@ int smpi_main(const char* executable, int argc, char* argv[]) // TODO This will not be executed in the case where smpi_main is not called, // e.g., not for smpi_msg_masterslave. This should be moved to another location - // that is always called -- maybe close to Actor::onCreation? + // that is always called -- maybe close to Actor::on_creation? simgrid::s4u::Host::on_creation.connect( [](simgrid::s4u::Host& host) { host.extension_set(new simgrid::smpi::Host(&host)); }); // parse the platform file: get the host list - SIMIX_create_environment(argv[1]); + simgrid::s4u::Engine::get_instance()->load_platform(argv[1]); SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback); smpi_init_options(); @@ -648,7 +648,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) smpi_init_privatization_no_dlopen(executable); SMPI_init(); - SIMIX_launch_application(argv[2]); + simgrid::s4u::Engine::get_instance()->load_deployment(argv[2]); SMPI_app_instance_register(smpi_default_instance_name.c_str(), nullptr, process_data.size()); // This call has a side effect on process_count... MPI_COMM_WORLD = *smpi_deployment_comm_world(smpi_default_instance_name); diff --git a/teshsuite/simix/generic-simcalls/generic-simcalls.cpp b/teshsuite/simix/generic-simcalls/generic-simcalls.cpp index 497861e8ba..6bc8cf51cd 100644 --- a/teshsuite/simix/generic-simcalls/generic-simcalls.cpp +++ b/teshsuite/simix/generic-simcalls/generic-simcalls.cpp @@ -8,6 +8,7 @@ #include +#include #include #include #include @@ -102,8 +103,8 @@ int main(int argc, char* argv[]) { SIMIX_global_init(&argc, argv); xbt_assert(argc == 2, "Usage: %s platform.xml\n", argv[0]); - SIMIX_function_register("master", example::master); - SIMIX_create_environment(argv[1]); + simgrid_register_function("master", example::master); + simgrid_load_platform(argv[1]); simcall_process_create("master", example::master, NULL, sg_host_by_name("Tremblay"), 0, NULL, NULL); SIMIX_run(); return 0; diff --git a/teshsuite/simix/stack-overflow/stack-overflow.cpp b/teshsuite/simix/stack-overflow/stack-overflow.cpp index 94841add63..8c56b32b66 100644 --- a/teshsuite/simix/stack-overflow/stack-overflow.cpp +++ b/teshsuite/simix/stack-overflow/stack-overflow.cpp @@ -7,6 +7,7 @@ #include "simgrid/simix.h" #include "xbt/log.h" +#include #include @@ -45,8 +46,8 @@ int main(int argc, char* argv[]) xbt_assert(argc == 2, "Usage: %s platform.xml\n", argv[0]); - SIMIX_function_register("master", master); - SIMIX_create_environment(argv[1]); + simgrid_register_function("master", master); + simgrid_load_platform(argv[1]); simcall_process_create("master", master, NULL, sg_host_by_name("Tremblay"), 0, NULL, NULL); SIMIX_run(); -- 2.20.1