X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e0365935e018f9d810dc0f4d17fbc8ef31ec18b0..3af9dcb5714db015a7038a58701b2b453f52c6ca:/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..a998d69efd 100644
--- a/src/bindings/java/smx_context_cojava.c
+++ b/src/bindings/java/smx_context_cojava.c
@@ -1,6 +1,6 @@
 /* context_cojava - implementation of context switching for java coroutines */
 
-/* Copyright 2012. The SimGrid Team.
+/* Copyright (c) 2012-2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -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. "