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
use unordered_maps to store properties
[simgrid.git]
/
include
/
simgrid
/
simix.hpp
diff --git
a/include/simgrid/simix.hpp
b/include/simgrid/simix.hpp
index
ac29c00
..
9943239
100644
(file)
--- a/
include/simgrid/simix.hpp
+++ b/
include/simgrid/simix.hpp
@@
-12,8
+12,8
@@
#include <xbt/future.hpp>
#include <xbt/signal.hpp>
#include <xbt/future.hpp>
#include <xbt/signal.hpp>
-#include <map>
#include <string>
#include <string>
+#include <unordered_map>
XBT_PUBLIC void simcall_run_kernel(std::function<void()> const& code);
XBT_PUBLIC void simcall_run_kernel(std::function<void()> const& code);
@@
-49,8
+49,7
@@
namespace simix {
* More importantly, this enforces a deterministic/reproducible ordering
* of the operation with respect to other simcalls.
*/
* More importantly, this enforces a deterministic/reproducible ordering
* of the operation with respect to other simcalls.
*/
-template<class F>
-typename std::result_of<F()>::type kernelImmediate(F&& code)
+template <class F> typename std::result_of<F()>::type simcall(F&& code)
{
// If we are in the maestro, we take the fast path and execute the
// code directly without simcall mashalling/unmarshalling/dispatch:
{
// If we are in the maestro, we take the fast path and execute the
// code directly without simcall mashalling/unmarshalling/dispatch:
@@
-63,7
+62,6
@@
typename std::result_of<F()>::type kernelImmediate(F&& code)
typedef typename std::result_of<F()>::type R;
simgrid::xbt::Result<R> result;
simcall_run_kernel([&]{
typedef typename std::result_of<F()>::type R;
simgrid::xbt::Result<R> result;
simcall_run_kernel([&]{
- xbt_assert(SIMIX_is_maestro(), "Not in maestro");
simgrid::xbt::fulfillPromise(result, std::forward<F>(code));
});
return result.get();
simgrid::xbt::fulfillPromise(result, std::forward<F>(code));
});
return result.get();
@@
-77,13
+75,13
@@
typedef std::function<void()> ActorCode;
// Create ActorCode based on argv:
typedef std::function<ActorCode(std::vector<std::string> args)> ActorCodeFactory;
// Create ActorCode based on argv:
typedef std::function<ActorCode(std::vector<std::string> args)> ActorCodeFactory;
-XBT_PUBLIC void register
F
unction(const char* name, ActorCodeFactory factory);
+XBT_PUBLIC void register
_f
unction(const char* name, ActorCodeFactory factory);
/** These functions will be called when we detect a deadlock: any remaining process is locked on an action
*
* If these functions manage to unlock some of the processes, then the deadlock will be avoided.
*/
/** These functions will be called when we detect a deadlock: any remaining process is locked on an action
*
* If these functions manage to unlock some of the processes, then the deadlock will be avoided.
*/
-
extern
simgrid::xbt::signal<void()> onDeadlock;
+
XBT_PUBLIC_DATA
simgrid::xbt::signal<void()> onDeadlock;
}
}
}
}
@@
-102,13
+100,13
@@
typedef smx_actor_t (*smx_creation_func_t)(
/* name */ const char*, std::function<void()> code,
/* userdata */ void*,
/* hostname */ sg_host_t,
/* name */ const char*, std::function<void()> code,
/* userdata */ void*,
/* hostname */ sg_host_t,
- /* props */ std::map<std::string, std::string>*,
+ /* props */ std::
unordered_
map<std::string, std::string>*,
/* parent_process */ smx_actor_t);
/* parent_process */ smx_actor_t);
-
extern "C"
XBT_PUBLIC void SIMIX_function_register_process_create(smx_creation_func_t function);
+XBT_PUBLIC void SIMIX_function_register_process_create(smx_creation_func_t function);
XBT_PUBLIC smx_actor_t simcall_process_create(const char* name, std::function<void()> code, void* data, sg_host_t host,
XBT_PUBLIC smx_actor_t simcall_process_create(const char* name, std::function<void()> code, void* data, sg_host_t host,
- std::map<std::string, std::string>* properties);
+ std::
unordered_
map<std::string, std::string>* properties);
XBT_PUBLIC smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task<void()> callback);
XBT_PUBLIC smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task<void()> callback);