/* 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"
-#include "simix/smx_context_java.h"
+#include <msg/msg.h>
+#include <simix/context.h>
+#include <surf/surfxml_parse.h>
+
+#include "smx_context_java.h"
#include "jmsg_process.h"
#include "jmsg_host.h"
#include "jxbt_utilities.h"
#include "jmsg.h"
-#include "msg/mailbox.h"
-#include "surf/surfxml_parse.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
static jobject native_to_java_process(m_process_t process)
{
- return ((smx_ctx_java_t)
- (process->simdata->s_process->context))->jprocess;
+ return ((smx_ctx_java_t)MSG_process_get_smx_ctx(process))->jprocess;
}
/*
*/
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)
{
+
+
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 */
m_process_t process; /* the native process to create */
- char alias[MAX_ALIAS_NAME + 1] = { 0 };
- msg_mailbox_t mailbox;
-
- DEBUG4
- ("Java_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,jhost=%p)",
- env, cls, jprocess_arg, jhost);
+ 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);
+
+
/* get the name of the java process */
jname = jprocess_get_name(jprocess_arg, env);
-
if (!jname) {
jxbt_throw_null(env,
- xbt_strdup
- ("Internal error: Process name cannot be NULL"));
+ xbt_strdup("Internal error: Process name cannot be NULL"));
return;
}
- /* allocate the data of the simulation */
- process = xbt_new0(s_m_process_t, 1);
- process->simdata = xbt_new0(s_simdata_process_t, 1);
+ /* bind/retrieve the msg host */
+ host = jhost_get_native(env, jhost);
+
+ if (!(host)) { /* not binded */
+ jxbt_throw_notbound(env, "host", jhost);
+ return;
+ }
/* create a global java process instance */
jprocess = jprocess_new_global_ref(jprocess_arg, env);
-
if (!jprocess) {
- free(process->simdata);
- free(process);
jxbt_throw_jni(env, "Can't get a global ref to the java process");
return;
}
- /* bind the java process instance to the native process */
- jprocess_bind(jprocess, process, env);
-
/* build the C name of the process */
name = (*env)->GetStringUTFChars(env, jname, 0);
- process->name = xbt_strdup(name);
- (*env)->ReleaseStringUTFChars(env, jname, name);
-
- process->simdata->m_host = jhost_get_native(env, jhost);
-
-
- if (!(process->simdata->m_host)) { /* not binded */
- free(process->simdata);
- free(process->data);
- free(process);
- jxbt_throw_notbound(env, "host", jhost);
- return;
- }
- process->simdata->PID = msg_global->PID++;
-
- /* create a new context */
- DEBUG8
- ("fill in process %s/%s (pid=%d) %p (sd=%p, host=%p, host->sd=%p); env=%p",
- process->name, process->simdata->m_host->name,
- process->simdata->PID, process, process->simdata,
- process->simdata->m_host, process->simdata->m_host->simdata, env);
-
- process->simdata->s_process =
- SIMIX_process_create(process->name, (xbt_main_func_t) jprocess,
- /*data */ (void *) process,
- process->simdata->m_host->simdata->
- smx_host->name, 0, NULL, NULL);
-
- DEBUG1("context created (s_process=%p)", process->simdata->s_process);
-
-
- if (SIMIX_process_self()) { /* someone created me */
- process->simdata->PPID =
- MSG_process_get_PID(SIMIX_process_self()->data);
- } else {
- process->simdata->PPID = -1;
- }
-
- process->simdata->last_errno = MSG_OK;
-
- /* add the process to the list of the processes of the simulation */
- xbt_fifo_unshift(msg_global->process_list, process);
-
- sprintf(alias, "%s:%s",
- (process->simdata->m_host->simdata->smx_host)->name,
- process->name);
-
- mailbox = MSG_mailbox_new(alias);
+ name = xbt_strdup(name);
+
+ /* Actually build the MSG process */
+ process = MSG_process_create_with_environment(name,
+ (xbt_main_func_t) jprocess,
+ /*data*/ NULL,
+ host,
+ /*argc, argv, properties*/
+ 0,NULL,NULL);
+
+ MSG_process_set_data(process,&process);
+
+ /* 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);
+
+ /* 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 */
}
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);
-
+ 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->simdata);
-
- (*env)->ReleaseStringUTFChars(env, jname, 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 */
}
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();
}
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)
{
}
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);
JNIEXPORT jint JNICALL
-Java_simgrid_msg_Msg_getErrCode(JNIEnv * env, jclass cls)
+Java_org_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);
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);
}
}
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;
jobject jhost;
/* Run everything */
+ XBT_INFO("Ready to run MSG_MAIN");
rv = 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 "));
- DEBUG0
- ("MSG_main finished. Bail out before cleanup since there is a bug in this part.");
+ XBT_INFO("MSG_main finished");
- DEBUG0("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++) {
}
- DEBUG0("Clean native world");
+ XBT_INFO("Clean native world");
/* cleanup native stuff */
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;
}
- SIMIX_context_stop(SIMIX_process_self()->context);
+ 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;
int count = MSG_get_host_number();
m_host_t *table = MSG_get_host_table();
- jclass cls = jxbt_get_class(env, "simgrid/msg/Host");
+ jclass cls = jxbt_get_class(env, "org/simgrid/msg/Host");
if (!cls) {
return NULL;
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 ? */
}
}
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);
