bugfix in Task.setDataSize(): change both C and Java worlds

diff --git a/ChangeLog b/ChangeLog
index d7b768a..1bd4768 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 SimGrid (3.10) NOT RELEASED; urgency=low
 
 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 <simgrid-devel@lists.gforge.inria.fr>
 
 
 -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 

diff --git a/src/bindings/java/jmsg_task.c b/src/bindings/java/jmsg_task.c
index 832b832..f6b80d6 100644 (file)
--- 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_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;
 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, "<init>", "()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_method_Comm_constructor = (*env)->GetMethodID(env, jtask_class_Comm, "<init>", "()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");
   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;
        }
     jxbt_throw_notbound(env, "task", jtask);
     return;
        }

+        (*env)->SetDoubleField(env, jtask, jtask_field_Task_messageSize, dataSize);

        MSG_task_set_data_size(task, (double) dataSize);
 }
 
        MSG_task_set_data_size(task, (double) dataSize);
 }