-/* Copyright (c) 2007, 2009-2016. 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 "smx_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
+#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 <xbt/ex.hpp>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
- "Logging specific to SIMIX (deployment)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
extern int surf_parse_lineno;
-void SIMIX_init_application(void)
+void SIMIX_init_application()
{
sg_platf_exit();
sg_platf_init();
void SIMIX_launch_application(const char *file)
{
XBT_ATTRIB_UNUSED int parse_status;
- xbt_assert(simix_global,
- "SIMIX_global_init has to be called before SIMIX_launch_application.");
+ xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application.");
SIMIX_init_application();
try {
parse_status = surf_parse();
surf_parse_close();
- xbt_assert(!parse_status, "Parse error at %s:%d", file,surf_parse_lineno);
+ xbt_assert(not parse_status, "Parse error at %s:%d", file, 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.",
}
/**
- * \brief Gets a #smx_process_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_process_t or nullptr.
+ * \return The #smx_actor_t or nullptr.
*/
simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name)
{
* \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)
+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)
{
- s_sg_platf_process_cbarg_t process;
- memset(&process,0,sizeof(process));
+ simgrid::kernel::routing::ActorCreationArgs actor;
sg_host_t host = sg_host_by_name(process_host);
- if (!host)
+ if (not host)
THROWF(arg_error, 0, "Host '%s' unknown", process_host);
- process.host = sg_host_get_name(host);
-
- process.argc = 1 + xbt_dynar_length(arguments);
- process.argv = (const char**)xbt_new(char *, process.argc + 1);
- process.argv[0] = xbt_strdup(process_function);
+ actor.host = process_host;
+ actor.args.push_back(process_function);
/* add arguments */
unsigned int i;
char *arg;
xbt_dynar_foreach(arguments, i, arg) {
- process.argv[i + 1] = xbt_strdup(arg);
+ actor.args.push_back(arg);
}
- process.argv[process.argc] = nullptr;
// Check we know how to handle this function name:
simgrid::simix::ActorCodeFactory& parse_code = SIMIX_get_actor_code_factory(process_function);
xbt_assert(parse_code, "Function '%s' unknown", process_function);
- process.function = process_function;
- process.host = process_host;
- process.kill_time = process_kill_time;
- process.start_time = process_start_time;
- process.on_failure = SURF_PROCESS_ON_FAILURE_DIE;
- sg_platf_new_process(&process);
+ actor.function = process_function;
+ actor.host = process_host;
+ actor.kill_time = process_kill_time;
+ actor.start_time = process_start_time;
+ actor.on_failure = simgrid::kernel::routing::ActorOnFailure::DIE;
+ sg_platf_new_actor(&actor);
}
namespace simgrid {
namespace simix {
-void registerFunction(const char* name, ActorCodeFactory factory)
+void register_function(const char* name, ActorCodeFactory factory)
{
simix_global->registered_functions[name] = std::move(factory);
}
}
-}
\ No newline at end of file
+}