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
Fix errors caught by java -Xcheck:jni.
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg_process.c
diff --git
a/src/bindings/java/jmsg_process.c
b/src/bindings/java/jmsg_process.c
index
233a614
..
2f6216e
100644
(file)
--- a/
src/bindings/java/jmsg_process.c
+++ b/
src/bindings/java/jmsg_process.c
@@
-56,17
+56,21
@@
void jprocess_join(jobject jprocess, JNIEnv * env)
msg_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env)
{
msg_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env)
{
- return (msg_process_t) (long) (*env)->GetLongField(env, jprocess, jprocess_field_Process_bind);
+ return
+ (msg_process_t)(intptr_t)(*env)->GetLongField(env, jprocess,
+ jprocess_field_Process_bind);
}
void jprocess_bind(jobject jprocess, msg_process_t process, JNIEnv * env)
{
}
void jprocess_bind(jobject jprocess, msg_process_t process, JNIEnv * env)
{
- (*env)->SetLongField(env, jprocess, jprocess_field_Process_bind, (jlong)(process));
+ (*env)->SetLongField(env, jprocess, jprocess_field_Process_bind,
+ (intptr_t)process);
}
jlong jprocess_get_id(jobject jprocess, JNIEnv * env)
{
}
jlong jprocess_get_id(jobject jprocess, JNIEnv * env)
{
- return (*env)->GetLongField(env, jprocess, jprocess_field_Process_id);
+ return
+ (intptr_t)(*env)->GetLongField(env, jprocess, jprocess_field_Process_id);
}
jstring jprocess_get_name(jobject jprocess, JNIEnv * env)
}
jstring jprocess_get_name(jobject jprocess, JNIEnv * env)
@@
-128,7
+132,7
@@
Java_org_simgrid_msg_Process_create(JNIEnv * env,
/* bind/retrieve the msg host */
host = MSG_get_host_by_name(hostname);
/* bind/retrieve the msg host */
host = MSG_get_host_by_name(hostname);
- if (!(host)) { /* not b
inde
d */
+ if (!(host)) { /* not b
oun
d */
jxbt_throw_host_not_found(env, hostname);
return;
}
jxbt_throw_host_not_found(env, hostname);
return;
}
@@
-344,6
+348,8
@@
Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess,
{
msg_error_t rv;
rv = MSG_process_sleep((double)jseconds);
{
msg_error_t rv;
rv = MSG_process_sleep((double)jseconds);
+ if ((*env)->ExceptionOccurred(env))
+ return;
if (rv != MSG_OK) {
XBT_DEBUG("Status NOK");
jmsg_throw_status(env,rv);
if (rv != MSG_OK) {
XBT_DEBUG("Status NOK");
jmsg_throw_status(env,rv);
@@
-385,6
+391,7
@@
Java_org_simgrid_msg_Process_migrate(JNIEnv * env,
msg_error_t rv = MSG_process_migrate(process, host);
if (rv != MSG_OK) {
jmsg_throw_status(env,rv);
msg_error_t rv = MSG_process_migrate(process, host);
if (rv != MSG_OK) {
jmsg_throw_status(env,rv);
+ return;
}
/* change the host java side */
(*env)->SetObjectField(env, jprocess, jprocess_field_Process_host, jhost);
}
/* change the host java side */
(*env)->SetObjectField(env, jprocess, jprocess_field_Process_host, jhost);