X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8725d9c7b165dfe0b689ded7ed39d95cda7f5ab..548029a96b99a66a16b530071b492e7d3dcd9e5e:/src/simix/smx_context_java.c

diff --git a/src/simix/smx_context_java.c b/src/simix/smx_context_java.c
index 47af4c483d..6d002cfc3a 100644
--- a/src/simix/smx_context_java.c
+++ b/src/simix/smx_context_java.c
@@ -1,70 +1,37 @@
-/* $Id$ */
-
 /* context_java - implementation of context switching for java threads */
 
-/* Copyright (c) 2007-2008 the SimGrid team. All right reserved */
+/* Copyright (c) 2009, 2010. 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 "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);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jmsg, bindings, "MSG for Java(TM)");
 
 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 int smx_ctx_java_factory_finalize(smx_context_factory_t * factory);
+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 void smx_ctx_java_free(smx_context_t context);
-
 static void smx_ctx_java_start(smx_context_t context);
-
 static void smx_ctx_java_stop(smx_context_t context);
-
 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();
-}
+static void smx_ctx_java_resume(smx_context_t new_context);
 
 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);
+  smx_ctx_base_factory_init(factory);
 
   (*factory)->create_context = smx_ctx_java_factory_create_context;
-  (*factory)->finalize = smx_ctx_java_factory_finalize;
+  /* Leave default behavior of (*factory)->finalize */
   (*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;
@@ -72,36 +39,25 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
   (*factory)->name = "ctx_java_factory";
 }
 
-static int smx_ctx_java_factory_finalize(smx_context_factory_t * factory)
-{
-  free(*factory);
-  *factory = NULL;
-
-  /* Restore the default exception setup */
-  __xbt_ex_ctx = &__xbt_ex_ctx_default;
-  __xbt_ex_terminate = &__xbt_ex_terminate_default;
-
-  return 0;
-}
-
 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)
+smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc,
+                                    char **argv,
+                                    void_f_pvoid_t cleanup_func,
+                                    void *cleanup_arg)
 {
   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);
-
   /* 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;
+  if (code) {
+    context->super.cleanup_func = cleanup_func;
+    context->super.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;
 }
 
@@ -119,19 +75,9 @@ static void smx_ctx_java_free(smx_context_t context)
       if (jprocess_is_alive(jprocess, get_current_thread_env()))
         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());
+  smx_ctx_base_free(context);
 }
 
 static void smx_ctx_java_stop(smx_context_t context)
@@ -145,7 +91,7 @@ static void smx_ctx_java_stop(smx_context_t context)
 
   ctx_java = (smx_ctx_java_t) context;
 
-  /*FIXME: is this really necessary?*/
+  /*FIXME: is this really necessary? */
   if (simix_global->current_process->iwannadie) {
     /* The maestro call xbt_context_stop() with an exit code set to one */
     if (ctx_java->jprocess) {
@@ -191,8 +137,8 @@ static void smx_ctx_java_suspend(smx_context_t context)
   jprocess_unschedule(context);
 }
 
-static void 
-smx_ctx_java_resume(smx_context_t old_context, smx_context_t new_context)
+// FIXME: inline those functions
+static void smx_ctx_java_resume(smx_context_t new_context)
 {
   jprocess_schedule(new_context);
-}
\ No newline at end of file
+}