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
5458cc1
..
70873a5
100644
(file)
--- a/
src/bindings/java/JavaContext.hpp
+++ b/
src/bindings/java/JavaContext.hpp
@@
-1,6
+1,6
@@
/* Context switching within the JVM. */
/* Context switching within the JVM. */
-/* Copyright (c) 2009-20
18
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-20
21
. 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. */
/* 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 <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 "xbt/xbt_os_thread.h"
#include "jmsg.hpp"
#include "jmsg.hpp"
@@
-25,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;
@@
-33,26
+30,25
@@
public:
JNIEnv* jenv_ = nullptr;
friend class JavaContextFactory;
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 start_hook() override;
- void stop() override;
+ void stop
_hook
() override;
};
};
-class JavaContextFactory : public
simgrid::kernel::context::
ContextFactory {
+class JavaContextFactory : public ContextFactory {
public:
JavaContextFactory();
~JavaContextFactory() override;
public:
JavaContextFactory();
~JavaContextFactory() 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;
};
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
/* !_XBT_CONTEXT_JAVA_H
*/
+#endif
/* SIMGRID_JAVA_JAVA_CONTEXT_HPP
*/