From 84696389f6386bec8c39d8377d787732a52cf786 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 21 Jun 2012 15:05:22 +0200 Subject: [PATCH] Remaining s/MSG_global_init/MSG_init/. --- doc/ref_guide/doxygen/module-msg.doc | 2 +- doc/user_guide/doxygen/install.doc | 2 +- doc/user_guide/doxygen/options.doc | 2 +- doc/user_guide/doxygen/tracing.doc | 2 +- examples/msg/ns3/ns3.c | 2 +- src/msg/msg_deployment.c | 2 +- src/simix/smx_user.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/ref_guide/doxygen/module-msg.doc b/doc/ref_guide/doxygen/module-msg.doc index 695efec3cc..f908338680 100644 --- a/doc/ref_guide/doxygen/module-msg.doc +++ b/doc/ref_guide/doxygen/module-msg.doc @@ -37,7 +37,7 @@ The basic workflow is the following (check the \ref MSG_examples for details). - -# Initialize the library with #MSG_global_init + -# Initialize the library with #MSG_init -# Create a platform (usually by parsing a file with #MSG_create_environment) -# Register the functions that your processes are supposed to run with diff --git a/doc/user_guide/doxygen/install.doc b/doc/user_guide/doxygen/install.doc index 1e76fc3f51..544faf3436 100644 --- a/doc/user_guide/doxygen/install.doc +++ b/doc/user_guide/doxygen/install.doc @@ -439,7 +439,7 @@ feel free to organize it as you want). msg_task_usage. \li masterslave.c: a C file with the main function, i.e. - the MSG initialization (MSG_global_init()), the platform + the MSG initialization (MSG_init()), the platform creation (e.g. with MSG_create_environment()), the deployment phase (e.g. with MSG_function_register() and MSG_launch_application()) and the call to diff --git a/doc/user_guide/doxygen/options.doc b/doc/user_guide/doxygen/options.doc index c1d2409338..362e6b3cfb 100644 --- a/doc/user_guide/doxygen/options.doc +++ b/doc/user_guide/doxygen/options.doc @@ -46,7 +46,7 @@ currently used in SimGrid. \code extern xbt_cfg_t _surf_cfg_set; int main(int argc, char *argv[]) { - MSG_global_init(&argc, argv); + MSG_init(&argc, argv); xbt_cfg_set_parse(_surf_cfg_set,"Item:Value"); diff --git a/doc/user_guide/doxygen/tracing.doc b/doc/user_guide/doxygen/tracing.doc index 11b21420aa..fb616d5ed4 100644 --- a/doc/user_guide/doxygen/tracing.doc +++ b/doc/user_guide/doxygen/tracing.doc @@ -275,7 +275,7 @@ A simplified example using the tracing mandatory functions. \verbatim int main (int argc, char **argv) { - MSG_global_init (&argc, &argv); + MSG_init (&argc, &argv); //(... after deployment ...) diff --git a/examples/msg/ns3/ns3.c b/examples/msg/ns3/ns3.c index 81ee74b98a..ed009761d9 100644 --- a/examples/msg/ns3/ns3.c +++ b/examples/msg/ns3/ns3.c @@ -210,7 +210,7 @@ int main(int argc, char *argv[]) MSG_error_t res = MSG_OK; bool_printed = 0; - MSG_global_init(&argc, argv); + MSG_init(&argc, argv); if (argc < 3) { printf("Usage: %s platform_file deployment_file\n", argv[0]); exit(1); diff --git a/src/msg/msg_deployment.c b/src/msg/msg_deployment.c index ec21889334..791429cd3f 100644 --- a/src/msg/msg_deployment.c +++ b/src/msg/msg_deployment.c @@ -27,7 +27,7 @@ void MSG_launch_application(const char *file) { xbt_assert(msg_global, - "MSG_global_init_args has to be called before MSG_launch_application."); + "MSG_init has to be called before MSG_launch_application."); SIMIX_launch_application(file); diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index 0987155253..c0f8af041f 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -1006,7 +1006,7 @@ int simcall_comm_is_latency_bounded(smx_action_t comm) smx_mutex_t simcall_mutex_init(void) { if(!simix_global) { - fprintf(stderr,"You must run MSG_global_init or gras_init before using MSG or GRAS\n"); // I would have loved using xbt_die but I can't since it is not initialized yet... :) + fprintf(stderr,"You must run MSG_init or gras_init before using MSG or GRAS\n"); // I would have loved using xbt_die but I can't since it is not initialized yet... :) abort(); } smx_simcall_t simcall = SIMIX_simcall_mine(); -- 2.20.1