Simplify the Context::stop() and reduce duplication

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

diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp
index 0a07f01..8af830e 100644 (file)
--- a/src/bindings/java/JavaContext.hpp
+++ b/src/bindings/java/JavaContext.hpp
@@ -1,6 +1,6 @@
 /* Context switching within the JVM.                                        */
 
-/* Copyright (c) 2009-2018. 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,10 +11,7 @@
 #include <functional>
 #include <jni.h>
 
-#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"
 
@@ -25,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;
@@ -33,27 +30,25 @@ public:
   JNIEnv* jenv_           = nullptr;
 
   friend class JavaContextFactory;
-  JavaContext(std::function<void()> code,
-          void_pfn_smxprocess_t cleanup_func,
-          smx_actor_t process);
+  JavaContext(std::function<void()>&& code, actor::ActorImpl* actor);
 
   void start_hook() override;
   void stop() override;
 };
 
-class JavaContextFactory : public simgrid::kernel::context::ContextFactory {
+class JavaContextFactory : public ContextFactory {
 public:
   JavaContextFactory();
   ~JavaContextFactory() override;
-  JavaContext* self() override;
-  JavaContext* create_context(std::function<void()> code,
-    void_pfn_smxprocess_t, smx_actor_t process) override;
+  Context* create_context(std::function<void()>&& code, actor::ActorImpl* actor) override;
   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                          /* !_XBT_CONTEXT_JAVA_H */
+#endif /* SIMGRID_JAVA_JAVA_CONTEXT_HPP */