[simix] Kill cojava

[simgrid.git] / src / bindings / java / jmsg.c

diff --git a/src/bindings/java/jmsg.c b/src/bindings/java/jmsg.c
index b5a7abb..d588664 100644 (file)
--- a/src/bindings/java/jmsg.c
+++ b/src/bindings/java/jmsg.c
@@ -1,6 +1,6 @@
 /* Java Wrappers to the MSG API.                                            */
 
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,7 +12,6 @@
 #include <locale.h>
 
 #include "smx_context_java.h"
-#include "smx_context_cojava.h"
 
 #include "jmsg_process.h"
 
@@ -108,10 +107,7 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 
   (*env)->GetJavaVM(env, &__java_vm);
 
-  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;
+  smx_factory_initializer_to_use = SIMIX_ctx_java_factory_init;
   jthrowable exc = (*env)->ExceptionOccurred(env);
   if (exc) {
     (*env)->ExceptionClear(env);
@@ -124,12 +120,12 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 
   argc++;
   argv = xbt_new(char *, argc + 1);
-  argv[0] = strdup("java");
+  argv[0] = xbt_strdup("java");
 
   for (index = 0; index < argc - 1; index++) {
     jval = (jstring) (*env)->GetObjectArrayElement(env, jargs, index);
     tmp = (*env)->GetStringUTFChars(env, jval, 0);
-    argv[index + 1] = strdup(tmp);
+    argv[index + 1] = xbt_strdup(tmp);
     (*env)->ReleaseStringUTFChars(env, jval, tmp);
   }
   argv[argc] = NULL;
@@ -144,9 +140,7 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 
   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)
+  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.");
@@ -320,4 +314,3 @@ static int create_jprocess(int argc, char *argv[]) {
 
   return 0;
 }
-