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
more consistant identifier names around Java objects' finalization
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg.c
diff --git
a/src/bindings/java/jmsg.c
b/src/bindings/java/jmsg.c
index
ecb2108
..
b5a7abb
100644
(file)
--- a/
src/bindings/java/jmsg.c
+++ b/
src/bindings/java/jmsg.c
@@
-6,7
+6,7
@@
/* 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. */
-#include <
msg
/msg.h>
+#include <
simgrid
/msg.h>
#include <simgrid/simix.h>
#include <surf/surfxml_parse.h>
#include <locale.h>
#include <simgrid/simix.h>
#include <surf/surfxml_parse.h>
#include <locale.h>
@@
-67,8
+67,11
@@
void jmsg_throw_status(JNIEnv *env, msg_error_t status) {
case MSG_HOST_FAILURE:
jxbt_throw_host_failure(env,NULL);
break;
case MSG_HOST_FAILURE:
jxbt_throw_host_failure(env,NULL);
break;
+ case MSG_TASK_CANCELED:
+ jxbt_throw_task_cancelled(env,NULL);
+ break;
default:
default:
- jxbt_throw_native(env,xbt_strdup("
communication failed
"));
+ jxbt_throw_native(env,xbt_strdup("
undefined message failed (please see jmsg_throw_status function in jmsg.c)
"));
}
}
}
}
@@
-101,9
+104,7
@@
Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
const char *tmp;
XBT_LOG_CONNECT(jmsg);
const char *tmp;
XBT_LOG_CONNECT(jmsg);
-#ifdef HAVE_TRACING
XBT_LOG_CONNECT(jtrace);
XBT_LOG_CONNECT(jtrace);
-#endif
(*env)->GetJavaVM(env, &__java_vm);
(*env)->GetJavaVM(env, &__java_vm);