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
Merge branch 'master' into adrien
[simgrid.git]
/
src
/
bindings
/
java
/
jmsg_task.cpp
diff --git
a/src/bindings/java/jmsg_task.cpp
b/src/bindings/java/jmsg_task.cpp
index
5c28035
..
41f53c2
100644
(file)
--- a/
src/bindings/java/jmsg_task.cpp
+++ b/
src/bindings/java/jmsg_task.cpp
@@
-1,6
+1,6
@@
/* Functions related to the java task instances. */
/* Functions related to the java task instances. */
-/* Copyright (c) 2007-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
20
. The SimGrid Team. All rights reserved. */
/* 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. */
@@
-151,7
+151,7
@@
JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject
}
JNIEXPORT jstring JNICALL Java_org_simgrid_msg_Task_getName(JNIEnv * env, jobject jtask) {
}
JNIEXPORT jstring JNICALL Java_org_simgrid_msg_Task_getName(JNIEnv * env, jobject jtask) {
- msg_task_t task = jtask_to_native(jtask, env);
+
const_
msg_task_t task = jtask_to_native(jtask, env);
if (not task) {
jxbt_throw_notbound(env, "task", jtask);
if (not task) {
jxbt_throw_notbound(env, "task", jtask);
@@
-162,16
+162,14
@@
JNIEXPORT jstring JNICALL Java_org_simgrid_msg_Task_getName(JNIEnv * env, jobjec
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSender(JNIEnv * env, jobject jtask) {
}
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSender(JNIEnv * env, jobject jtask) {
- msg_process_t process;
-
- msg_task_t task = jtask_to_native(jtask, env);
+ const_msg_task_t task = jtask_to_native(jtask, env);
if (not task) {
jxbt_throw_notbound(env, "task", jtask);
return nullptr;
}
if (not task) {
jxbt_throw_notbound(env, "task", jtask);
return nullptr;
}
- process = MSG_task_get_sender(task);
+
auto const*
process = MSG_task_get_sender(task);
if (process == nullptr) {
return nullptr;
}
if (process == nullptr) {
return nullptr;
}
@@
-180,15
+178,14
@@
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSender(JNIEnv * env, jobj
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource(JNIEnv * env, jobject jtask)
{
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource(JNIEnv * env, jobject jtask)
{
- msg_host_t host;
- msg_task_t task = jtask_to_native(jtask, env);
+ const_msg_task_t task = jtask_to_native(jtask, env);
if (not task) {
jxbt_throw_notbound(env, "task", jtask);
return nullptr;
}
if (not task) {
jxbt_throw_notbound(env, "task", jtask);
return nullptr;
}
- host = MSG_task_get_source(task);
+
auto const*
host = MSG_task_get_source(task);
if (host == nullptr) {
return nullptr;
}
if (host == nullptr) {
return nullptr;
}
@@
-202,7
+199,7
@@
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource(JNIEnv * env, jobj
JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Task_getFlopsAmount(JNIEnv * env, jobject jtask)
{
JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Task_getFlopsAmount(JNIEnv * env, jobject jtask)
{
- msg_task_t ptask = jtask_to_native(jtask, env);
+
const_
msg_task_t ptask = jtask_to_native(jtask, env);
if (not ptask) {
jxbt_throw_notbound(env, "task", jtask);
if (not ptask) {
jxbt_throw_notbound(env, "task", jtask);
@@
-339,7
+336,7
@@
JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receiveBounded(JNIEnv* env,
msg_task_t task = nullptr;
const char *alias = env->GetStringUTFChars(jalias, 0);
msg_task_t task = nullptr;
const char *alias = env->GetStringUTFChars(jalias, 0);
- msg_error_t res = MSG_task_receive_
ext_bounded(&task, alias, jtimeout, /*host*/ nullptr
, rate);
+ msg_error_t res = MSG_task_receive_
with_timeout_bounded(&task, alias, jtimeout
, rate);
if (env->ExceptionOccurred())
return nullptr;
if (res != MSG_OK) {
if (env->ExceptionOccurred())
return nullptr;
if (res != MSG_OK) {