Add setComputeDuration in Task

[simgrid.git] / src / jmsg_task.c

diff --git a/src/jmsg_task.c b/src/jmsg_task.c
index 72a6480..8b52a30 100644 (file)
--- a/src/jmsg_task.c
+++ b/src/jmsg_task.c
@@ -16,11 +16,13 @@
 #include "jxbt_utilities.h"
 
 #include <msg/msg.h>
+
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
-static jmethodID jtask_field_Comm_constructor;
+static jmethodID jtask_method_Comm_constructor;
 
 static jfieldID jtask_field_Task_bind;
+static jfieldID jtask_field_Task_name;
 static jfieldID jtask_field_Comm_bind;
 static jfieldID jtask_field_Comm_taskBind;
 static jfieldID jtask_field_Comm_receiving;
@@ -43,15 +45,17 @@ jboolean jtask_is_valid(jobject jtask, JNIEnv * env)
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls) {
        jclass jtask_class_Comm = (*env)->FindClass(env, "org/simgrid/msg/Comm");
+       jclass jtask_class_Task = (*env)->FindClass(env, "org/simgrid/msg/Task");
 
-       jtask_field_Comm_constructor = (*env)->GetMethodID(env, jtask_class_Comm, "<init>", "()V");
+       jtask_method_Comm_constructor = (*env)->GetMethodID(env, jtask_class_Comm, "<init>", "()V");
        //FIXME: Don't use jxbt_get_sfield directly, it is slower.
        jtask_field_Task_bind = jxbt_get_sfield(env, "org/simgrid/msg/Task", "bind", "J");
+       jtask_field_Task_name = jxbt_get_jfield(env, jtask_class_Task, "name", "Ljava/lang/String;");
        jtask_field_Comm_bind = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "bind", "J");
        jtask_field_Comm_taskBind = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "taskBind", "J");
        jtask_field_Comm_receiving = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "receiving", "Z");
-       if (!jtask_field_Task_bind || !jtask_field_Comm_bind || !jtask_field_Comm_taskBind ||
-                 !jtask_field_Comm_receiving || !jtask_field_Comm_constructor) {
+       if (!jtask_field_Task_bind || !jtask_class_Task || !jtask_field_Comm_bind || !jtask_field_Comm_taskBind ||
+                 !jtask_field_Comm_receiving || !jtask_method_Comm_constructor) {
                        jxbt_throw_native(env,bprintf("Can't find some fields in Java class."));
                  }
 }
@@ -92,7 +96,8 @@ Java_org_simgrid_msg_Task_create(JNIEnv * env,
                       (double) jmessageSize, NULL);
   if (jname)
     (*env)->ReleaseStringUTFChars(env, jname, name);
-
+  /* sets the task name */
+  (*env)->SetObjectField(env, jtask, jtask_field_Task_name, jname);
   /* bind & store the task */
   jtask_bind(jtask, task, env);
   MSG_task_set_data(task, jtask);
@@ -175,7 +180,8 @@ Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env,
                                messageSizes, NULL);
 
   (*env)->ReleaseStringUTFChars(env, jname, name);
-
+  /* sets the task name */
+  (*env)->SetObjectField(env, jtask, jtask_field_Task_name, jname);
   /* associate the java task object and the native task */
   jtask_bind(jtask, task, env);
 
@@ -247,6 +253,9 @@ Java_org_simgrid_msg_Task_getSender(JNIEnv * env,
   }
 
   process = MSG_task_get_sender(task);
+  if (process == NULL) {
+       return NULL;
+  }
   return (jobject) native_to_java_process(process);
 }
 
@@ -263,7 +272,9 @@ Java_org_simgrid_msg_Task_getSource(JNIEnv * env,
   }
 
   host = MSG_task_get_source(task);
-
+  if (host == NULL) {
+       return NULL;
+  }
   if (!MSG_host_get_data(host)) {
     jxbt_throw_jni(env, "MSG_task_get_source() failed");
     return NULL;
@@ -310,6 +321,17 @@ Java_org_simgrid_msg_Task_setPriority(JNIEnv * env,
   MSG_task_set_priority(task, (double) priority);
 }
 JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Task_setComputeDuration
+               (JNIEnv *env, jobject jtask, jdouble computationAmount) {
+       m_task_t task = jtask_to_native_task(jtask, env);
+
+       if (!task) {
+    jxbt_throw_notbound(env, "task", jtask);
+    return;
+       }
+       MSG_task_set_compute_duration(task, (double) computationAmount);
+}
+JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask,
                                     jstring jalias,
                                     jdouble jtimeout)
@@ -441,7 +463,7 @@ Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) {
                return NULL;
        }
 
-       jobject jcomm = (*env)->NewObject(env, comm_class, jtask_field_Comm_constructor);
+       jobject jcomm = (*env)->NewObject(env, comm_class, jtask_method_Comm_constructor);
        if (!jcomm) {
                jxbt_throw_native(env,bprintf("Can't create a Comm object."));
                return NULL;
@@ -475,7 +497,7 @@ Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox) {
 
        if (!comm_class) return NULL;
 
-       jcomm = (*env)->NewObject(env, comm_class, jtask_field_Comm_constructor);
+       jcomm = (*env)->NewObject(env, comm_class, jtask_method_Comm_constructor);
        mailbox = (*env)->GetStringUTFChars(env, jmailbox, 0);
 
        task = jtask_to_native_task(jtask, env);