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
Rename StopRequest into ForcefulKillException to contribute to #325
[simgrid.git]
/
src
/
bindings
/
java
/
JavaContext.hpp
diff --git
a/src/bindings/java/JavaContext.hpp
b/src/bindings/java/JavaContext.hpp
index
47fe472
..
0a750b2
100644
(file)
--- a/
src/bindings/java/JavaContext.hpp
+++ b/
src/bindings/java/JavaContext.hpp
@@
-14,7
+14,6
@@
#include "simgrid/simix.h"
#include "src/kernel/context/ContextThread.hpp"
#include "src/simix/smx_private.hpp"
#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"
#include "jmsg.hpp"
@@
-33,20
+32,17
@@
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, smx_actor_t actor);
void start_hook() override;
void start_hook() override;
- void stop() override;
+ void stop
_hook
() override;
};
class JavaContextFactory : public simgrid::kernel::context::ContextFactory {
public:
JavaContextFactory();
~JavaContextFactory() override;
};
class JavaContextFactory : public simgrid::kernel::context::ContextFactory {
public:
JavaContextFactory();
~JavaContextFactory() override;
- JavaContext* create_context(std::function<void()> code,
- void_pfn_smxprocess_t, smx_actor_t process) override;
+ JavaContext* create_context(std::function<void()> code, smx_actor_t actor) override;
void run_all() override;
};
void run_all() override;
};