/* Java Wrappers to the MSG API. */
-/* 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 <msg/msg.h>
#include <simgrid/simix.h>
#endif
/* end of eclipse-mandated pimple */
+int JAVA_HOST_LEVEL;
+
static int create_jprocess(int argc, char *argv[]);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
return (jdouble) MSG_get_clock();
}
+static void __JAVA_host_priv_free(void *host)
+{
+}
+
JNIEXPORT void JNICALL
Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
{
(*env)->GetJavaVM(env, &__java_vm);
- if ((*env)->FindClass(env, "java/dyn/Coroutine")) {
- XBT_INFO("Using Coroutines. Your simulation is on steroid.");
- smx_factory_initializer_to_use = SIMIX_ctx_cojava_factory_init;
- }
- else {
- XBT_INFO("Using regular java threads. Coroutines could speed your simulation up.");
- smx_factory_initializer_to_use = SIMIX_ctx_java_factory_init;
- }
+ if ((*env)->FindClass(env, "java/dyn/Coroutine"))
+ smx_factory_initializer_to_use = SIMIX_ctx_cojava_factory_init;
+ else
+ smx_factory_initializer_to_use = SIMIX_ctx_java_factory_init;
jthrowable exc = (*env)->ExceptionOccurred(env);
if (exc) {
(*env)->ExceptionClear(env);
MSG_init(&argc, argv);
+ JAVA_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __JAVA_host_priv_free);
+
for (index = 0; index < argc; index++)
free(argv[index]);
free(argv);
+
+ if (smx_factory_initializer_to_use == SIMIX_ctx_cojava_factory_init)
+ XBT_INFO("Using Coroutines. Your simulation is on steroid.");
+ else if (smx_factory_initializer_to_use == SIMIX_ctx_java_factory_init)
+ XBT_INFO("Using regular java threads. Coroutines could speed your simulation up.");
+ else
+ xbt_die("Unknown context factory. Please report bug.");
}
JNIEXPORT void JNICALL
/* Cleanup java hosts */
hosts = MSG_hosts_as_dynar();
for (index = 0; index < xbt_dynar_length(hosts) - 1; index++) {
- jhost = (jobject) MSG_host_get_data(xbt_dynar_get_as(hosts,index,msg_host_t));
+ jhost = (jobject) xbt_lib_get_level(xbt_dynar_get_as(hosts,index,msg_host_t), JAVA_HOST_LEVEL);
if (jhost)
jhost_unref(env, jhost);
jclass class_Process = (*env)->FindClass(env, argv[0]);
xbt_str_subst(argv[0],'/','.',0);
//Retrieve the methodID for the constructor
- xbt_assert((class_Process != NULL), "Class not found.");
+ xbt_assert((class_Process != NULL), "Class not found (%s).", argv[0]);
jmethodID constructor_Process = (*env)->GetMethodID(env, class_Process, "<init>", "(Lorg/simgrid/msg/Host;Ljava/lang/String;[Ljava/lang/String;)V");
xbt_assert((constructor_Process != NULL), "Constructor not found for class %s. Is there a (Host, String ,String[]) constructor in your class ?", argv[0]);