A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/master' into issue95
[simgrid.git]
/
src
/
bindings
/
java
/
JavaContext.hpp
diff --git
a/src/bindings/java/JavaContext.hpp
b/src/bindings/java/JavaContext.hpp
index
39f01a9
..
70873a5
100644
(file)
--- a/
src/bindings/java/JavaContext.hpp
+++ b/
src/bindings/java/JavaContext.hpp
@@
-11,9
+11,7
@@
#include <functional>
#include <jni.h>
#include <functional>
#include <jni.h>
-#include "simgrid/simix.h"
#include "src/kernel/context/ContextThread.hpp"
#include "src/kernel/context/ContextThread.hpp"
-#include "src/simix/smx_private.hpp"
#include "jmsg.hpp"
#include "jmsg.hpp"
@@
-24,7
+22,7
@@
namespace context {
class JavaContext;
class JavacontextFactory;
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;
public:
// The java process instance bound with the msg process structure:
jobject jprocess_ = nullptr;
@@
-32,13
+30,13
@@
public:
JNIEnv* jenv_ = nullptr;
friend class JavaContextFactory;
JNIEnv* jenv_ = nullptr;
friend class JavaContextFactory;
- JavaContext(std::function<void()>&& code,
smx_actor_t
actor);
+ JavaContext(std::function<void()>&& code,
actor::ActorImpl*
actor);
void start_hook() override;
void stop_hook() override;
};
void start_hook() override;
void stop_hook() override;
};
-class JavaContextFactory : public
simgrid::kernel::context::
ContextFactory {
+class JavaContextFactory : public ContextFactory {
public:
JavaContextFactory();
~JavaContextFactory() override;
public:
JavaContextFactory();
~JavaContextFactory() override;
@@
-46,9
+44,11
@@
public:
void run_all() 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);
XBT_PRIVATE void java_main_jprocess(jobject process);
-}}} // namespace simgrid::kernel::context
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
#endif /* SIMGRID_JAVA_JAVA_CONTEXT_HPP */
#endif /* SIMGRID_JAVA_JAVA_CONTEXT_HPP */