From 02ee3c18fe07a264062e9124381b618b5fef287b Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 1 Feb 2013 01:46:57 +0100 Subject: [PATCH 1/1] bugfix in Task.setDataSize(): change both C and Java worlds --- ChangeLog | 6 +++++- src/bindings/java/jmsg_task.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d7b768a791..1bd4768c67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ SimGrid (3.10) NOT RELEASED; urgency=low - (to complete) + Java: + * Reintegrate Java to the main archive as desynchronizing these + package is not acceptable anymore (Java is now considered stable) + * Bugfix: Task.setDataSize() only changed the C world, not the value + cached in the Java world -- $date Da SimGrid team diff --git a/src/bindings/java/jmsg_task.c b/src/bindings/java/jmsg_task.c index 832b832e1f..f6b80d650c 100644 --- a/src/bindings/java/jmsg_task.c +++ b/src/bindings/java/jmsg_task.c @@ -23,6 +23,7 @@ static jmethodID jtask_method_Comm_constructor; static jfieldID jtask_field_Task_bind; static jfieldID jtask_field_Task_name; +static jfieldID jtask_field_Task_messageSize; static jfieldID jtask_field_Comm_bind; static jfieldID jtask_field_Comm_taskBind; static jfieldID jtask_field_Comm_receiving; @@ -50,6 +51,7 @@ Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls) { jtask_method_Comm_constructor = (*env)->GetMethodID(env, jtask_class_Comm, "", "()V"); jtask_field_Task_bind = jxbt_get_jfield(env, jtask_class_Task, "bind", "J"); jtask_field_Task_name = jxbt_get_jfield(env, jtask_class_Task, "name", "Ljava/lang/String;"); + jtask_field_Task_messageSize = jxbt_get_jfield(env, jtask_class_Task, "messageSize", "D"); jtask_field_Comm_bind = jxbt_get_jfield(env, jtask_class_Comm, "bind", "J"); jtask_field_Comm_taskBind = jxbt_get_jfield(env, jtask_class_Comm, "taskBind", "J"); jtask_field_Comm_receiving = jxbt_get_jfield(env, jtask_class_Comm, "receiving", "Z"); @@ -348,6 +350,7 @@ Java_org_simgrid_msg_Task_setDataSize jxbt_throw_notbound(env, "task", jtask); return; } + (*env)->SetDoubleField(env, jtask, jtask_field_Task_messageSize, dataSize); MSG_task_set_data_size(task, (double) dataSize); } -- 2.20.1