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 java build
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg_host.cpp
diff --git
a/src/bindings/java/jmsg_host.cpp
b/src/bindings/java/jmsg_host.cpp
index
9e16cc0
..
1d879d8
100644
(file)
--- a/
src/bindings/java/jmsg_host.cpp
+++ b/
src/bindings/java/jmsg_host.cpp
@@
-50,7
+50,7
@@
msg_host_t jhost_get_native(JNIEnv * env, jobject jhost) {
const char *jhost_get_name(jobject jhost, JNIEnv * env) {
msg_host_t host = jhost_get_native(env, jhost);
const char *jhost_get_name(jobject jhost, JNIEnv * env) {
msg_host_t host = jhost_get_native(env, jhost);
- return
MSG_host_get_name(host
);
+ return
host->cname(
);
}
jboolean jhost_is_valid(jobject jhost, JNIEnv * env) {
}
jboolean jhost_is_valid(jobject jhost, JNIEnv * env) {
@@
-144,8
+144,7
@@
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jc
return nullptr;
}
/* Sets the host name */
return nullptr;
}
/* Sets the host name */
- const char *name = MSG_host_get_name(host);
- jobject jname = env->NewStringUTF(name);
+ jobject jname = env->NewStringUTF(host->cname());
env->SetObjectField(jhost, jhost_field_Host_name, jname);
/* Bind & store it */
jhost_bind(jhost, host, env);
env->SetObjectField(jhost, jhost_field_Host_name, jname);
/* Bind & store it */
jhost_bind(jhost, host, env);
@@
-229,7
+228,7
@@
Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname,
const char *value_java = env->GetStringUTFChars((jstring) jvalue, 0);
char *value = xbt_strdup(value_java);
const char *value_java = env->GetStringUTFChars((jstring) jvalue, 0);
char *value = xbt_strdup(value_java);
- MSG_host_set_property_value(host, name, value
, xbt_free_f
);
+ MSG_host_set_property_value(host, name, value);
env->ReleaseStringUTFChars((jstring) jvalue, value_java);
env->ReleaseStringUTFChars((jstring) jname, name);
env->ReleaseStringUTFChars((jstring) jvalue, value_java);
env->ReleaseStringUTFChars((jstring) jname, name);
@@
-351,7
+350,7
@@
JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv * env, jclas
jhost = (jobject) host->extension(JAVA_HOST_LEVEL);
if (!jhost) {
jhost = (jobject) host->extension(JAVA_HOST_LEVEL);
if (!jhost) {
- jname = env->NewStringUTF(
MSG_host_get_name(host
));
+ jname = env->NewStringUTF(
host->cname(
));
jhost = Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname);
/* FIXME: leak of jname ? */
jhost = Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname);
/* FIXME: leak of jname ? */