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
Revert "clean the build of the jarfile so that it works with cmake >= 2.8.12 too"
[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
7e40aec
..
ec9c9d4
100644
(file)
--- a/
src/bindings/java/jmsg_process.c
+++ b/
src/bindings/java/jmsg_process.c
@@
-1,6
+1,6
@@
/* Functions related to the java process instances. */
/* Functions related to the java process instances. */
-/* Copyright (c) 2007-201
2
. The SimGrid Team.
+/* Copyright (c) 2007-201
3
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-335,7
+335,7
@@
Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env,
JNIEXPORT void JNICALL
Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos)
{
JNIEXPORT void JNICALL
Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos)
{
- double time =
jmillis / 1000 + jnanos / 1
000;
+ double time =
((double)jmillis) / 1000 + ((double)jnanos) / 1000000
000;
msg_error_t rv;
rv = MSG_process_sleep(time);
if (rv != MSG_OK) {
msg_error_t rv;
rv = MSG_process_sleep(time);
if (rv != MSG_OK) {
@@
-348,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);
@@
-389,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);