A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
On some systems, sqrt(int) is not defined properly. On others its just implemented...
[simgrid.git]
/
src
/
simix
/
smx_deployment.cpp
diff --git
a/src/simix/smx_deployment.cpp
b/src/simix/smx_deployment.cpp
index
e947067
..
2f2ff22
100644
(file)
--- a/
src/simix/smx_deployment.cpp
+++ b/
src/simix/smx_deployment.cpp
@@
-1,13
+1,13
@@
-/* Copyright (c) 2007-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
9
. 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. */
/* 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 "simgrid/Exception.hpp"
#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 "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>
#include <string>
#include <vector>
@@
-36,7
+36,7
@@
void SIMIX_init_application()
* @include small_deployment.xml
*
*/
* @include small_deployment.xml
*
*/
-void SIMIX_launch_application(
std::string
file)
+void SIMIX_launch_application(
const std::string&
file)
{
XBT_ATTRIB_UNUSED int parse_status;
xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application.");
{
XBT_ATTRIB_UNUSED int parse_status;
xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application.");
@@
-48,8
+48,7
@@
void SIMIX_launch_application(std::string file)
parse_status = surf_parse();
surf_parse_close();
xbt_assert(not parse_status, "Parse error at %s:%d", file.c_str(), surf_parse_lineno);
parse_status = surf_parse();
surf_parse_close();
xbt_assert(not parse_status, "Parse error at %s:%d", file.c_str(), surf_parse_lineno);
- }
- catch (xbt_ex& e) {
+ } catch (const xbt_ex&) {
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);
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);
@@
-67,6
+66,10
@@
static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
{
return [code](std::vector<std::string> args) { return simgrid::xbt::wrap_main(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 std::bind(std::move(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.
@@
-76,10
+79,12
@@
static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
* @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(std::string name, xbt_main_func_t code)
+void SIMIX_function_register(const std::string& name, xbt_main_func_t code)
+{
+ simix_global->registered_functions[name] = toActorCodeFactory(code);
+}
+void SIMIX_function_register(const 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);
}
simix_global->registered_functions[name] = toActorCodeFactory(code);
}
@@
-109,7
+114,7
@@
void SIMIX_function_register_default(xbt_main_func_t code)
* @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(
std::string
name)
+simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(
const std::string&
name)
{
xbt_assert(simix_global,
"SIMIX_global_init has to be called before SIMIX_get_actor_code_factory.");
{
xbt_assert(simix_global,
"SIMIX_global_init has to be called before SIMIX_get_actor_code_factory.");
@@
-155,9
+160,9
@@
void SIMIX_process_set_function(const char* process_host, const char* process_fu
namespace simgrid {
namespace simix {
namespace simgrid {
namespace simix {
-void register_function(
std::string name, ActorCodeFactory
factory)
+void register_function(
const std::string& name, const ActorCodeFactory&
factory)
{
{
- simix_global->registered_functions[name] =
std::move(factory)
;
+ simix_global->registered_functions[name] =
factory
;
}
}
}
}