X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/52e6b3073b6d8b88d05b8b2e520c567eb789b09d..6068c9f0036786cdcbeb273d495e5aa378cb5f92:/src/smx_context_java.c

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index fd385bb004..10fa3ea4f5 100644
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -66,17 +66,25 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc,
                                     void_pfn_smxprocess_t cleanup_func,
                                     void* data)
 {
-  smx_ctx_java_t context = xbt_new0(s_smx_ctx_java_t, 1);
-
+	smx_ctx_java_t context = xbt_new0(s_smx_ctx_java_t, 1);
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if (code) {
-    context->super.cleanup_func = cleanup_func;
-    context->jprocess = (jobject) code;
-    context->begin = xbt_os_sem_init(0);
-    context->end = xbt_os_sem_init(0);
-    context->killed = 0;
-    context->thread = xbt_os_thread_create(NULL,smx_ctx_java_thread_run,context,NULL);
+		if (argc == 0) {
+			context->jprocess = (jobject) code;
+		}
+		else {
+			context->jprocess = NULL;
+		}
+		context->super.cleanup_func = cleanup_func;
+		context->begin = xbt_os_sem_init(0);
+		context->end = xbt_os_sem_init(0);
+
+		context->super.argc = argc;
+		context->super.argv = argv;
+		context->super.code = code;
+
+		context->thread = xbt_os_thread_create(NULL,smx_ctx_java_thread_run,context,NULL);
   }
   else {
   	context->thread = NULL;
@@ -97,6 +105,11 @@ static void* smx_ctx_java_thread_run(void *data) {
   context->jenv = get_current_thread_env();
   //Wait for the first scheduling round to happen.
   xbt_os_sem_acquire(context->begin);
+  //Create the "Process" object if needed.
+	if (context->super.argc > 0) {
+		(*(context->super.code))(context->super.argc, context->super.argv);
+	}
+	xbt_assert((context->jprocess != NULL), "Process not created...");
   //wait for the process to be able to begin
   //TODO: Cache it
 	jfieldID jprocess_field_Process_startTime = jxbt_get_sfield(env, "org/simgrid/msg/Process", "startTime", "D");
@@ -133,8 +146,8 @@ void smx_ctx_java_stop(smx_context_t context)
 	xbt_assert(context == my_current_context,
      "The context to stop must be the current one");
   /* I am the current process and I am dying */
-  if (ctx_java->killed == 1) {
-  	ctx_java->killed = 0;
+	if (context->iwannadie == -1) {
+  	context->iwannadie = 0;
   	JNIEnv *env = get_current_thread_env();
   	jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", bprintf("Process killed :)"));
   	THROWF(cancel_error, 0, "process cancelled");