/* Functions related to the java process instances. */
-/* Copyright (c) 2007-2012. The SimGrid Team.
+/* Copyright (c) 2007-2014. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
#include "jmsg_process.h"
#include "jmsg.h"
}
/* bind/retrieve the msg host */
- host = MSG_get_host_by_name(hostname);
+ host = MSG_host_by_name(hostname);
if (!(host)) { /* not bound */
jxbt_throw_host_not_found(env, hostname);
return jproperty;
}
JNIEXPORT jobject JNICALL
-Java_org_simgrid_msg_Process_currentProcess(JNIEnv * env, jclass cls)
+Java_org_simgrid_msg_Process_getCurrentProcess(JNIEnv * env, jclass cls)
{
msg_process_t process = MSG_process_self();
jobject jprocess;
JNIEXPORT void JNICALL
Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos)
{
- double time = jmillis / 1000 + jnanos / 1000;
+ double time = ((double)jmillis) / 1000 + ((double)jnanos) / 1000000000;
msg_error_t rv;
rv = MSG_process_sleep(time);
if (rv != MSG_OK) {
- jmsg_throw_status(env,rv);
+ XBT_DEBUG("Something during the MSG_process_sleep invocation was wrong, trigger a HostFailureException");
+
+ //jmsg_throw_status(env,rv);
+
+ // adsein, the code above as been replaced by the code below. Indeed, according to the documentation, a sleep can only
+ // trigger a host_failure exception. When the sleep crashes due to a host shutdown, the exception thrown by smx_context_java.c
+ // is a cancelled_error, see bindings/java/smx_context_java.c, function void smx_ctx_java_stop(smx_context_t context) and src/msg/msg_gos.c
+ // function msg_error_t MSG_process_sleep(double nb_sec)
+
+ jxbt_throw_host_failure(env,NULL);
}
}
JNIEXPORT void JNICALL
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
}