X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98396443387ae00843fed844b16cc5a88bd018bc..07590d530fdab126f1f35077b6d2de7e81bdbf13:/src/jmsg_process.c diff --git a/src/jmsg_process.c b/src/jmsg_process.c index 3ff056f12b..aaa73e70ef 100644 --- a/src/jmsg_process.c +++ b/src/jmsg_process.c @@ -1,6 +1,6 @@ /* Functions related to the java process instances. */ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2012. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -18,13 +18,13 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_exit(JNIEnv *env, jobject jprocess) { if (smx_factory_initializer_to_use == SIMIX_ctx_cojava_factory_init) { - m_process_t process = jprocess_to_native_process(jprocess, env); + msg_process_t process = jprocess_to_native_process(jprocess, env); smx_context_t context = MSG_process_get_smx_ctx(process); smx_ctx_cojava_stop(context); } } -jobject native_to_java_process(m_process_t process) +jobject native_to_java_process(msg_process_t process) { return ((smx_ctx_java_t)MSG_process_get_smx_ctx(process))->jprocess; } @@ -41,17 +41,17 @@ void jprocess_delete_global_ref(jobject jprocess, JNIEnv * env) void jprocess_join(jobject jprocess, JNIEnv * env) { - m_process_t process = jprocess_to_native_process(jprocess,env); + msg_process_t process = jprocess_to_native_process(jprocess,env); smx_ctx_java_t context = (smx_ctx_java_t)MSG_process_get_smx_ctx(process); xbt_os_thread_join(context->thread,NULL); } -m_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env) +msg_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env) { - return (m_process_t) (long) (*env)->GetLongField(env, jprocess, jprocess_field_Process_bind); + return (msg_process_t) (long) (*env)->GetLongField(env, jprocess, jprocess_field_Process_bind); } -void jprocess_bind(jobject jprocess, m_process_t process, JNIEnv * env) +void jprocess_bind(jobject jprocess, msg_process_t process, JNIEnv * env) { (*env)->SetLongField(env, jprocess, jprocess_field_Process_bind, (jlong)(process)); } @@ -104,8 +104,8 @@ Java_org_simgrid_msg_Process_create(JNIEnv * env, 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 */ + msg_process_t process; /* the native process to create */ + msg_host_t host; /* Where that process lives */ hostname = (*env)->GetStringUTFChars(env, jhostname, 0); @@ -174,7 +174,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, jint PID) { - m_process_t process = MSG_process_from_PID(PID); + msg_process_t process = MSG_process_from_PID(PID); if (!process) { jxbt_throw_process_not_found(env, bprintf("PID = %d",(int) PID)); @@ -184,17 +184,37 @@ Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, jobject jprocess = native_to_java_process(process); if (!jprocess) { - jxbt_throw_jni(env, "SIMIX_process_get_jprocess() failed"); + jxbt_throw_jni(env, "get process failed"); return NULL; } return jprocess; } +JNIEXPORT jobject JNICALL +Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, jobject jprocess, jobject jname) { + msg_process_t process = jprocess_to_native_process(jprocess, env); + + if (!process) { + jxbt_throw_notbound(env, "process", jprocess); + return NULL; + } + const char *name = (*env)->GetStringUTFChars(env, jname, 0); + + const char *property = MSG_process_get_property_value(process, name); + if (!property) { + return NULL; + } + + jobject jproperty = (*env)->NewStringUTF(env, property); + + (*env)->ReleaseStringUTFChars(env, jname, name); + return jproperty; +} JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_currentProcess(JNIEnv * env, jclass cls) { - m_process_t process = MSG_process_self(); + msg_process_t process = MSG_process_self(); jobject jprocess; if (!process) { @@ -214,7 +234,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_suspend(JNIEnv * env, jobject jprocess) { - m_process_t process = jprocess_to_native_process(jprocess, env); + msg_process_t process = jprocess_to_native_process(jprocess, env); if (!process) { jxbt_throw_notbound(env, "process", jprocess); @@ -222,17 +242,18 @@ Java_org_simgrid_msg_Process_suspend(JNIEnv * env, } /* try to suspend the process */ - MSG_error_t rv = MSG_process_suspend(process); + msg_error_t rv = MSG_process_suspend(process); jxbt_check_res("MSG_process_suspend()", rv, MSG_OK, bprintf("unexpected error , please report this bug")); } + JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject jprocess) { - m_process_t process = jprocess_to_native_process(jprocess, env); + msg_process_t process = jprocess_to_native_process(jprocess, env); if (!process) { jxbt_throw_notbound(env, "process", jprocess); @@ -240,16 +261,55 @@ Java_org_simgrid_msg_Process_resume(JNIEnv * env, } /* try to resume the process */ - MSG_error_t rv = MSG_process_resume(process); + msg_error_t rv = MSG_process_resume(process); jxbt_check_res("MSG_process_resume()", rv, MSG_OK, bprintf("unexpected error , please report this bug")); } +JNIEXPORT void JNICALL +Java_org_simgrid_msg_Process_setAutoRestart + (JNIEnv *env, jobject jprocess, jboolean jauto_restart) { + msg_process_t process = jprocess_to_native_process(jprocess, env); + xbt_ex_t e; + + int auto_restart = jauto_restart == JNI_TRUE ? 1 : 0; + + if (!process) { + jxbt_throw_notbound(env, "process", jprocess); + return; + } + + TRY { + MSG_process_auto_restart_set(process,auto_restart); + } + CATCH (e) { + xbt_ex_free(e); + } +} +JNIEXPORT void JNICALL +Java_org_simgrid_msg_Process_restart + (JNIEnv *env, jobject jprocess) { + msg_process_t process = jprocess_to_native_process(jprocess, env); + xbt_ex_t e; + + if (!process) { + jxbt_throw_notbound(env, "process", jprocess); + return; + } + + TRY { + MSG_process_restart(process); + } + CATCH (e) { + xbt_ex_free(e); + } + +} JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env, jobject jprocess) { - m_process_t process = jprocess_to_native_process(jprocess, env); + msg_process_t process = jprocess_to_native_process(jprocess, env); if (!process) { jxbt_throw_notbound(env, "process", jprocess); @@ -260,15 +320,18 @@ Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env, return (jboolean) MSG_process_is_suspended(process); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep +JNIEXPORT void JNICALL +Java_org_simgrid_msg_Process_sleep (JNIEnv *env, jclass cls, jlong jmillis, jint jnanos) { double time = jmillis / 1000 + jnanos / 1000; - MSG_error_t rv; + msg_error_t rv; + xbt_ex_t e; TRY { rv = MSG_process_sleep(time); } - CATCH_ANONYMOUS { + CATCH(e) { + xbt_ex_free(e); return; } if (rv != MSG_OK) { @@ -279,11 +342,13 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess, jdouble jseconds) { - MSG_error_t rv; + msg_error_t rv; + xbt_ex_t e; TRY { rv = MSG_process_sleep((double)jseconds); } - CATCH_ANONYMOUS { + CATCH(e) { + xbt_ex_free(e); return; } if (rv != MSG_OK) { @@ -297,7 +362,7 @@ Java_org_simgrid_msg_Process_kill(JNIEnv * env, jobject jprocess) { /* get the native instances from the java ones */ - m_process_t process = jprocess_to_native_process(jprocess, env); + msg_process_t process = jprocess_to_native_process(jprocess, env); if (!process) { jxbt_throw_notbound(env, "process", jprocess); return; @@ -309,14 +374,14 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate(JNIEnv * env, jobject jprocess, jobject jhost) { - m_process_t process = jprocess_to_native_process(jprocess, env); + msg_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); + msg_host_t host = jhost_get_native(env, jhost); if (!host) { jxbt_throw_notbound(env, "host", jhost); @@ -324,14 +389,27 @@ Java_org_simgrid_msg_Process_migrate(JNIEnv * env, } /* try to change the host of the process */ - 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")); + msg_error_t rv = MSG_process_migrate(process, host); + if (rv != MSG_OK) { + jmsg_throw_status(env,rv); + } /* change the host java side */ (*env)->SetObjectField(env, jprocess, jprocess_field_Process_host, jhost); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setKillTime (JNIEnv *env , jobject jprocess, jdouble jkilltime) { - m_process_t process = jprocess_to_native_process(jprocess, env); + msg_process_t process = jprocess_to_native_process(jprocess, env); MSG_process_set_kill_time(process, (double)jkilltime); } + +JNIEXPORT jint JNICALL +Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls) { + /* FIXME: the next test on SimGrid version is to ensure that this still compiles with SG 3.8 while the C function were added in SG 3.9 only. + * This kind of pimple becomes mandatory when you get so slow to release the java version that it begins evolving further after the C release date. + */ +#if SIMGRID_VERSION >= 30900 + return (jint) MSG_process_get_number(); +#else + return (jint) -1; +#endif +}