* under the terms of the license (GNU LGPL) which comes with this package. */
#include <msg/msg.h>
-#include <simix/context.h>
+#include <simgrid/simix.h>
#include <surf/surfxml_parse.h>
#include "smx_context_java.h"
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 */
}
/* 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;
}
(xbt_main_func_t) jprocess,
/*data*/ NULL,
host,
+ /* kill_time */-1,
/*argc, argv, properties*/
0,NULL,NULL);
/* 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);
}
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Process_simulatedSleep(JNIEnv * env, jobject jprocess,
+ jdouble jseconds) {
+ m_process_t process = jprocess_to_native_process(jprocess, env);
+
+ if (!process) {
+ jxbt_throw_notbound(env, "process", jprocess);
+ return;
+ }
+ MSG_error_t rv = MSG_process_sleep((double)jseconds);
+
+ jxbt_check_res("MSG_process_sleep()", rv, MSG_OK,
+ bprintf("unexpected error , please report this bug"));
+}
+
+
JNIEXPORT void JNICALL
Java_org_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls,
jobject jprocess)
}
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;
}
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);
+ XBT_DEBUG("MSG gave %p as native host", host);
if (!host) { /* invalid name */
jxbt_throw_host_not_found(env, name);
jobject jhost)
{
m_host_t host = jhost_get_native(env, jhost);
+ const char* name;
if (!host) {
jxbt_throw_notbound(env, "host", jhost);
return NULL;
}
- return (*env)->NewStringUTF(env, MSG_host_get_name(host));
+ name = MSG_host_get_name(host);
+ if (!name)
+ xbt_die("This host has no name...");
+
+ return (*env)->NewStringUTF(env, name);
}
JNIEXPORT jint 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);
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,
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 */
