#include "msg/msg.h"
#include "msg/private.h"
#include "simix/private.h"
-#include "xbt/xbt_jcontext.h"
-#include "xbt/xbt_context_factory.h"
+#include "xbt/xbt_context_java.h"
#include "jmsg_process.h"
#include "jmsg_host.h"
#include "jmsg.h"
-#include "msg/msg_mailbox.h"
+#include "msg/mailbox.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
static jobject
native_to_java_process(m_process_t process)
{
- return ((xbt_jcontext_t)(process->simdata->s_process->simdata->context))->jprocess;
+ return ((xbt_ctx_java_t)(process->simdata->s_process->simdata->context))->jprocess;
}
argc++;
- argv = (char**)calloc(argc,sizeof(char*));
+ argv = xbt_new0(char*,1);
argv[0] = strdup("java");
JNIEXPORT void JNICALL
Java_simgrid_msg_MsgNative_selectContextFactory(JNIEnv * env, jclass class,jstring jname)
{
- int rv;
+ char *errmsg = NULL;
+ xbt_ex_t e;
- /* get the C string from the java string*/
- const char* name = (*env)->GetStringUTFChars(env, jname, 0);
-
- rv = xbt_context_select_factory(name);
-
- (*env)->ReleaseStringUTFChars(env, jname, name);
+ /* get the C string from the java string*/
+ const char* name = (*env)->GetStringUTFChars(env, jname, 0);
+
+ TRY {
+ xbt_context_select_factory(name);
+ } CATCH(e) {
+ errmsg = xbt_strdup(e.msg);
+ xbt_ex_free(e);
+ }
+
+ (*env)->ReleaseStringUTFChars(env, jname, name);
- if(rv)
- jxbt_throw_native(env, xbt_strdup("xbt_select_context_factory() failed"));
+ if(errmsg) {
+ char *thrown = bprintf("xbt_select_context_factory() failed: %s",errmsg);
+ free(errmsg);
+ jxbt_throw_native(env, thrown);
+ }
}
JNIEXPORT void JNICALL