#include "jmsg.h"
+/* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
+#ifndef JNIEXPORT
+#define JNIEXPORT
+#endif
+#ifndef JNICALL
+#define JNICALL
+#endif
+/* end of eclipse-mandated pimple */
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
static JavaVM *__java_vm = NULL;
*/
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls,
jobject jprocess_arg,
jobject jhost)
{
m_process_t process; /* the native process to create */
m_host_t host; /* Where that process lives */
- DEBUG4("Java_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,jhost=%p)",
+ XBT_DEBUG("Java_org_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,jhost=%p)",
env, cls, jprocess_arg, jhost);
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);
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls,
jobject jprocess)
{
m_process_t process = jprocess_to_native_process(jprocess, env);
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls,
jobject jprocess)
{
m_process_t process = jprocess_to_native_process(jprocess, env);
}
JNIEXPORT jboolean JNICALL
-Java_simgrid_msg_MsgNative_processIsSuspended(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processIsSuspended(JNIEnv * env, jclass cls,
jobject jprocess)
{
m_process_t process = jprocess_to_native_process(jprocess, env);
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processKill(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processKill(JNIEnv * env, jclass cls,
jobject jprocess)
{
/* get the native instances from the java ones */
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 jobject JNICALL
-Java_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls,
jobject jprocess)
{
/* get the native instances from the java ones */
}
JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls,
jint PID)
{
m_process_t process = MSG_process_from_PID(PID);
JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_processGetPID(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processGetPID(JNIEnv * env, jclass cls,
jobject jprocess)
{
m_process_t process = jprocess_to_native_process(jprocess, env);
JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_processGetPPID(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processGetPPID(JNIEnv * env, jclass cls,
jobject jprocess)
{
m_process_t process = jprocess_to_native_process(jprocess, env);
}
JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls)
{
m_process_t process = MSG_process_self();
jobject jprocess;
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls,
- jobject jhost)
+Java_org_simgrid_msg_MsgNative_processMigrate(JNIEnv * env, jclass cls,
+ jobject jprocess, jobject jhost)
{
+ m_process_t process = jprocess_to_native_process(jprocess, env);
+
+ if (!process) {
+ jxbt_throw_notbound(env, "process", jprocess);
+ return;
+ }
+
m_host_t host = jhost_get_native(env, jhost);
if (!host) {
}
/* try to change the host of the process */
- MSG_error_t rv = MSG_process_change_host(host);
-
- jxbt_check_res("MSG_process_change_host()", rv, MSG_OK,
+ MSG_error_t rv = MSG_process_migrate(process, host);
+ jxbt_check_res("MSG_process_migrate()", rv, MSG_OK,
bprintf("unexpected error , please report this bug"));
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls,
jdouble seconds)
{
MSG_error_t rv = MSG_process_sleep((double) seconds);
***************************************************************************************/
JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls,
jstring jname)
{
m_host_t host; /* native host */
/* get the C string from the java string */
const char *name = (*env)->GetStringUTFChars(env, jname, 0);
- DEBUG1("Looking for host '%s'",name);
+ 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);
- DEBUG2("MSG gave %p as native host (simdata=%p)", host,host? host->simdata:NULL);
+ 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);
if (!MSG_host_get_data(host)) { /* native host not associated yet with java host */
- /* instanciate a new java host */
+ /* Instantiate a new java host */
jhost = jhost_new_instance(env);
if (!jhost) {
}
JNIEXPORT jstring JNICALL
-Java_simgrid_msg_MsgNative_hostGetName(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetName(JNIEnv * env, jclass cls,
jobject jhost)
{
m_host_t host = jhost_get_native(env, jhost);
}
JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_hostGetNumber(JNIEnv * env, jclass cls)
+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
-Java_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls)
{
jobject jhost;
}
JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_MsgNative_hostGetSpeed(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetSpeed(JNIEnv * env, jclass cls,
jobject jhost)
{
m_host_t host = jhost_get_native(env, jhost);
}
JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostGetLoad(JNIEnv * env, jclass cls,
jobject jhost)
{
m_host_t host = jhost_get_native(env, jhost);
JNIEXPORT jboolean JNICALL
-Java_simgrid_msg_MsgNative_hostIsAvail(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_hostIsAvail(JNIEnv * env, jclass cls,
jobject jhost)
{
m_host_t host = jhost_get_native(env, jhost);
***************************************************************************************/
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls,
jobject jtask, jstring jname,
jdouble jcomputeDuration,
jdouble jmessageSize)
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls,
jobject jtask,
jstring jname,
jobjectArray jhosts,
}
JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_taskGetSender(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetSender(JNIEnv * env, jclass cls,
jobject jtask)
{
m_process_t process;
}
JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls,
jobject jtask)
{
m_host_t host;
JNIEXPORT jstring JNICALL
-Java_simgrid_msg_MsgNative_taskGetName(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetName(JNIEnv * env, jclass cls,
jobject jtask)
{
m_task_t task = jtask_to_native_task(jtask, env);
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls,
jobject jtask)
{
m_task_t ptask = jtask_to_native_task(jtask, env);
}
JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_MsgNative_taskGetComputeDuration(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskGetComputeDuration(JNIEnv * env, jclass cls,
jobject jtask)
{
m_task_t ptask = jtask_to_native_task(jtask, env);
}
JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv * env,
+Java_org_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv * env,
jclass cls,
jobject jtask)
{
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskSetPriority(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskSetPriority(JNIEnv * env, jclass cls,
jobject jtask, jdouble priority)
{
m_task_t task = jtask_to_native_task(jtask, env);
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls,
+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);
- 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);
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls,
jobject jtask)
{
m_task_t task = jtask_to_native_task(jtask, env);
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_simgrid_msg_Msg_getErrCode(JNIEnv * env, jclass cls)
-{
- return (jint) MSG_get_errno();
-}
-
JNIEXPORT jdouble JNICALL
-Java_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls)
{
return (jdouble) MSG_get_clock();
}
-
JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
+Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
{
char **argv = NULL;
int index;
jstring jval;
const char *tmp;
- factory_initializer_to_use = SIMIX_ctx_java_factory_init;
+ smx_factory_initializer_to_use = SIMIX_ctx_java_factory_init;
if (jargs)
argc = (int) (*env)->GetArrayLength(env, jargs);
argc++;
- argv = xbt_new0(char *, argc);
+ argv = xbt_new(char *, argc + 1);
argv[0] = strdup("java");
for (index = 0; index < argc - 1; index++) {
argv[index + 1] = strdup(tmp);
(*env)->ReleaseStringUTFChars(env, jval, tmp);
}
+ argv[argc] = NULL;
MSG_global_init(&argc, argv);
}
JNIEXPORT void JNICALL
- JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
+ 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 */
- INFO0("Ready to run MSG_MAIN");
+ XBT_INFO("Ready to run MSG_MAIN");
rv = MSG_main();
- INFO0("Done running MSG_MAIN");
+ XBT_INFO("Done running MSG_MAIN");
jxbt_check_res("MSG_main()", rv, MSG_OK,
bprintf
("unexpected error : MSG_main() failed .. please report this bug "));
- INFO0("MSG_main finished");
+ XBT_INFO("MSG_main finished");
- INFO0("Clean java world");
+ 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);
}
-
- INFO0("Clean native world");
- /* cleanup native stuff */
- rv = MSG_OK != MSG_clean();
+ xbt_dynar_free(&hosts);
+ XBT_INFO("Clean native world");
+}
+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_simgrid_msg_MsgNative_processKillAll(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processKillAll(JNIEnv * env, jclass cls,
jint jresetPID)
{
return (jint) MSG_process_killall((int) jresetPID);
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
jstring jplatformFile)
{
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_processExit(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_processExit(JNIEnv * env, jclass cls,
jobject jprocess)
{
return;
}
- MSG_process_kill(process);
+ smx_ctx_java_stop(MSG_process_get_smx_ctx(process));
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
+Java_org_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
{
const char *s = (*env)->GetStringUTFChars(env, js, 0);
- INFO1("%s", s);
+ XBT_INFO("%s", s);
(*env)->ReleaseStringUTFChars(env, js, s);
}
JNIEXPORT jobjectArray JNICALL
-Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
+Java_org_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg)
{
int index;
jobjectArray jtable;
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, "simgrid/msg/Host");
+ jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host");
if (!cls) {
return NULL;
}
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) {
jname = (*env)->NewStringUTF(env, MSG_host_get_name(host));
jhost =
- Java_simgrid_msg_MsgNative_hostGetByName(env, cls_arg, jname);
+ Java_org_simgrid_msg_MsgNative_hostGetByName(env, cls_arg, jname);
/* FIXME: leak of jname ? */
}
(*env)->SetObjectArrayElement(env, jtable, index, jhost);
}
-
+ xbt_dynar_free(&table);
return jtable;
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls,
jstring jalias, jobject jtask,
jdouble jtimeout)
{
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls,
jstring jalias, jobject jtask,
jdouble jmaxRate)
{
}
JNIEXPORT jobject JNICALL
-Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls,
jstring jalias, jdouble jtimeout,
jobject jhost)
{
}
JNIEXPORT jboolean JNICALL
-Java_simgrid_msg_MsgNative_taskListen(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskListen(JNIEnv * env, jclass cls,
jstring jalias)
{
}
JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls,
jstring jalias,
jobject jhost)
{
}
JNIEXPORT jint JNICALL
-Java_simgrid_msg_MsgNative_taskListenFrom(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_MsgNative_taskListenFrom(JNIEnv * env, jclass cls,
jstring jalias)
{
}
JNIEXPORT void JNICALL
-Java_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
+Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
jstring jdeploymentFile)
{
const char *deploymentFile =
(*env)->GetStringUTFChars(env, jdeploymentFile, 0);
- surf_parse_reset_parser();
+ surf_parse_reset_callbacks();
surfxml_add_callback(STag_surfxml_process_cb_list,
japplication_handler_on_begin_process);
