X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a3e94ca4fe07f112f3efc9b8061e44097895aee..3580b0137eab12ca216d9847823c86918b10dd53:/src/bindings/java/JavaContext.hpp diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp index 938819dac8..8af830e61a 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-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2022. 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. */ @@ -11,7 +11,6 @@ #include #include -#include "simgrid/simix.h" #include "src/kernel/context/ContextThread.hpp" #include "jmsg.hpp" @@ -23,7 +22,7 @@ namespace context { class JavaContext; class JavacontextFactory; -class JavaContext : public simgrid::kernel::context::SerialThreadContext { +class JavaContext : public SerialThreadContext { public: // The java process instance bound with the msg process structure: jobject jprocess_ = nullptr; @@ -31,13 +30,13 @@ public: JNIEnv* jenv_ = nullptr; friend class JavaContextFactory; - JavaContext(std::function&& code, smx_actor_t actor); + JavaContext(std::function&& code, actor::ActorImpl* actor); void start_hook() override; - void stop_hook() override; + void stop() override; }; -class JavaContextFactory : public simgrid::kernel::context::ContextFactory { +class JavaContextFactory : public ContextFactory { public: JavaContextFactory(); ~JavaContextFactory() override; @@ -45,9 +44,11 @@ public: void run_all() override; }; -XBT_PRIVATE simgrid::kernel::context::ContextFactory* java_factory(); +XBT_PRIVATE ContextFactory* java_factory(); XBT_PRIVATE void java_main_jprocess(jobject process); -}}} // namespace simgrid::kernel::context +} // namespace context +} // namespace kernel +} // namespace simgrid #endif /* SIMGRID_JAVA_JAVA_CONTEXT_HPP */