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 branch 'master' into adrien
[simgrid.git]
/
src
/
bindings
/
java
/
JavaContext.hpp
diff --git
a/src/bindings/java/JavaContext.hpp
b/src/bindings/java/JavaContext.hpp
index
108b2f2
..
5a7caf6
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
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-20
20
. 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. */
@@
-32,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;
+ Context* create_context(std::function<void()>&& code, actor::ActorImpl* actor) override;
void run_all() override;
};
void run_all() override;
};
@@
-54,4
+51,4
@@
XBT_PRIVATE void java_main_jprocess(jobject process);
}}} // namespace simgrid::kernel::context
}}} // namespace simgrid::kernel::context
-#endif
/* !_XBT_CONTEXT_JAVA_H
*/
+#endif
/* SIMGRID_JAVA_JAVA_CONTEXT_HPP
*/