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 bf64e54..8a64130 100644 (file)
--- a/src/simix/smx_context_java.c
+++ b/src/simix/smx_context_java.c
@@ -39,7 +39,6 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
   (*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;
@@ -67,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();
+    jprocess_start(((smx_ctx_java_t) context)->jprocess,
+                   get_current_thread_env());
   }
     
   return (smx_context_t) context;
@@ -90,13 +91,7 @@ static void smx_ctx_java_free(smx_context_t context)
     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)
 {
@@ -159,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
+}