X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..b9625f82f86db0674e911887addce45dca31b57f:/src/bindings/java/JavaContext.hpp diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp index 47fe472983..5a7caf6fb4 100644 --- a/src/bindings/java/JavaContext.hpp +++ b/src/bindings/java/JavaContext.hpp @@ -1,6 +1,6 @@ /* Context switching within the JVM. */ -/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2020. 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. */ @@ -14,7 +14,6 @@ #include "simgrid/simix.h" #include "src/kernel/context/ContextThread.hpp" #include "src/simix/smx_private.hpp" -#include "xbt/xbt_os_thread.h" #include "jmsg.hpp" @@ -33,20 +32,17 @@ public: JNIEnv* jenv_ = nullptr; friend class JavaContextFactory; - JavaContext(std::function code, - void_pfn_smxprocess_t cleanup_func, - smx_actor_t process); + JavaContext(std::function&& code, smx_actor_t actor); void start_hook() override; - void stop() override; + void stop_hook() override; }; class JavaContextFactory : public simgrid::kernel::context::ContextFactory { public: JavaContextFactory(); ~JavaContextFactory() override; - JavaContext* create_context(std::function code, - void_pfn_smxprocess_t, smx_actor_t process) override; + Context* create_context(std::function&& code, actor::ActorImpl* actor) override; void run_all() override; }; @@ -55,4 +51,4 @@ XBT_PRIVATE void java_main_jprocess(jobject process); }}} // namespace simgrid::kernel::context -#endif /* !_XBT_CONTEXT_JAVA_H */ +#endif /* SIMGRID_JAVA_JAVA_CONTEXT_HPP */