-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2018. 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 <string>
-#include <vector>
-
#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 <simgrid/engine.h>
#include <xbt/ex.hpp>
+#include <string>
+#include <vector>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
extern int surf_parse_lineno;
}
/**
- * \brief An application deployer.
+ * @brief An application deployer.
*
- * Creates the process described in \a file.
- * \param file a filename of a xml description of the application. This file
+ * Creates the process described in @a file.
+ * @param file a filename of a xml description of the application. This file
* follows this DTD :
*
- * \include surfxml.dtd
+ * @include surfxml.dtd
*
* Here is a small example of such a platform
*
- * \include small_deployment.xml
+ * @include small_deployment.xml
*
*/
-void SIMIX_launch_application(const char *file)
+void SIMIX_launch_application(std::string file)
{
XBT_ATTRIB_UNUSED int parse_status;
xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application.");
try {
parse_status = surf_parse();
surf_parse_close();
- xbt_assert(not parse_status, "Parse error at %s:%d", file, surf_parse_lineno);
+ xbt_assert(not parse_status, "Parse error at %s:%d", file.c_str(), surf_parse_lineno);
}
catch (xbt_ex& e) {
- XBT_ERROR("Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
- file, surf_parse_lineno);
+ XBT_ERROR(
+ "Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
+ file.c_str(), surf_parse_lineno);
throw;
}
}
+void SIMIX_launch_application(const char* file) // deprecated
+{
+ simgrid_load_deployment(file);
+}
+
// Wrap a main() function into a ActorCodeFactory:
static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
{
- return [code](std::vector<std::string> args) {
- return simgrid::xbt::wrapMain(code, std::move(args));
- };
+ return [code](std::vector<std::string> args) { return simgrid::xbt::wrap_main(code, std::move(args)); };
+}
+static simgrid::simix::ActorCodeFactory toActorCodeFactory(void (*code)(std::vector<std::string>))
+{
+ return [code](std::vector<std::string> args) { return simgrid::xbt::wrap_main(code, std::move(args)); };
}
/**
- * \brief Registers a #xbt_main_func_t code in a global table.
+ * @brief Registers a #xbt_main_func_t code in a global table.
*
* Registers a code function in a global table.
* This table is then used by #SIMIX_launch_application.
- * \param name the reference name of the function.
- * \param code the function
+ * @param name the reference name of the function.
+ * @param code the function
*/
-void SIMIX_function_register(const char *name, xbt_main_func_t code)
+void SIMIX_function_register(std::string name, xbt_main_func_t code)
+{
+ simix_global->registered_functions[name] = toActorCodeFactory(code);
+}
+void SIMIX_function_register(std::string name, void (*code)(std::vector<std::string>))
{
- xbt_assert(simix_global,
- "SIMIX_global_init has to be called before SIMIX_function_register.");
simix_global->registered_functions[name] = toActorCodeFactory(code);
}
+void SIMIX_function_register(const char* name, xbt_main_func_t code) // deprecated
+{
+ simgrid_register_function(name, code);
+}
+
/**
- * \brief Registers a #xbt_main_func_t code as default value.
+ * @brief Registers a #xbt_main_func_t code as default value.
*
- * Registers a code function as being the default value. This function will get used by SIMIX_launch_application() when there is no registered function of the requested name in.
- * \param code the function
+ * Registers a code function as being the default value. This function will get used by SIMIX_launch_application() when
+ * there is no registered function of the requested name in.
+ * @param code the function
*/
void SIMIX_function_register_default(xbt_main_func_t code)
{
}
/**
- * \brief Gets a #smx_actor_t code from the global table.
+ * @brief Gets a #smx_actor_t code from the global table.
*
* Gets a code function from the global table. Returns nullptr if there are no function registered with the name.
* This table is then used by #SIMIX_launch_application.
- * \param name the reference name of the function.
- * \return The #smx_actor_t or nullptr.
+ * @param name the reference name of the function.
+ * @return The #smx_actor_t or nullptr.
*/
-simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name)
+simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(std::string name)
{
xbt_assert(simix_global,
"SIMIX_global_init has to be called before SIMIX_get_actor_code_factory.");
return i->second;
}
-/**
- * \brief Bypass the parser, get arguments, and set function to each process
- */
+/** @brief Bypass the parser, get arguments, and set function to each process */
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)
namespace simgrid {
namespace simix {
-void registerFunction(const char* name, ActorCodeFactory factory)
+void register_function(std::string name, ActorCodeFactory factory)
{
simix_global->registered_functions[name] = std::move(factory);
}
