-/*
- * $Id$
- *
- * Copyright 2006,2007 Martin Quinson, Malek Cherier All right reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package.
- *
- * This contains the implementation of the wrapper functions used to interface
- * the java object with the native functions of the MSG API.
- */
+/* Java Wrappers to the MSG API. */
+
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
#include "msg/msg.h"
#include "msg/private.h"
#include "simix/private.h"
host = MSG_process_get_host(process);
- if (!host->data) {
+ if (!MSG_host_get_data(host)) {
jxbt_throw_jni(env, "MSG_process_get_host() failed");
return NULL;
}
/* return the global reference to the java host instance */
- return (jobject) host->data;
+ return (jobject) MSG_host_get_data(host);
}
}
if (!native_to_java_process(process)) {
- jxbt_throw_native(env, xbt_strdup("SIMIX_process_get_jprocess() failed"));
+ jxbt_throw_jni(env, "SIMIX_process_get_jprocess() failed");
return NULL;
}
jobject jprocess;
if (!process) {
- jxbt_throw_native(env, xbt_strdup("MSG_process_self() failed"));
+ jxbt_throw_jni(env, xbt_strdup("MSG_process_self() failed"));
return NULL;
}
jprocess = native_to_java_process(process);
if (!jprocess)
- jxbt_throw_native(env, xbt_strdup("SIMIX_process_get_jprocess() failed"));
+ jxbt_throw_jni(env, xbt_strdup("SIMIX_process_get_jprocess() failed"));
return jprocess;
}
}
/* try to change the host of the process */
- if (MSG_OK != MSG_process_change_host(host))
- jxbt_throw_native(env, xbt_strdup("MSG_process_change_host() failed"));
+ MSG_error_t rv = MSG_process_change_host(host);
+
+ jxbt_check_res("MSG_process_change_host()",rv,MSG_OK,
+ bprintf("unexpected error , please report this bug"));
+
}
JNIEXPORT void JNICALL
return NULL;
}
- if (!host->data) { /* native host not associated yet with java host */
+ if (!MSG_host_get_data(host)) { /* native host not associated yet with java host */
/* instanciate a new java host */
jhost = jhost_new_instance(env);
/* the native host data field is set with the global reference to the
* java host returned by this function
*/
- host->data = (void *) jhost;
+ MSG_host_set_data(host,(void *) jhost);
}
/* return the global reference to the java host instance */
- return (jobject) host->data;
+ return (jobject) MSG_host_get_data(host);
}
JNIEXPORT jstring JNICALL
return NULL;
}
- return (*env)->NewStringUTF(env, host->name);
+ return (*env)->NewStringUTF(env, MSG_host_get_name(host));
}
JNIEXPORT jint JNICALL
m_host_t host = MSG_host_self();
- if (!host->data) {
+ if (!MSG_host_get_data(host)) {
/* the native host not yet associated with the java host instance */
/* instanciate a new java host instance */
/* Bind & store it */
jhost_bind(jhost, host, env);
- host->data = (void *) jhost;
+ MSG_host_set_data(host,(void *) jhost);
} else {
- jhost = (jobject) host->data;
+ jhost = (jobject) MSG_host_get_data(host);
}
return jhost;
/* bind & store the task */
jtask_bind(jtask, task, env);
-
- /* allocate a new global reference to the java task instance */
- task->data = (void *) jtask_new_global_ref(jtask, env);
-
- if (!task->data)
- jxbt_throw_jni(env, "global ref allocation failed");
-
+ MSG_task_set_data(task,jtask);
}
JNIEXPORT void JNICALL
/* associate the java task object and the native task */
jtask_bind(jtask, task, env);
- task->data = (void *) jtask;
+ MSG_task_set_data(task,(void*) jtask);
- if (!task->data)
+ if (!MSG_task_get_data(task))
jxbt_throw_jni(env, "global ref allocation failed");
}
host = MSG_task_get_source(task);
- if (!host->data) {
+ if (!MSG_host_get_data(host)) {
jxbt_throw_jni(env, "MSG_task_get_source() failed");
return NULL;
}
- return (jobject) host->data;
+ return (jobject) MSG_host_get_data(host);
}
return NULL;
}
- return (*env)->NewStringUTF(env, task->name);
+ return (*env)->NewStringUTF(env, MSG_task_get_name(task));
}
JNIEXPORT void JNICALL
jxbt_throw_notbound(env, "task", task);
return;
}
- jtask = (jobject) task->data;
+ jtask = (jobject) MSG_task_get_data(task);
MSG_error_t rv = MSG_task_destroy(task);
jxbt_check_res("MSG_task_destroy()",rv,MSG_OK,
bprintf("unexpected error , please report this bug"));
-
-
- /* delete the global reference to the java task object */
- jtask_delete_global_ref(jtask, env);
}
JNIEXPORT void JNICALL
JNIEXPORT void JNICALL
JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls) {
- xbt_fifo_item_t item = NULL;
- m_host_t host = NULL;
+ MSG_error_t rv;
+ int index;//xbt_fifo_item_t item = NULL;
+ m_host_t *hosts;
jobject jhost;
/* Run everything */
- if (MSG_OK != MSG_main()) {
- jxbt_throw_native(env, xbt_strdup("MSG_main() failed"));
- }
+ rv= MSG_main();
+ jxbt_check_res("MSG_main()",rv,MSG_OK,
+ bprintf("unexpected error : MSG_main() failed .. please report this bug "));
+
DEBUG0
("MSG_main finished. Bail out before cleanup since there is a bug in this part.");
DEBUG0("Clean java world");
/* Cleanup java hosts */
- xbt_fifo_foreach(msg_global->host, item, host, m_host_t) {
- jhost = (jobject) host->data;
+ hosts = MSG_get_host_table();
+ for (index=0;index<MSG_get_host_number()-1;index++)
+ {
+ jhost = (jobject)hosts[index]->data;
+ if(jhost)
+ jhost_unref(env,jhost);
- if (jhost)
- jhost_unref(env, jhost);
}
DEBUG0("Clean native world");
/* cleanup native stuff */
- if (MSG_OK != MSG_clean()){
- jxbt_throw_native(env, xbt_strdup("MSG_main() failed"));
- }
+ rv = MSG_OK != MSG_clean();
+ jxbt_check_res("MSG_clean()",rv,MSG_OK,
+ bprintf("unexpected error : MSG_clean() failed .. please report this bug "));
+
}
JNIEXPORT jint JNICALL
jstring jname;
m_host_t host;
- int count = xbt_fifo_size(msg_global->host);
- m_host_t *table = (m_host_t *) xbt_fifo_to_array(msg_global->host);
+ int count = MSG_get_host_number();
+ m_host_t *table = MSG_get_host_table();
jclass cls = jxbt_get_class(env, "simgrid/msg/Host");
for (index = 0; index < count; index++) {
host = table[index];
- jhost = (jobject) (host->data);
+ jhost = (jobject) (MSG_host_get_data(host));
if (!jhost) {
- jname = (*env)->NewStringUTF(env, host->name);
+ jname = (*env)->NewStringUTF(env, MSG_host_get_name(host));
jhost = Java_simgrid_msg_MsgNative_hostGetByName(env, cls_arg, jname);
/* FIXME: leak of jname ? */
if (errmsg) {
char *thrown = bprintf("xbt_select_context_factory() failed: %s", errmsg);
free(errmsg);
- jxbt_throw_native(env, thrown);
+ jxbt_throw_jni(env, thrown);
}
}
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);
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);
MSG_error_t rv;
m_task_t task = NULL;
m_host_t host = NULL;
+ jobject jtask_global, jtask_local;
const char *alias;
if (jhost) {
alias = (*env)->GetStringUTFChars(env, jalias, 0);
rv = MSG_task_receive_ext(&task, alias, (double) jtimeout, host);
+ 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) task->data;
+ return (jobject) jtask_local;
}
JNIEXPORT jboolean JNICALL
japplication_handler_on_start_document();
if (surf_parse())
- jxbt_throw_native(env, xbt_strdup("surf_parse() failed"));
+ jxbt_throw_jni(env,"surf_parse() failed");
surf_parse_close();