MSG_process_set_data(process,&process);
/* release our reference to the process name (variable name becomes invalid) */
- (*env)->ReleaseStringUTFChars(env, jname, name);
+ //FIXME : This line should be uncommented but with mac it doesn't work. BIG WARNING
+ //(*env)->ReleaseStringUTFChars(env, jname, name);
-
-
/* bind the java process instance to the native process */
jprocess_bind(jprocess, process, env);
return;
}
- /* delete the global reference */
- jprocess_delete_global_ref(native_to_java_process(process), env);
-
/* kill the native process (this wrapper is call by the destructor of the java
* process instance)
*/
JNIEXPORT jint JNICALL
Java_org_simgrid_msg_MsgNative_hostGetNumber(JNIEnv * env, jclass cls)
{
- return (jint) MSG_get_host_number();
+ 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
/* get the native task */
m_task_t task = jtask_to_native_task(jtask_arg, env);
- jobject jtask;
if (!task) {
jxbt_throw_notbound(env, "task", task);
return;
}
- jtask = (jobject) MSG_task_get_data(task);
MSG_error_t rv = MSG_task_destroy(task);
MSG_error_t rv = MSG_task_execute(task);
jxbt_check_res("MSG_task_execute()", rv,
- MSG_HOST_FAILURE | MSG_TASK_CANCELLED,
+ MSG_HOST_FAILURE | MSG_TASK_CANCELED,
bprintf("while executing task %s",
MSG_task_get_name(task)));
}
* Unsortable functions *
***************************************************************************************/
-
-JNIEXPORT jint JNICALL
-Java_org_simgrid_msg_Msg_getErrCode(JNIEnv * env, jclass cls)
-{
- return (jint) MSG_get_errno();
-}
-
JNIEXPORT jdouble JNICALL
Java_org_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls)
{
jval = (jstring) (*env)->GetObjectArrayElement(env, jargs, index);
tmp = (*env)->GetStringUTFChars(env, jval, 0);
argv[index + 1] = strdup(tmp);
- //argv[index] = strdup(tmp);
(*env)->ReleaseStringUTFChars(env, jval, tmp);
}
JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
{
MSG_error_t rv;
- int index; //xbt_fifo_item_t item = NULL;
- m_host_t *hosts;
+ int index;
+ xbt_dynar_t hosts;
jobject jhost;
/* Run everything */
XBT_INFO("Clean java world");
/* Cleanup java hosts */
- hosts = MSG_get_host_table();
- for (index = 0; index < MSG_get_host_number() - 1; index++) {
- jhost = (jobject) hosts[index]->data;
+ 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;
if (jhost)
jhost_unref(env, jhost);
}
-
+ xbt_dynar_free(&hosts);
XBT_INFO("Clean native world");
- /* cleanup native stuff */
- rv = MSG_OK != MSG_clean();
+}
+JNIEXPORT void JNICALL
+ JNICALL Java_org_simgrid_msg_Msg_clean(JNIEnv * env, jclass cls)
+{
+ /* cleanup native stuff. Calling it is ... useless since leaking memory at the end of the simulation is a non-issue */
+ MSG_error_t 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
Java_org_simgrid_msg_MsgNative_processKillAll(JNIEnv * env, jclass cls,
jint jresetPID)
jstring jname;
m_host_t host;
- int count = MSG_get_host_number();
- m_host_t *table = MSG_get_host_table();
+ xbt_dynar_t table = MSG_hosts_as_dynar();
+ int count = xbt_dynar_length(table);
jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host");
}
for (index = 0; index < count; index++) {
- host = table[index];
+ host = xbt_dynar_get_as(table,index,m_host_t);
jhost = (jobject) (MSG_host_get_data(host));
if (!jhost) {
(*env)->SetObjectArrayElement(env, jtable, index, jhost);
}
-
+ xbt_dynar_free(&table);
return jtable;
}