X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/601b0b84937fb065edd43e83f755e2eae4a1de0e..cbe8c21df78eb20ffd36c0bac250685f490244c5:/src/jmsg.c

diff --git a/src/jmsg.c b/src/jmsg.c
index 5b0096639d..37c77b30d8 100644
--- a/src/jmsg.c
+++ b/src/jmsg.c
@@ -1,6 +1,6 @@
 /* Java Wrappers to the MSG API.                                            */
 
-/* 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
@@ -9,15 +9,15 @@
 #include <msg/msg.h>
 #include <simgrid/simix.h>
 #include <surf/surfxml_parse.h>
-
+#include <locale.h>
 
 #include "smx_context_java.h"
+#include "smx_context_cojava.h"
 
 #include "jmsg_process.h"
 
 #include "jmsg_host.h"
 #include "jmsg_task.h"
-#include "jmsg_application_handler.h"
 #include "jxbt_utilities.h"
 
 #include "jmsg.h"
@@ -31,10 +31,11 @@
 #endif
 /* end of eclipse-mandated pimple */
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+static int create_jprocess(int argc, char *argv[]);
 
-static JavaVM *__java_vm = NULL;
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
+JavaVM *__java_vm = NULL;
 
 JavaVM *get_java_VM(void)
 {
@@ -46,9 +47,26 @@ JNIEnv *get_current_thread_env(void)
   JNIEnv *env;
 
   (*__java_vm)->AttachCurrentThread(__java_vm, (void **) &env, NULL);
-
   return env;
 }
+
+void jmsg_throw_status(JNIEnv *env, msg_error_t status) {
+  switch (status) {
+    case MSG_TIMEOUT:
+        jxbt_throw_time_out_failure(env,NULL);
+    break;
+    case MSG_TRANSFER_FAILURE:
+        jxbt_throw_transfer_failure(env,NULL);
+    break;
+    case MSG_HOST_FAILURE:
+        jxbt_throw_host_failure(env,NULL);
+    break;
+    default:
+        jxbt_throw_native(env,bprintf("communication failed"));
+  }
+}
+
+
 /***************************************************************************************
  * Unsortable functions                                                        *
  ***************************************************************************************/
@@ -68,7 +86,22 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
   jstring jval;
   const char *tmp;
 
-  smx_factory_initializer_to_use = SIMIX_ctx_java_factory_init;
+  (*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;
+  }
+  jthrowable exc = (*env)->ExceptionOccurred(env);
+  if (exc) {
+    (*env)->ExceptionClear(env);
+  }
+
+  setlocale(LC_NUMERIC,"C");
 
   if (jargs)
     argc = (int) (*env)->GetArrayLength(env, jargs);
@@ -85,20 +118,18 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
   }
   argv[argc] = NULL;
 
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
 
   for (index = 0; index < argc; index++)
     free(argv[index]);
 
   free(argv);
-
-  (*env)->GetJavaVM(env, &__java_vm);
 }
 
 JNIEXPORT void JNICALL
     JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
 {
-  MSG_error_t rv;
+  msg_error_t rv;
   int index;
   xbt_dynar_t hosts;
   jobject jhost;
@@ -117,7 +148,7 @@ 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,m_host_t));
+    jhost = (jobject) MSG_host_get_data(xbt_dynar_get_as(hosts,index,msg_host_t));
     if (jhost)
       jhost_unref(env, jhost);
 
@@ -129,7 +160,7 @@ JNIEXPORT void JNICALL
     JNICALL Java_org_simgrid_msg_Msg_clean(JNIEnv * env, jclass cls)
 {
   /* cleanup native stuff. Calling it is ... useless since leaking memory at the end of the simulation is a non-issue */
-  MSG_error_t rv = MSG_OK != MSG_clean();
+  msg_error_t rv = MSG_OK != MSG_clean();
   jxbt_check_res("MSG_clean()", rv, MSG_OK,
                  bprintf
                  ("unexpected error : MSG_clean() failed .. please report this bug "));
@@ -147,7 +178,20 @@ Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls,
 
   (*env)->ReleaseStringUTFChars(env, jplatformFile, platformFile);
 }
-
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Msg_debug(JNIEnv * env, jclass cls, jstring js)
+{
+  const char *s = (*env)->GetStringUTFChars(env, js, 0);
+  XBT_DEBUG("%s", s);
+  (*env)->ReleaseStringUTFChars(env, js, s);
+}
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Msg_verb(JNIEnv * env, jclass cls, jstring js)
+{
+  const char *s = (*env)->GetStringUTFChars(env, js, 0);
+  XBT_VERB("%s", s);
+  (*env)->ReleaseStringUTFChars(env, js, s);
+}
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
 {
@@ -155,7 +199,27 @@ Java_org_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js)
   XBT_INFO("%s", s);
   (*env)->ReleaseStringUTFChars(env, js, s);
 }
