X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d62f02c44fd56836ab5c3a6183d6a89aa01be26..59753c048ca8993bcdbdcf3c97824cf9f100bc20:/src/msg/msg_deployment.cpp diff --git a/src/msg/msg_deployment.cpp b/src/msg/msg_deployment.cpp index 373594265a..ae3d87a062 100644 --- a/src/msg/msg_deployment.cpp +++ b/src/msg/msg_deployment.cpp @@ -1,23 +1,21 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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 "msg_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" +#include "src/msg/msg_private.hpp" + +extern "C" { /** \ingroup msg_simulation * \brief An application deployer. * * Creates the process described in \a file. - * \param file a filename of a xml description of the application. This file - * follows this DTD : + * \param file a filename of a xml description of the application. This file follows this DTD : * * \include simgrid.dtd * - * Here is a small example of such a platform + * Here is a small example of such a platform * * \include msg/masterslave/deployment_masterslave.xml * @@ -25,27 +23,21 @@ */ void MSG_launch_application(const char *file) { - - xbt_assert(msg_global, - "MSG_init has to be called before MSG_launch_application."); - + xbt_assert(msg_global, "MSG_init has to be called before MSG_launch_application."); SIMIX_launch_application(file); - - return; } /** \ingroup msg_simulation * \brief Registers the main function of a process in a global table. * - * Registers a code function in a global table. - * This table is then used by #MSG_launch_application. + * Registers a code function in a global table. + * This table is then used by #MSG_launch_application. * \param name the reference name of the function. * \param code the function (must have the same prototype than the main function of any C program: int ..(int argc, char *argv[])) */ void MSG_function_register(const char *name, xbt_main_func_t code) { SIMIX_function_register(name, code); - return; } /** \ingroup msg_simulation @@ -59,24 +51,12 @@ void MSG_function_register_default(xbt_main_func_t code) SIMIX_function_register_default(code); } -/** \ingroup msg_simulation - * \brief Retrieves a registered main function - * - * Registers a code function in a global table. - * This table is then used by #MSG_launch_application. - * \param name the reference name of the function. - */ -xbt_main_func_t MSG_get_registered_function(const char *name) -{ - return SIMIX_get_registered_function(name); -} - /** * \brief register functions bypassing the parser */ -void MSG_set_function(const char *host_id, const char *function_name, - xbt_dynar_t arguments) +void MSG_set_function(const char *host_id, const char *function_name, xbt_dynar_t arguments) { SIMIX_process_set_function(host_id, function_name, arguments, -1, -1); } +}