unify how threaded and parallelisable context factories find context_self

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

diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp
index 7af0b5e..5458cc1 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-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. 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. */
@@ -12,6 +12,7 @@
 #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"
 
@@ -24,35 +25,26 @@ namespace context {
 class JavaContext;
 class JavacontextFactory;
 
-class JavaContext : public simgrid::kernel::context::Context {
+class JavaContext : public simgrid::kernel::context::SerialThreadContext {
 public:
   // The java process instance bound with the msg process structure:
-  jobject jprocess = nullptr;
+  jobject jprocess_ = nullptr;
   // JNI interface pointer associated to this thread:
-  JNIEnv *jenv = nullptr;
-  xbt_os_thread_t thread = nullptr;
-  // Sempahore used to schedule/yield the process:
-  xbt_os_sem_t begin = nullptr;
-  // Semaphore used to schedule/unschedule the process:
-  xbt_os_sem_t end = nullptr;
+  JNIEnv* jenv_           = nullptr;
 
   friend class JavaContextFactory;
   JavaContext(std::function<void()> code,
           void_pfn_smxprocess_t cleanup_func,
           smx_actor_t process);
-  ~JavaContext() override;
+
+  void start_hook() override;
   void stop() override;
-  void suspend() override;
-  void resume();
-private:
-  static void* wrapper(void *data);
 };
 
 class JavaContextFactory : public simgrid::kernel::context::ContextFactory {
 public:
   JavaContextFactory();
   ~JavaContextFactory() override;
-  JavaContext* self() override;
   JavaContext* create_context(std::function<void()> code,
     void_pfn_smxprocess_t, smx_actor_t process) override;
   void run_all() override;