X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/821649e2221068a113b41b8e9c5ac4ba76887772..7e71d73eb6728d8d498d010976f038789049c131:/src/simix/smx_context_java.c

diff --git a/src/simix/smx_context_java.c b/src/simix/smx_context_java.c
index ed5758bdbc..8a64130bd7 100644
--- a/src/simix/smx_context_java.c
+++ b/src/simix/smx_context_java.c
@@ -9,24 +9,15 @@
 
 
 #include "xbt/function_types.h"
-#include "xbt/ex_interface.h"
 #include "private.h"
 #include "smx_context_java.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg, "MSG for Java(TM)");
 
-/* callback: context fetching */
-static ex_ctx_t *xbt_ctx_java_ex_ctx(void);
-
-/* callback: termination */
-static void xbt_ctx_java_ex_terminate(xbt_ex_t * e);
-
 static smx_context_t
 smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, char** argv, 
                                     void_f_pvoid_t cleanup_func, void* cleanup_arg);
 
-static smx_context_t smx_ctx_java_factory_create_maestro_context(void);
-
 static int smx_ctx_java_factory_finalize(smx_context_factory_t * factory);
 
 static void smx_ctx_java_free(smx_context_t context);
@@ -40,34 +31,14 @@ static void smx_ctx_java_suspend(smx_context_t context);
 static void
   smx_ctx_java_resume(smx_context_t old_context, smx_context_t new_context);
 
-
-/* callback: context fetching */
-static ex_ctx_t *xbt_ctx_java_ex_ctx(void)
-{
-  return simix_global->current_process->context->exception;
-}
-
-/* callback: termination */
-static void xbt_ctx_java_ex_terminate(xbt_ex_t * e)
-{
-  xbt_ex_display(e);
-  abort();
-}
-
 void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
 {
-  /* context exception handlers */
-  __xbt_ex_ctx = xbt_ctx_java_ex_ctx;
-  __xbt_ex_terminate = xbt_ctx_java_ex_terminate;
-
   /* instantiate the context factory */
   *factory = xbt_new0(s_smx_context_factory_t, 1);
 
   (*factory)->create_context = smx_ctx_java_factory_create_context;
   (*factory)->finalize = smx_ctx_java_factory_finalize;
-  (*factory)->create_maestro_context = smx_ctx_java_factory_create_maestro_context;
   (*factory)->free = smx_ctx_java_free;
-  (*factory)->start = smx_ctx_java_start;
   (*factory)->stop = smx_ctx_java_stop;
   (*factory)->suspend = smx_ctx_java_suspend;
   (*factory)->resume = smx_ctx_java_resume;
@@ -75,22 +46,10 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
   (*factory)->name = "ctx_java_factory";
 }
 
-static smx_context_t smx_ctx_java_factory_create_maestro_context(void)
-{
-  smx_ctx_java_t context = xbt_new0(s_smx_ctx_java_t, 1);
-
-  context->exception = xbt_new(ex_ctx_t, 1);
-  XBT_CTX_INITIALIZE(context->exception);
-
-  return (smx_context_t) context;
-}
-
 static int smx_ctx_java_factory_finalize(smx_context_factory_t * factory)
 {
-  /*FIXME: free(maestro_context->exception);*/
   free(*factory);
   *factory = NULL;
-
   return 0;
 }
 
@@ -100,13 +59,17 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, char** argv,
 {
   smx_ctx_java_t context = xbt_new0(s_smx_ctx_java_t, 1);
 
-  context->cleanup_func = cleanup_func;
-  context->cleanup_arg = cleanup_arg;
-  context->exception = xbt_new(ex_ctx_t, 1);
-  XBT_CTX_INITIALIZE(context->exception);
-  context->jprocess = (jobject) code;
-  context->jenv = get_current_thread_env();
-
+  /* If the user provided a function for the process then use it
+     otherwise is the context for maestro */
+  if(code){
+    context->cleanup_func = cleanup_func;
+    context->cleanup_arg = cleanup_arg;
+    context->jprocess = (jobject) code;
+    context->jenv = get_current_thread_env();
+    jprocess_start(((smx_ctx_java_t) context)->jprocess,
+                   get_current_thread_env());
+  }
+    
   return (smx_context_t) context;
 }
 
@@ -125,19 +88,10 @@ static void smx_ctx_java_free(smx_context_t context)
         jprocess_join(jprocess, get_current_thread_env());
     }
 
-    if (ctx_java->exception)
-      free(ctx_java->exception);
-
     free(context);
     context = NULL;
   }
-}
-
-static void smx_ctx_java_start(smx_context_t context)
-{
-  jprocess_start(((smx_ctx_java_t) context)->jprocess,
-                 get_current_thread_env());
-}
+} 
 
 static void smx_ctx_java_stop(smx_context_t context)
 {
@@ -200,4 +154,4 @@ static void
 smx_ctx_java_resume(smx_context_t old_context, smx_context_t new_context)
 {
   jprocess_schedule(new_context);
-}
\ No newline at end of file
+}