Use references for parameters of type std::function.

[simgrid.git] / src / bindings / java / JavaContext.cpp

diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp
index 7adaaaa..5d500af 100644 (file)
--- a/src/bindings/java/JavaContext.cpp
+++ b/src/bindings/java/JavaContext.cpp
@@ -29,15 +29,14 @@ ContextFactory* java_factory()
 
 JavaContextFactory::JavaContextFactory() : ContextFactory()
 {
-  xbt_binary_name = xbt_strdup("java"); // Used by the backtrace displayer
+  xbt_assert(xbt_binary_name && strcmp(xbt_binary_name, "java") == 0); // Set by Java_org_simgrid_msg_Msg_init
 }
 
 JavaContextFactory::~JavaContextFactory()=default;
 
-JavaContext* JavaContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_fun,
-                                                smx_actor_t actor)
+JavaContext* JavaContextFactory::create_context(std::function<void()>&& code, smx_actor_t actor)
 {
-  return this->new_context<JavaContext>(std::move(code), cleanup_fun, actor);
+  return this->new_context<JavaContext>(std::move(code), actor);
 }
 
 void JavaContextFactory::run_all()
@@ -45,8 +44,8 @@ void JavaContextFactory::run_all()
   SerialThreadContext::run_all();
 }
 
-JavaContext::JavaContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
-    : SerialThreadContext(std::move(code), cleanup_func, process, false /* not maestro */)
+JavaContext::JavaContext(std::function<void()>&& code, smx_actor_t actor)
+    : SerialThreadContext(std::move(code), actor, false /* not maestro */)
 {
   /* ThreadContext already does all we need */
 }
@@ -75,8 +74,7 @@ void JavaContext::stop_hook()
        * until run_jprocess(), IIUC.
        */
       jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed");
-      // XBT_ERROR("Cannot detach the current thread");
-      // simgrid::xbt::Backtrace().display();
+      XBT_DEBUG("Cannot detach the current thread");
     }
 }