-
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Msg_warn(JNIEnv * env, jclass cls, jstring js)
+{
+  const char *s = (*env)->GetStringUTFChars(env, js, 0);
+  XBT_WARN("%s", s);
+  (*env)->ReleaseStringUTFChars(env, js, s);
+}
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Msg_error(JNIEnv * env, jclass cls, jstring js)
+{
+  const char *s = (*env)->GetStringUTFChars(env, js, 0);
+  XBT_ERROR("%s", s);
+  (*env)->ReleaseStringUTFChars(env, js, s);
+}
+JNIEXPORT void JNICALL
+Java_org_simgrid_msg_Msg_critical(JNIEnv * env, jclass cls, jstring js)
+{
+  const char *s = (*env)->GetStringUTFChars(env, js, 0);
+  XBT_CRITICAL("%s", s);
+  (*env)->ReleaseStringUTFChars(env, js, s);
+}
 JNIEXPORT void JNICALL
 Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
                                        jstring jdeploymentFile)
@@ -164,30 +228,50 @@ Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls,
   const char *deploymentFile =
       (*env)->GetStringUTFChars(env, jdeploymentFile, 0);
 
-  surf_parse_reset_callbacks();
-
-  surfxml_add_callback(STag_surfxml_process_cb_list,
-                       japplication_handler_on_begin_process);
-
-  surfxml_add_callback(ETag_surfxml_argument_cb_list,
-                       japplication_handler_on_process_arg);
-
-  surfxml_add_callback(STag_surfxml_prop_cb_list,
-                       japplication_handler_on_property);
-
-  surfxml_add_callback(ETag_surfxml_process_cb_list,
-                       japplication_handler_on_end_process);
-
-  surf_parse_open(deploymentFile);
-
-  japplication_handler_on_start_document();
-
-  if (surf_parse())
-    jxbt_throw_jni(env, "surf_parse() failed");
-
-  surf_parse_close();
-
-  japplication_handler_on_end_document();
-
-  (*env)->ReleaseStringUTFChars(env, jdeploymentFile, deploymentFile);
+  SIMIX_function_register_default(create_jprocess);
+  MSG_launch_application(deploymentFile);
+}
+/**
+ * Function called when there is the need to create the java Process object
+ * (when we are using deployement files).
+ * it HAS to be executed on the process context, else really bad things will happen.
+ */
+static int create_jprocess(int argc, char *argv[]) {
+  JNIEnv *env = get_current_thread_env();
+  //Change the "." in class name for "/".
+  xbt_str_subst(argv[0],'.','/',0);
+  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.");
+  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]);
+
+  //Retrieve the name of the process.
+  jstring jname = (*env)->NewStringUTF(env, argv[0]);
+  //Build the arguments
+  jobjectArray args = (jobjectArray)((*env)->NewObjectArray(env,argc - 1,
+  (*env)->FindClass(env,"java/lang/String"),
+  (*env)->NewStringUTF(env,"")));
+  int i;
+  for (i = 1; i < argc; i++)
+      (*env)->SetObjectArrayElement(env,args,i - 1,(*env)->NewStringUTF(env, argv[i]));
+  //Retrieve the host for the process.
+  jstring jhostName = (*env)->NewStringUTF(env, MSG_host_get_name(MSG_host_self()));
+  jobject jhost = Java_org_simgrid_msg_Host_getByName(env, NULL, jhostName);
+  //creates the process
+  jobject jprocess = (*env)->NewObject(env, class_Process, constructor_Process, jhost, jname, args);
+  xbt_assert((jprocess != NULL), "Process allocation failed.");
+  jprocess = (*env)->NewGlobalRef(env, jprocess);
+  //bind the process to the context
+  msg_process_t process = MSG_process_self();
+  smx_ctx_java_t context = (smx_ctx_java_t)MSG_process_get_smx_ctx(process);
+  context->jprocess = jprocess;
+/* sets the PID and the PPID of the process */
+(*env)->SetIntField(env, jprocess, jprocess_field_Process_pid,(jint) MSG_process_get_PID(process));
+(*env)->SetIntField(env, jprocess, jprocess_field_Process_ppid, (jint) MSG_process_get_PPID(process));
+  jprocess_bind(jprocess, process, env);
+
+  return 0;
 }
+