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
start the v3.17 development cycle
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg.cpp
diff --git
a/src/bindings/java/jmsg.cpp
b/src/bindings/java/jmsg.cpp
index
3a5392d
..
b732649
100644
(file)
--- a/
src/bindings/java/jmsg.cpp
+++ b/
src/bindings/java/jmsg.cpp
@@
-88,17
+88,9
@@
static void __JAVA_host_priv_free(void *host)
{
}
-static void __JAVA_storage_priv_free(void *storage)
-{
-}
-
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
{
- char **argv = nullptr;
- int index;
int argc = 0;
- jstring jval;
- const char *tmp;
XBT_LOG_CONNECT(java);
XBT_LOG_CONNECT(jtrace);
@@
-117,12
+109,12
@@
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, j
argc = static_cast<int>(env->GetArrayLength(jargs));
argc++;
-
argv = xbt_new(char *, argc + 1)
;
+
char** argv = new char*[argc + 1]
;
argv[0] = xbt_strdup("java");
- for (index = 0; index < argc - 1; index++) {
- j
val = (jstring)
env->GetObjectArrayElement(jargs, index);
- tmp = env->GetStringUTFChars(jval, 0);
+ for (in
t in
dex = 0; index < argc - 1; index++) {
+ j
string jval = (jstring)
env->GetObjectArrayElement(jargs, index);
+
const char*
tmp = env->GetStringUTFChars(jval, 0);
argv[index + 1] = xbt_strdup(tmp);
env->ReleaseStringUTFChars(jval, tmp);
}
@@
-132,12
+124,12
@@
JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, j
JAVA_HOST_LEVEL = simgrid::s4u::Host::extension_create(__JAVA_host_priv_free);
- for (index = 0; index < argc - 1; index++) {
+ for (in
t in
dex = 0; index < argc - 1; index++) {
env->SetObjectArrayElement(jargs, index, (jstring)env->NewStringUTF(argv[index + 1]));
free(argv[index]);
}
free(argv[argc]);
-
free(argv)
;
+
delete[] argv
;
}
JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
@@
-179,12
+171,12
@@
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNI
{
msg_netzone_t as = MSG_zone_get_root();
jobject jas = jnetzone_new_instance(env);
- if (
!
jas) {
+ if (
not
jas) {
jxbt_throw_jni(env, "java As instantiation failed");
return nullptr;
}
jas = jnetzone_ref(env, jas);
- if (
!
jas) {
+ if (
not
jas) {
jxbt_throw_jni(env, "new global ref allocation failed");
return nullptr;
}