Update copyright lines with new year.

[simgrid.git] / include / simgrid / simix.hpp

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index ed5e128..7137598 100644 (file)
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team.
+/* Copyright (c) 2007-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,8 +12,8 @@
 #include <xbt/future.hpp>
 #include <xbt/signal.hpp>
 
-#include <map>
 #include <string>
+#include <unordered_map>
 
 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.
  */
-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:
@@ -62,9 +61,7 @@ typename std::result_of<F()>::type kernelImmediate(F&& code)
   // conveniently handles the success/failure value for us.
   typedef typename std::result_of<F()>::type R;
   simgrid::xbt::Result<R> result;
-  simcall_run_kernel([&]{
-    simgrid::xbt::fulfillPromise(result, std::forward<F>(code));
-  });
+  simcall_run_kernel([&] { simgrid::xbt::fulfill_promise(result, std::forward<F>(code)); });
   return result.get();
 }
 
@@ -73,41 +70,15 @@ XBT_PUBLIC const std::vector<smx_actor_t>& process_get_runnable();
 // What's executed as SIMIX actor code:
 typedef std::function<void()> ActorCode;
 
-// Create ActorCode based on argv:
+// Create an ActorCode based on a std::string
 typedef std::function<ActorCode(std::vector<std::string> args)> ActorCodeFactory;
 
-XBT_PUBLIC void register_function(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.
- */
-XBT_PUBLIC_DATA simgrid::xbt::signal<void()> onDeadlock;
+XBT_PUBLIC void register_function(std::string name, ActorCodeFactory factory);
 }
 }
 
-/*
- * Type of function that creates a process.
- * The function must accept the following parameters:
- * void* process: the process created will be stored there
- * const char *name: a name for the object. It is for user-level information and can be NULL
- * xbt_main_func_t code: is a function describing the behavior of the process
- * void *data: data a pointer to any data one may want to attach to the new object.
- * sg_host_t host: the location where the new process is executed
- * int argc, char **argv: parameters passed to code
- * std::map<std::string, std::string>* props: properties
- */
-typedef smx_actor_t (*smx_creation_func_t)(
-    /* name */ const char*, std::function<void()> code,
-    /* userdata */ void*,
-    /* hostname */ sg_host_t,
-    /* props */ std::map<std::string, std::string>*,
-    /* parent_process */ smx_actor_t);
-
-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,
-                                              std::map<std::string, std::string>* properties);
+XBT_PUBLIC smx_actor_t simcall_process_create(std::string name, simgrid::simix::ActorCode code, void* data,
+                                              sg_host_t host, std::unordered_map<std::string, std::string>* properties);
 
 XBT_PUBLIC smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task<void()> callback);