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
make SIMIX_context_self() useless and use Context::self() instead
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg.cpp
diff --git
a/src/bindings/java/jmsg.cpp
b/src/bindings/java/jmsg.cpp
index
143a28b
..
75b71f8
100644
(file)
--- a/
src/bindings/java/jmsg.cpp
+++ b/
src/bindings/java/jmsg.cpp
@@
-14,6
+14,7
@@
#include "simgrid/plugins/energy.h"
#include "simgrid/plugins/file_system.h"
#include "simgrid/plugins/live_migration.h"
#include "simgrid/plugins/energy.h"
#include "simgrid/plugins/file_system.h"
#include "simgrid/plugins/live_migration.h"
+#include "simgrid/plugins/load.h"
#include "simgrid/simix.h"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/simix.h"
#include "simgrid/s4u/Host.hpp"
@@
-49,7
+50,7
@@
JavaVM *__java_vm = nullptr;
JNIEnv *get_current_thread_env()
{
using simgrid::kernel::context::JavaContext;
JNIEnv *get_current_thread_env()
{
using simgrid::kernel::context::JavaContext;
- JavaContext* ctx = static_cast<JavaContext*>(
xbt_os_thread_get_extra_data
());
+ JavaContext* ctx = static_cast<JavaContext*>(
simgrid::kernel::context::Context::self
());
return ctx->jenv_;
}
return ctx->jenv_;
}
@@
-241,6
+242,9
@@
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_fileSystemInit()
sg_storage_file_system_init();
}
sg_storage_file_system_init();
}
+JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_loadInit() {
+ sg_host_load_plugin_init();
+}
/** Run a Java org.simgrid.msg.Process
*
* If needed, this waits for the process starting time.
/** Run a Java org.simgrid.msg.Process
*
* If needed, this waits for the process starting time.
@@
-265,7
+269,8
@@
static void run_jprocess(JNIEnv *env, jobject jprocess)
static int java_main(int argc, char *argv[])
{
JNIEnv *env = get_current_thread_env();
static int java_main(int argc, char *argv[])
{
JNIEnv *env = get_current_thread_env();
- simgrid::kernel::context::JavaContext* context = static_cast<simgrid::kernel::context::JavaContext*>(SIMIX_context_self());
+ simgrid::kernel::context::JavaContext* context =
+ static_cast<simgrid::kernel::context::JavaContext*>(simgrid::kernel::context::Context::self());
//Change the "." in class name for "/".
std::string arg0 = argv[0];
//Change the "." in class name for "/".
std::string arg0 = argv[0];
@@
-311,7
+316,8
@@
namespace context {
void java_main_jprocess(jobject jprocess)
{
JNIEnv *env = get_current_thread_env();
void java_main_jprocess(jobject jprocess)
{
JNIEnv *env = get_current_thread_env();
- simgrid::kernel::context::JavaContext* context = static_cast<simgrid::kernel::context::JavaContext*>(SIMIX_context_self());
+ simgrid::kernel::context::JavaContext* context =
+ static_cast<simgrid::kernel::context::JavaContext*>(simgrid::kernel::context::Context::self());
context->jprocess_ = jprocess;
jprocess_bind(context->jprocess_, MSG_process_self(), env);
context->jprocess_ = jprocess;
jprocess_bind(context->jprocess_, MSG_process_self(), env);