X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c67cbdbcd451a8059eba237a886c19faa0f4ebe..b1a2e45431d13cdf45ec8b1c91bf7d6ca8377c9d:/src/simix/smx_context_ruby.c

diff --git a/src/simix/smx_context_ruby.c b/src/simix/smx_context_ruby.c
index 4f1cb3b5b3..f19fbccdff 100644
--- a/src/simix/smx_context_ruby.c
+++ b/src/simix/smx_context_ruby.c
@@ -5,12 +5,12 @@
 /* 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 "private.h"
 #include "xbt/function_types.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/asserts.h"
 
+#include "smx_context_private.h"
 #include "bindings/ruby_bindings.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ruby);
@@ -19,23 +19,19 @@ static smx_context_t
 smx_ctx_ruby_create_context(xbt_main_func_t code,int argc,char** argv,
     void_f_pvoid_t cleanup_func,void *cleanup_arg);
 
-static int smx_ctx_ruby_factory_finalize(smx_context_factory_t *factory);
 static void smx_ctx_ruby_free(smx_context_t context);
-static void smx_ctx_ruby_start(smx_context_t context);
 static void smx_ctx_ruby_stop(smx_context_t context);
 static void smx_ctx_ruby_suspend(smx_context_t context);
-static void 
-smx_ctx_ruby_resume(smx_context_t old_context,smx_context_t new_context);
+static void smx_ctx_ruby_resume(smx_context_t new_context);
 static void smx_ctx_ruby_wrapper(void); 
 
 
 void SIMIX_ctx_ruby_factory_init(smx_context_factory_t *factory) {
-  *factory = xbt_new0(s_smx_context_factory_t,1);
+  smx_ctx_base_factory_init(factory);
 
   (*factory)->create_context = smx_ctx_ruby_create_context;
-  (*factory)->finalize = smx_ctx_ruby_factory_finalize;
+  /* Do not overload that method (*factory)->finalize */
   (*factory)->free = smx_ctx_ruby_free;
-  (*factory)->start = smx_ctx_ruby_start;
   (*factory)->stop = smx_ctx_ruby_stop;
   (*factory)->suspend = smx_ctx_ruby_suspend;
   (*factory)->resume = smx_ctx_ruby_resume;
@@ -44,26 +40,17 @@ void SIMIX_ctx_ruby_factory_init(smx_context_factory_t *factory) {
   ruby_init_loadpath();
 }
 
-static int smx_ctx_ruby_factory_finalize(smx_context_factory_t *factory) {
-  free(*factory);
-  *factory = NULL;
-  return 0;
-}
-
 static smx_context_t 
 smx_ctx_ruby_create_context(xbt_main_func_t code,int argc,char** argv,
     void_f_pvoid_t cleanup_func,void* cleanup_arg) {
 
-  smx_ctx_ruby_t context = xbt_new0(s_smx_ctx_ruby_t,1);
+  smx_ctx_ruby_t context = (smx_ctx_ruby_t)smx_ctx_base_factory_create_context_sized
+      (sizeof(s_smx_ctx_ruby_t), code,argc,argv,cleanup_func,cleanup_arg);
 
   /* if the user provided a function for the process , then use it
      Otherwise it's the context for maestro */
   if (code) {
-    context->cleanup_func = cleanup_func;
-    context->cleanup_arg = cleanup_arg;
     context->process = (VALUE)code;
-    context->argc=argc;
-    context->argv=argv;
 
     DEBUG1("smx_ctx_ruby_create_context(%s)...Done",argv[0]);
   }
@@ -71,41 +58,14 @@ smx_ctx_ruby_create_context(xbt_main_func_t code,int argc,char** argv,
 }
 
 static void smx_ctx_ruby_free(smx_context_t context) {
-  /* VALUE process;
-  if (context)
-  {
-   smx_ctx_ruby_t ctx_ruby = (smx_ctx_ruby_t) context;
-
-   if (ctx_ruby->process){
-     // if the Ruby Process is Alive , Join it   
-   // if ( process_isAlive(ctx_ruby->process))
-    {
-      process = ctx_ruby->process;
-      ctx_ruby->process = Qnil;
-      process_join(process);
-    } 
-
-  }
-  free(context);
-  context = NULL; 
-  }*/
-  if (context) {
+ if (context)
     DEBUG1("smx_ctx_ruby_free_context(%p)",context);
-    free (context);
-    context = NULL;
-  }
-}
 
-static void smx_ctx_ruby_start(smx_context_t context) {
-  DEBUG1("smx_ctx_ruby_start(%s) (nothing to do)",context->argv[0]);
-  /* Already Done .. Since a Ruby process is launched within initialization
-     We Start it Within the Initializer ... We Use the Semaphore To Keep
-     the thread alive waiting for mutex signal to execute the main*/
+ smx_ctx_base_free(context);
 }
 
 static void smx_ctx_ruby_stop(smx_context_t context) {
   DEBUG0("smx_ctx_ruby_stop()");
-
   VALUE process = Qnil;
   smx_ctx_ruby_t ctx_ruby,current;
 
@@ -113,13 +73,14 @@ static void smx_ctx_ruby_stop(smx_context_t context) {
     (*(context->cleanup_func)) (context->cleanup_arg);
 
   ctx_ruby = (smx_ctx_ruby_t) context;
-
-  // Well , Let's Do The Same as JNI Stoppin' Process
+  
   if ( simix_global->current_process->iwannadie ) {
     if( ctx_ruby->process ) {
+      
       //if the Ruby Process still Alive ,let's Schedule it
       if ( rb_process_isAlive( ctx_ruby->process ) ) {
-        current = (smx_ctx_ruby_t)simix_global->current_process->context;
+
+        current = (smx_ctx_ruby_t)simix_global->current_process->context;	
         rb_process_schedule(current->process);
         process = ctx_ruby->process;
         // interupt/kill The Ruby Process
@@ -127,8 +88,10 @@ static void smx_ctx_ruby_stop(smx_context_t context) {
       }
     }
   } else {
-    process = ctx_ruby->process;
-    ctx_ruby->process = Qnil;
+
+    if (ctx_ruby->process) 
+     ctx_ruby->process = Qnil;
+
   }
 }
 
@@ -140,15 +103,11 @@ static void smx_ctx_ruby_suspend(smx_context_t context) {
       rb_process_unschedule(ctx_ruby->process);
 }
 
-static void smx_ctx_ruby_resume(smx_context_t old_context,smx_context_t new_context) {
-  DEBUG2("smx_ctx_ruby_resume(%s,%s)",
-      (old_context->argc?old_context->argv[0]:"maestro"),
+static void smx_ctx_ruby_resume(smx_context_t new_context) {
+  DEBUG1("smx_ctx_ruby_resume(%s)",
       (new_context->argc?new_context->argv[0]:"maestro"));
 
   smx_ctx_ruby_t ctx_ruby = (smx_ctx_ruby_t) new_context;
   rb_process_schedule(ctx_ruby->process);
 
-//  DEBUG1("smx_ctx_ruby_schedule(%s)...Done",
-//      (new_context->argc?new_context->argv[0]:"maestro"));
 }
-