Merge context_start into context_new to simplify the soup

[simgrid.git] / src / simix / smx_context_java.c

diff --git a/src/simix/smx_context_java.c b/src/simix/smx_context_java.c
index c304b9c..8a64130 100644 (file)
--- a/src/simix/smx_context_java.c
+++ b/src/simix/smx_context_java.c
@@ -9,18 +9,11 @@
 
 
 #include "xbt/function_types.h"
 
 
 #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)");
 
 #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_context(xbt_main_func_t code, int argc, char** argv, 
                                     void_f_pvoid_t cleanup_func, void* cleanup_arg);


@@ -38,33 +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);
 
 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)
 {
 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)->free = smx_ctx_java_free;
   /* 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)->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;
   (*factory)->stop = smx_ctx_java_stop;
   (*factory)->suspend = smx_ctx_java_suspend;
   (*factory)->resume = smx_ctx_java_resume;


@@ -74,10 +48,8 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
 
 static int smx_ctx_java_factory_finalize(smx_context_factory_t * factory)
 {
 
 static int smx_ctx_java_factory_finalize(smx_context_factory_t * factory)
 {

-  /*FIXME: free(maestro_context->exception);*/

   free(*factory);
   *factory = NULL;
   free(*factory);
   *factory = NULL;

-

   return 0;
 }
 
   return 0;
 }
 


@@ -87,9 +59,6 @@ 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);
 
 {
   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){
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
   if(code){


@@ -97,6 +66,8 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, char** argv,
     context->cleanup_arg = cleanup_arg;
     context->jprocess = (jobject) code;
     context->jenv = get_current_thread_env();
     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;
   }
     
   return (smx_context_t) context;


@@ -117,19 +88,10 @@ static void smx_ctx_java_free(smx_context_t context)
         jprocess_join(jprocess, get_current_thread_env());
     }
 
         jprocess_join(jprocess, get_current_thread_env());
     }
 

-    if (ctx_java->exception)
-      free(ctx_java->exception);
-

     free(context);
     context = NULL;
   }
     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)
 {
 
 static void smx_ctx_java_stop(smx_context_t context)
 {


@@ -192,4 +154,4 @@ static void
 smx_ctx_java_resume(smx_context_t old_context, smx_context_t new_context)
 {
   jprocess_schedule(new_context);
 smx_ctx_java_resume(smx_context_t old_context, smx_context_t new_context)
 {
   jprocess_schedule(new_context);

-}
\ No newline at end of file
+}