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

diff --git a/src/simix/smx_context_ruby.c b/src/simix/smx_context_ruby.c
index b5062bb60d..f19fbccdff 100644
--- a/src/simix/smx_context_ruby.c
+++ b/src/simix/smx_context_ruby.c
@@ -1,195 +1,113 @@
-/* $Id$ */
+/* context_Ruby - implementation of context switching with/for ruby         */
 
-/* context_Ruby - implementation of context switching with ruby coroutines */
-
-/* Copyright (c) 2010, the SimGrid team. All right reserved */
+/* Copyright (c) 2010, the SimGrid team. All right 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 "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);
+
 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);
+    void_f_pvoid_t cleanup_func,void *cleanup_arg);
 
 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) {
+  smx_ctx_base_factory_init(factory);
 
-void SIMIX_ctx_ruby_factory_init(smx_context_factory_t *factory)
-{
-  
- *factory = xbt_new0(s_smx_context_factory_t,1);
- 
- (*factory)->create_context = smx_ctx_ruby_create_context;
- (*factory)->finalize = smx_ctx_ruby_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;
- (*factory)->name = "smx_ruby_context_factory";
+  (*factory)->create_context = smx_ctx_ruby_create_context;
+  /* Do not overload that method (*factory)->finalize */
+  (*factory)->free = smx_ctx_ruby_free;
+  (*factory)->stop = smx_ctx_ruby_stop;
+  (*factory)->suspend = smx_ctx_ruby_suspend;
+  (*factory)->resume = smx_ctx_ruby_resume;
+  (*factory)->name = "smx_ruby_context_factory";
   ruby_init();
   ruby_init_loadpath();
-  #ifdef MY_DEBUG
-  printf("SIMIX_ctx_ruby_factory_init...Done\n");
-  #endif 
-}
-  
-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);
-  
-  /*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;
-   
-  #ifdef MY_DEBUG
-  printf("smx_ctx_ruby_create_context...Done\n");
-  #endif
-   
+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 = (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->process = (VALUE)code;
+
+    DEBUG1("smx_ctx_ruby_create_context(%s)...Done",argv[0]);
   }
   return (smx_context_t) context;
-  
-}
-  
-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; 
-  }*/
-  free (context);
-  context = NULL;
-    #ifdef MY_DEBUG
-  printf("smx_ctx_ruby_free_context...Done\n");
-  #endif
-  
 }
 
-static void smx_ctx_ruby_start(smx_context_t context)
-{
-   
- /* 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 Waitin' For Mutex Signal to Execute The Main*/
- 
+static void smx_ctx_ruby_free(smx_context_t context) {
+ if (context)
+    DEBUG1("smx_ctx_ruby_free_context(%p)",context);
+
+ smx_ctx_base_free(context);
 }
 
-static void smx_ctx_ruby_stop(smx_context_t 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;
-  
+
   if ( context->cleanup_func)
     (*(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;
-     rb_process_schedule(current->process);
-     process = ctx_ruby->process;     
-     // interupt/kill The Ruby Process
-     rb_process_kill_up(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;	
+        rb_process_schedule(current->process);
+        process = ctx_ruby->process;
+        // interupt/kill The Ruby Process
+        rb_process_kill_up(process);
+      }
     }
-   }    
-  }else {
-   
-    process = ctx_ruby->process;
-    ctx_ruby->process = Qnil;
-    
+  } else {
+
+    if (ctx_ruby->process) 
+     ctx_ruby->process = Qnil;
+
   }
-  #ifdef MY_DEBUG
-  printf("smx_ctx_ruby_stop...Done\n");
-  #endif
 }
 
-static void smx_ctx_ruby_suspend(smx_context_t context)
-{
-
-if (context)
-{
-smx_ctx_ruby_t ctx_ruby = (smx_ctx_ruby_t) context;
-  if (ctx_ruby->process)
-    rb_process_unschedule( ctx_ruby->process ) ;
-#ifdef MY_DEBUG
-  printf("smx_ctx_ruby_unschedule...Done\n");
-#endif
-}
-  
-  else
-    rb_raise(rb_eRuntimeError,"smx_ctx_ruby_suspend failed");
-  
+static void smx_ctx_ruby_suspend(smx_context_t context) {
+
+    DEBUG1("smx_ctx_ruby_suspend(%s)",context->argv[0]);
+    smx_ctx_ruby_t ctx_ruby = (smx_ctx_ruby_t) context;
+    if (ctx_ruby->process)
+      rb_process_unschedule(ctx_ruby->process);
 }
 
-static void smx_ctx_ruby_resume(smx_context_t old_context,smx_context_t new_context)
-{
-  
- smx_ctx_ruby_t ctx_ruby = (smx_ctx_ruby_t) new_context;
- rb_process_schedule(ctx_ruby->process);
- 
-  #ifdef MY_DEBUG
-    printf("smx_ctx_ruby_schedule...Done\n");
-  #endif
- 
+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);
+
 }