X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e0365935e018f9d810dc0f4d17fbc8ef31ec18b0..f3e4803befab19389587dd1d9af5ecdeffec551e:/src/bindings/java/smx_context_cojava.c

diff --git a/src/bindings/java/smx_context_cojava.c b/src/bindings/java/smx_context_cojava.c
index 9e69d06e57..bfafcb4f6a 100644
--- a/src/bindings/java/smx_context_cojava.c
+++ b/src/bindings/java/smx_context_cojava.c
@@ -1,12 +1,11 @@
 /* context_cojava - implementation of context switching for java coroutines */
 
-/* Copyright 2012. The SimGrid Team.
+/* Copyright (c) 2012-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. */
 
-
 #include <xbt/function_types.h>
 #include <simgrid/simix.h>
 #include <xbt/ex.h>
@@ -39,10 +38,10 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
 
 static smx_context_t
-smx_ctx_cojava_factory_create_context(xbt_main_func_t code, int argc,
-                                    char **argv,
-                                    void_pfn_smxprocess_t cleanup_func,
-                                    void *data);
+smx_ctx_cojava_factory_create_context(xbt_main_func_t code,
+                                      int argc, char **argv,
+                                      void_pfn_smxprocess_t cleanup_func,
+                                      smx_process_t process);
 
 static void smx_ctx_cojava_free(smx_context_t context);
 static void smx_ctx_cojava_suspend(smx_context_t context);
@@ -64,7 +63,7 @@ void SIMIX_ctx_cojava_factory_init(smx_context_factory_t * factory)
   (*factory)->name = "ctx_cojava_factory";
   //(*factory)->finalize = smx_ctx_base_factory_finalize;
   (*factory)->self = smx_ctx_cojava_self;
-  (*factory)->get_data = smx_ctx_base_get_data;
+  (*factory)->get_process = smx_ctx_base_get_process;
 
   global_env = get_current_thread_env();
 
@@ -115,10 +114,10 @@ smx_context_t smx_ctx_cojava_self(void)
 }
 
 static smx_context_t
-smx_ctx_cojava_factory_create_context(xbt_main_func_t code, int argc,
-                                    char **argv,
-                                    void_pfn_smxprocess_t cleanup_func,
-                                    void* data)
+smx_ctx_cojava_factory_create_context(xbt_main_func_t code,
+                                      int argc, char **argv,
+                                      void_pfn_smxprocess_t cleanup_func,
+                                      smx_process_t process)
 {
 	smx_ctx_cojava_t context = xbt_new0(s_smx_ctx_cojava_t, 1);
   /* If the user provided a function for the process then use it
@@ -144,7 +143,7 @@ smx_ctx_cojava_factory_create_context(xbt_main_func_t code, int argc,
   	maestro_context = (smx_context_t)context;
   }
   context->bound = 0;
-  context->super.data = data;
+  context->super.process = process;
   return (smx_context_t) context;
 }
 
@@ -181,7 +180,8 @@ void smx_ctx_cojava_stop(smx_context_t context)
   if (context->iwannadie) {
     context->iwannadie = 0;
     JNIEnv *env = get_current_thread_env();
-    jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", xbt_strdup("Process killed :)"));
+    // TODO it will be nice to have the name of the process to help the end-user to know which Process has been killed
+    jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", xbt_strdup("Process killed :) (file smx_context_cojava.c)"));
     THROWF(cancel_error, 0, "process cancelled");
   }
   else {
@@ -203,7 +203,7 @@ static void smx_ctx_cojava_suspend(smx_context_t context)
     XBT_DEBUG("Switching to %p",my_current_context);
     smx_ctx_cojava_t java_context = (smx_ctx_cojava_t)(next_context);
     if (!java_context->jprocess) {
-      (*(java_context->super.code))(java_context->super.argc, java_context->super.argv);
+      java_context->super.code(java_context->super.argc, java_context->super.argv);
       smx_ctx_cojava_create_coroutine(java_context);
     }
     else if (!java_context->bound) {
@@ -230,7 +230,7 @@ static void smx_ctx_cojava_resume(smx_context_t new_context) {
   smx_ctx_cojava_t java_context = (smx_ctx_cojava_t)(new_context);
 
   if (!java_context->jprocess) {
-    (*(java_context->super.code))(java_context->super.argc, java_context->super.argv);
+    java_context->super.code(java_context->super.argc, java_context->super.argv);
     smx_ctx_cojava_create_coroutine(java_context);
     java_context->bound = 1;
   }
@@ -247,7 +247,7 @@ static void smx_ctx_cojava_runall(void)
 {
   cojava_processes = SIMIX_process_get_runnable();
   smx_process_t process;
-  if (xbt_dynar_length(cojava_processes) > 0) {
+  if (!xbt_dynar_is_empty(cojava_processes)) {
     process = xbt_dynar_get_as(cojava_processes, 0, smx_process_t);
     cojava_process_index = 1;
     /* Execute the first process */
@@ -264,7 +264,8 @@ static void smx_ctx_cojava_create_coroutine(smx_ctx_cojava_t context) {
      FILE *conf= fopen("/proc/sys/vm/max_map_count","r");
      if (conf) {
 	int limit=-1;
-	fscanf(conf,"%d",&limit);
+        if(fscanf(conf,"%d",&limit) != 1)
+           xbt_die("Error while creating a new coroutine. Parse error.");
 	fclose(conf);
 	if (limit!=-1 && SIMIX_process_count() > (limit - 100) /2)
 	   xbt_die("Error while creating a new coroutine. "