X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dffc52dc0710c3ca0534c0a5b0dc6efad3604dc1..83803fce1bb1e3657b8e5697df09d73b551bab05:/src/jmsg.c diff --git a/src/jmsg.c b/src/jmsg.c index 323d3aa4e4..95b89eb366 100644 --- a/src/jmsg.c +++ b/src/jmsg.c @@ -7,12 +7,14 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include +#include #include + #include "smx_context_java.h" #include "jmsg_process.h" + #include "jmsg_host.h" #include "jmsg_task.h" #include "jmsg_application_handler.h" @@ -33,7 +35,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); static JavaVM *__java_vm = NULL; -static jobject native_to_java_process(m_process_t process); JavaVM *get_java_VM(void) { @@ -49,11 +50,6 @@ JNIEnv *get_current_thread_env(void) return env; } -static jobject native_to_java_process(m_process_t process) -{ - return ((smx_ctx_java_t)MSG_process_get_smx_ctx(process))->jprocess; -} - /* * The MSG process connected functions implementation. */ @@ -61,18 +57,21 @@ static jobject native_to_java_process(m_process_t process) JNIEXPORT void JNICALL Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls, jobject jprocess_arg, - jobject jhost) + jobject jhostname) { jobject jprocess; /* the global reference to the java process instance */ jstring jname; /* the name of the java process instance */ const char *name; /* the C name of the process */ + const char *hostname; m_process_t process; /* the native process to create */ m_host_t host; /* Where that process lives */ - XBT_DEBUG("Java_org_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,jhost=%p)", - env, cls, jprocess_arg, jhost); + hostname = (*env)->GetStringUTFChars(env, jhostname, 0); + + XBT_DEBUG("Java_org_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,host=%s)", + env, cls, jprocess_arg, hostname); /* get the name of the java process */ @@ -84,10 +83,10 @@ Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls, } /* bind/retrieve the msg host */ - host = jhost_get_native(env, jhost); + host = MSG_get_host_by_name(hostname); if (!(host)) { /* not binded */ - jxbt_throw_notbound(env, "host", jhost); + jxbt_throw_host_not_found(env, hostname); return; } @@ -107,6 +106,7 @@ Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls, (xbt_main_func_t) jprocess, /*data*/ NULL, host, + /* kill_time */-1, /*argc, argv, properties*/ 0,NULL,NULL); @@ -115,6 +115,7 @@ Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls, /* release our reference to the process name (variable name becomes invalid) */ //FIXME : This line should be uncommented but with mac it doesn't work. BIG WARNING //(*env)->ReleaseStringUTFChars(env, jname, name); + (*env)->ReleaseStringUTFChars(env, jhostname, hostname); /* bind the java process instance to the native process */ jprocess_bind(jprocess, process, env); @@ -221,14 +222,16 @@ Java_org_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls, } host = MSG_process_get_host(process); + jobject res = (jobject)MSG_host_get_data(host); - if (!MSG_host_get_data(host)) { - jxbt_throw_jni(env, "MSG_process_get_host() failed"); - return NULL; + if (!res) { + XBT_INFO("Binding error for host %s ",MSG_host_get_name(host)); + jxbt_throw_jni(env, bprintf("Binding error for host %s ",MSG_host_get_name(host))); + return NULL; } /* return the global reference to the java host instance */ - return (jobject) MSG_host_get_data(host); + return res; } @@ -342,131 +345,6 @@ Java_org_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls, * The MSG host connected functions implementation. * ***************************************************************************************/ -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls, - jstring jname) -{ - m_host_t host; /* native host */ - jobject jhost; /* global reference to the java host instance returned */ - - /* get the C string from the java string */ - const char *name = (*env)->GetStringUTFChars(env, jname, 0); - XBT_DEBUG("Looking for host '%s'",name); - /* get the host by name (the hosts are created during the grid resolution) */ - host = MSG_get_host_by_name(name); - XBT_DEBUG("MSG gave %p as native host (simdata=%p)", host,host? host->simdata:NULL); - - if (!host) { /* invalid name */ - jxbt_throw_host_not_found(env, name); - (*env)->ReleaseStringUTFChars(env, jname, name); - return NULL; - } - (*env)->ReleaseStringUTFChars(env, jname, name); - - if (!MSG_host_get_data(host)) { /* native host not associated yet with java host */ - - /* Instantiate a new java host */ - jhost = jhost_new_instance(env); - - if (!jhost) { - jxbt_throw_jni(env, "java host instantiation failed"); - return NULL; - } - - /* get a global reference to the newly created host */ - jhost = jhost_ref(env, jhost); - - if (!jhost) { - jxbt_throw_jni(env, "new global ref allocation failed"); - return NULL; - } - - /* bind the java host and the native host */ - jhost_bind(jhost, host, env); - - /* the native host data field is set with the global reference to the - * java host returned by this function - */ - MSG_host_set_data(host, (void *) jhost); - } - - /* return the global reference to the java host instance */ - return (jobject) MSG_host_get_data(host); -} - -JNIEXPORT jstring JNICALL -Java_org_simgrid_msg_MsgNative_hostGetName(JNIEnv * env, jclass cls, - jobject jhost) -{ - m_host_t host = jhost_get_native(env, jhost); - - if (!host) { - jxbt_throw_notbound(env, "host", jhost); - return NULL; - } - - return (*env)->NewStringUTF(env, MSG_host_get_name(host)); -} - -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_MsgNative_hostGetNumber(JNIEnv * env, jclass cls) -{ - xbt_dynar_t hosts = MSG_hosts_as_dynar(); - int nb_host = xbt_dynar_length(hosts); - xbt_dynar_free(&hosts); - return (jint) nb_host; -} - -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls) -{ - jobject jhost; - - m_host_t host = MSG_host_self(); - - if (!MSG_host_get_data(host)) { - /* the native host not yet associated with the java host instance */ - - /* instanciate a new java host instance */ - jhost = jhost_new_instance(env); - - if (!jhost) { - jxbt_throw_jni(env, "java host instantiation failed"); - return NULL; - } - - /* get a global reference to the newly created host */ - jhost = jhost_ref(env, jhost); - - if (!jhost) { - jxbt_throw_jni(env, "global ref allocation failed"); - return NULL; - } - - /* Bind & store it */ - jhost_bind(jhost, host, env); - MSG_host_set_data(host, (void *) jhost); - } else { - jhost = (jobject) MSG_host_get_data(host); - } - - return jhost; -} - -JNIEXPORT jdouble JNICALL -Java_org_simgrid_msg_MsgNative_hostGetSpeed(JNIEnv * env, jclass cls, - jobject jhost) -{ - m_host_t host = jhost_get_native(env, jhost); - - if (!host) { - jxbt_throw_notbound(env, "host", jhost); - return -1; - } - - return (jdouble) MSG_get_host_speed(host); -} - JNIEXPORT jint JNICALL Java_org_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls, jobject jhost) @@ -482,305 +360,6 @@ Java_org_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls, } -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_MsgNative_hostIsAvail(JNIEnv * env, jclass cls, - jobject jhost) -{ - m_host_t host = jhost_get_native(env, jhost); - - if (!host) { - jxbt_throw_notbound(env, "host", jhost); - return 0; - } - - return (jboolean) MSG_host_is_avail(host); -} - - -/*************************************************************************************** - * The MSG task connected functions implementation. * - ***************************************************************************************/ - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls, - jobject jtask, jstring jname, - jdouble jcomputeDuration, - jdouble jmessageSize) -{ - m_task_t task; /* the native task to create */ - const char *name = NULL; /* the name of the task */ - - if (jcomputeDuration < 0) { - jxbt_throw_illegal(env, - bprintf - ("Task ComputeDuration (%f) cannot be negative", - (double) jcomputeDuration)); - return; - } - - if (jmessageSize < 0) { - jxbt_throw_illegal(env, - bprintf("Task MessageSize (%f) cannot be negative", - (double) jmessageSize)); - return; - } - - if (jname) { - /* get the C string from the java string */ - name = (*env)->GetStringUTFChars(env, jname, 0); - } - - - /* create the task */ - task = - MSG_task_create(name, (double) jcomputeDuration, - (double) jmessageSize, NULL); - - if (jname) - (*env)->ReleaseStringUTFChars(env, jname, name); - - /* bind & store the task */ - jtask_bind(jtask, task, env); - MSG_task_set_data(task, jtask); -} - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls, - jobject jtask, - jstring jname, - jobjectArray jhosts, - jdoubleArray - jcomputeDurations_arg, - jdoubleArray - jmessageSizes_arg) -{ - - m_task_t task; /* the native parallel task to create */ - const char *name; /* the name of the task */ - int host_count; - m_host_t *hosts; - double *computeDurations; - double *messageSizes; - jdouble *jcomputeDurations; - jdouble *jmessageSizes; - - jobject jhost; - int index; - - - if (!jcomputeDurations_arg) { - jxbt_throw_null(env, - xbt_strdup - ("Parallel task compute durations cannot be null")); - return; - } - - if (!jmessageSizes_arg) { - jxbt_throw_null(env, - xbt_strdup - ("Parallel task message sizes cannot be null")); - return; - } - - if (!jname) { - jxbt_throw_null(env, xbt_strdup("Parallel task name cannot be null")); - return; - } - - host_count = (int) (*env)->GetArrayLength(env, jhosts); - - - hosts = xbt_new0(m_host_t, host_count); - computeDurations = xbt_new0(double, host_count); - messageSizes = xbt_new0(double, host_count * host_count); - - jcomputeDurations = - (*env)->GetDoubleArrayElements(env, jcomputeDurations_arg, 0); - jmessageSizes = - (*env)->GetDoubleArrayElements(env, jmessageSizes_arg, 0); - - for (index = 0; index < host_count; index++) { - jhost = (*env)->GetObjectArrayElement(env, jhosts, index); - hosts[index] = jhost_get_native(env, jhost); - computeDurations[index] = jcomputeDurations[index]; - } - for (index = 0; index < host_count * host_count; index++) { - messageSizes[index] = jmessageSizes[index]; - } - - (*env)->ReleaseDoubleArrayElements(env, jcomputeDurations_arg, - jcomputeDurations, 0); - (*env)->ReleaseDoubleArrayElements(env, jmessageSizes_arg, jmessageSizes, - 0); - - - /* get the C string from the java string */ - name = (*env)->GetStringUTFChars(env, jname, 0); - - task = - MSG_parallel_task_create(name, host_count, hosts, computeDurations, - messageSizes, NULL); - - (*env)->ReleaseStringUTFChars(env, jname, name); - - /* associate the java task object and the native task */ - jtask_bind(jtask, task, env); - - MSG_task_set_data(task, (void *) jtask); - - if (!MSG_task_get_data(task)) - jxbt_throw_jni(env, "global ref allocation failed"); -} - -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_MsgNative_taskGetSender(JNIEnv * env, jclass cls, - jobject jtask) -{ - m_process_t process; - - m_task_t task = jtask_to_native_task(jtask, env); - - if (!task) { - jxbt_throw_notbound(env, "task", jtask); - return NULL; - } - - process = MSG_task_get_sender(task); - return (jobject) native_to_java_process(process); -} - -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls, - jobject jtask) -{ - m_host_t host; - m_task_t task = jtask_to_native_task(jtask, env); - - if (!task) { - jxbt_throw_notbound(env, "task", jtask); - return NULL; - } - - host = MSG_task_get_source(task); - - if (!MSG_host_get_data(host)) { - jxbt_throw_jni(env, "MSG_task_get_source() failed"); - return NULL; - } - - return (jobject) MSG_host_get_data(host); -} - - -JNIEXPORT jstring JNICALL -Java_org_simgrid_msg_MsgNative_taskGetName(JNIEnv * env, jclass cls, - jobject jtask) -{ - m_task_t task = jtask_to_native_task(jtask, env); - - if (!task) { - jxbt_throw_notbound(env, "task", jtask); - return NULL; - } - - return (*env)->NewStringUTF(env, MSG_task_get_name(task)); -} - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls, - jobject jtask) -{ - m_task_t ptask = jtask_to_native_task(jtask, env); - - if (!ptask) { - jxbt_throw_notbound(env, "task", jtask); - return; - } - - MSG_error_t rv = MSG_task_cancel(ptask); - - jxbt_check_res("MSG_task_cancel()", rv, MSG_OK, - bprintf("unexpected error , please report this bug")); -} - -JNIEXPORT jdouble JNICALL -Java_org_simgrid_msg_MsgNative_taskGetComputeDuration(JNIEnv * env, jclass cls, - jobject jtask) -{ - m_task_t ptask = jtask_to_native_task(jtask, env); - - if (!ptask) { - jxbt_throw_notbound(env, "task", jtask); - return -1; - } - return (jdouble) MSG_task_get_compute_duration(ptask); -} - -JNIEXPORT jdouble JNICALL -Java_org_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv * env, - jclass cls, - jobject jtask) -{ - m_task_t ptask = jtask_to_native_task(jtask, env); - - if (!ptask) { - jxbt_throw_notbound(env, "task", jtask); - return -1; - } - return (jdouble) MSG_task_get_remaining_computation(ptask); -} - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_MsgNative_taskSetPriority(JNIEnv * env, jclass cls, - jobject jtask, jdouble priority) -{ - m_task_t task = jtask_to_native_task(jtask, env); - - if (!task) { - jxbt_throw_notbound(env, "task", jtask); - return; - } - MSG_task_set_priority(task, (double) priority); -} - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls, - jobject jtask_arg) -{ - - /* get the native task */ - m_task_t task = jtask_to_native_task(jtask_arg, env); - - if (!task) { - jxbt_throw_notbound(env, "task", task); - return; - } - - MSG_error_t rv = MSG_task_destroy(task); - - jxbt_check_res("MSG_task_destroy()", rv, MSG_OK, - bprintf("unexpected error , please report this bug")); -} - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls, - jobject jtask) -{ - m_task_t task = jtask_to_native_task(jtask, env); - - if (!task) { - jxbt_throw_notbound(env, "task", jtask); - return; - } - - MSG_error_t rv = MSG_task_execute(task); - - jxbt_check_res("MSG_task_execute()", rv, - MSG_HOST_FAILURE | MSG_TASK_CANCELED, - bprintf("while executing task %s", - MSG_task_get_name(task))); -} - /*************************************************************************************** * Unsortable functions * ***************************************************************************************/ @@ -849,7 +428,7 @@ JNIEXPORT void JNICALL /* Cleanup java hosts */ hosts = MSG_hosts_as_dynar(); for (index = 0; index < xbt_dynar_length(hosts) - 1; index++) { - jhost = (jobject) xbt_dynar_get_as(hosts,index,m_host_t)->data; + jhost = (jobject) MSG_host_get_data(xbt_dynar_get_as(hosts,index,m_host_t)); if (jhost) jhost_unref(env, jhost); @@ -943,7 +522,7 @@ Java_org_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg) jname = (*env)->NewStringUTF(env, MSG_host_get_name(host)); jhost = - Java_org_simgrid_msg_MsgNative_hostGetByName(env, cls_arg, jname); + Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname); /* FIXME: leak of jname ? */ } @@ -953,211 +532,6 @@ Java_org_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg) return jtable; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls, - jstring jalias, jobject jtask, - jdouble jtimeout) -{ - - MSG_error_t rv; - const char *alias = (*env)->GetStringUTFChars(env, jalias, 0); - - m_task_t task = jtask_to_native_task(jtask, env); - - - if (!task) { - (*env)->ReleaseStringUTFChars(env, jalias, alias); - jxbt_throw_notbound(env, "task", jtask); - return; - } - - /* Pass a global ref to the Jtask into the Ctask so that the receiver can use it */ - MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask)); - rv = MSG_task_send_with_timeout(task, alias, (double) jtimeout); - - (*env)->ReleaseStringUTFChars(env, jalias, alias); - - jxbt_check_res("MSG_task_send_with_timeout()", rv, - MSG_HOST_FAILURE | MSG_TRANSFER_FAILURE | MSG_TIMEOUT, - bprintf("while sending task %s to mailbox %s", - MSG_task_get_name(task), alias)); -} - -static void msg_task_cancel_on_failed_dsend(void*t) { - m_task_t task = t; - JNIEnv *env =get_current_thread_env(); - jobject jtask_global = MSG_task_get_data(task); - - /* Destroy the global ref so that the JVM can free the stuff */ - (*env)->DeleteGlobalRef(env, jtask_global); - MSG_task_set_data(task, NULL); - MSG_task_destroy(task); -} - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_MsgNative_taskDSend(JNIEnv * env, jclass cls, - jstring jalias, jobject jtask) -{ - - const char *alias = (*env)->GetStringUTFChars(env, jalias, 0); - - m_task_t task = jtask_to_native_task(jtask, env); - - - if (!task) { - (*env)->ReleaseStringUTFChars(env, jalias, alias); - jxbt_throw_notbound(env, "task", jtask); - return; - } - - /* Pass a global ref to the Jtask into the Ctask so that the receiver can use it */ - MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask)); - MSG_task_dsend(task, alias, msg_task_cancel_on_failed_dsend); - - (*env)->ReleaseStringUTFChars(env, jalias, alias); -} - - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls, - jstring jalias, jobject jtask, - jdouble jmaxRate) -{ - m_task_t task = jtask_to_native_task(jtask, env); - MSG_error_t rv; - const char *alias; - - if (!task) { - jxbt_throw_notbound(env, "task", jtask); - return; - } - - alias = (*env)->GetStringUTFChars(env, jalias, 0); - - /* Pass a global ref to the Jtask into the Ctask so that the receiver can use it */ - MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask)); - rv = MSG_task_send_bounded(task, alias, (double) jmaxRate); - - (*env)->ReleaseStringUTFChars(env, jalias, alias); - - jxbt_check_res("MSG_task_send_bounded()", rv, - MSG_HOST_FAILURE | MSG_TRANSFER_FAILURE | MSG_TIMEOUT, - bprintf - ("while sending task %s to mailbox %s with max rate %f", - MSG_task_get_name(task), alias, (double) jmaxRate)); - -} - -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls, - jstring jalias, jdouble jtimeout, - jobject jhost) -{ - MSG_error_t rv; - m_task_t task = NULL; - m_host_t host = NULL; - jobject jtask_global, jtask_local; - const char *alias; - - if (jhost) { - host = jhost_get_native(env, jhost); - - if (!host) { - jxbt_throw_notbound(env, "host", jhost); - return NULL; - } - } - - alias = (*env)->GetStringUTFChars(env, jalias, 0); - - rv = MSG_task_receive_ext(&task, alias, (double) jtimeout, host); - if (rv != MSG_OK) { - switch (rv) { - case MSG_TIMEOUT: - jxbt_throw_time_out_failure(env,NULL); - break; - case MSG_TRANSFER_FAILURE: - jxbt_throw_transfer_failure(env,NULL); - break; - case MSG_HOST_FAILURE: - jxbt_throw_host_failure(env,NULL); - break; - default: - jxbt_throw_native(env,bprintf("receive failed")); - } - return NULL; - } - jtask_global = MSG_task_get_data(task); - - /* Convert the global ref into a local ref so that the JVM can free the stuff */ - jtask_local = (*env)->NewLocalRef(env, jtask_global); - (*env)->DeleteGlobalRef(env, jtask_global); - MSG_task_set_data(task, NULL); - - (*env)->ReleaseStringUTFChars(env, jalias, alias); - - jxbt_check_res("MSG_task_receive_ext()", rv, - MSG_HOST_FAILURE | MSG_TRANSFER_FAILURE | MSG_TIMEOUT, - bprintf("while receiving from mailbox %s", alias)); - - return (jobject) jtask_local; -} - -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_MsgNative_taskListen(JNIEnv * env, jclass cls, - jstring jalias) -{ - - const char *alias; - int rv; - - alias = (*env)->GetStringUTFChars(env, jalias, 0); - - rv = MSG_task_listen(alias); - - (*env)->ReleaseStringUTFChars(env, jalias, alias); - - return (jboolean) rv; -} - -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls, - jstring jalias, - jobject jhost) -{ - int rv; - const char *alias; - - m_host_t host = jhost_get_native(env, jhost); - - if (!host) { - jxbt_throw_notbound(env, "host", jhost); - return -1; - } - alias = (*env)->GetStringUTFChars(env, jalias, 0); - - rv = MSG_task_listen_from_host(alias, host); - - (*env)->ReleaseStringUTFChars(env, jalias, alias); - - return (jint) rv; -} - -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_MsgNative_taskListenFrom(JNIEnv * env, jclass cls, - jstring jalias) -{ - - int rv; - const char *alias = (*env)->GetStringUTFChars(env, jalias, 0); - - rv = MSG_task_listen_from(alias); - - (*env)->ReleaseStringUTFChars(env, jalias, alias); - - return (jint) rv; -} - JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, jstring jdeploymentFile)