Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
More ruby cleanups: stop defining everything static, and prefix functions with rb_...
[simgrid.git] / src / bindings / ruby / rb_msg_process.c
index e6df224..202becc 100644 (file)
@@ -6,9 +6,11 @@
  *(GNU LGPL) which comes with this package. 
  */
 
+#include "msg/private.h" /* s_simdata_process_t */
 #include "bindings/ruby_bindings.h"
 
-#define DEBUG
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ruby,bindings,"Ruby Bindings");
+
 // Init Ruby
 void initRuby(void) {
   ruby_init();
@@ -31,77 +33,53 @@ VALUE rb_process_getName(VALUE ruby_process) {
 }
 
 // Get  Process ID
-static VALUE process_getID(VALUE ruby_process)
-{
-
+VALUE rb_process_getID(VALUE ruby_process) {
   initRuby();
   return rb_funcall(ruby_process,rb_intern("getID"),0);
-
 }
 
 // Get Bind
-static VALUE process_getBind(VALUE ruby_process)
-{
-
+VALUE rb_process_getBind(VALUE ruby_process) {
   initRuby();
   return rb_funcall(ruby_process,rb_intern("getBind"),0);
-
 }
 
 
 // Set Bind
-static void process_setBind(VALUE ruby_process,long bind)
-{
-
+void rb_process_setBind(VALUE ruby_process,long bind) {
   initRuby();
   VALUE r_bind = LONG2FIX(bind);
   rb_funcall(ruby_process,rb_intern("setBind"),1,r_bind);
-
 }
 
 // isAlive
-static VALUE process_isAlive(VALUE ruby_process)
-{
-
+VALUE rb_process_isAlive(VALUE ruby_process) {
   initRuby();
   return rb_funcall(ruby_process,rb_intern("alive?"),0);
-
 }
 
 // Kill Process
-static void process_kill(VALUE ruby_process)
-{
-
+void rb_process_kill_up(VALUE ruby_process) {
   initRuby();  
   rb_funcall(ruby_process,rb_intern("kill"),0);
-
 }
 
 // join Process
-static void process_join( VALUE ruby_process )
-{
-
+void rb_process_join( VALUE ruby_process ) {
   initRuby();
   rb_funcall(ruby_process,rb_intern("join"),0);
-
 }
 
 // unschedule Process
-static void process_unschedule( VALUE ruby_process )
-{
-
+void rb_process_unschedule( VALUE ruby_process ) {
   initRuby();
   rb_funcall(ruby_process,rb_intern("unschedule"),0);
-
 }
 
 // schedule Process
-static void process_schedule( VALUE ruby_process )
-{
-
+void rb_process_schedule( VALUE ruby_process ) {
   initRuby();
   rb_funcall(ruby_process,rb_intern("schedule"),0);
-
 }
 
 /***************************************************
@@ -113,43 +91,32 @@ Methods Belong to MSG Module
  ****************************************************/
 
 // Process To Native
-
-static m_process_t process_to_native(VALUE ruby_process)
-{
-
-  VALUE id = process_getBind(ruby_process);
-  if (!id)
-  {
+m_process_t rb_process_to_native(VALUE ruby_process) {
+  VALUE id = rb_process_getBind(ruby_process);
+  if (!id) {
     rb_raise(rb_eRuntimeError,"Process Not Bound >>> id_Bind Null");
     return NULL;
   }
   long l_id= FIX2LONG(id);
   return (m_process_t)l_id;
-
 }
 
 // Bind Process
-
-static void processBind(VALUE ruby_process,m_process_t process)
-{
-
+void rb_process_bind(VALUE ruby_process,m_process_t process) {
   long bind = (long)(process);
-  process_setBind(ruby_process,bind);
-
+  rb_process_setBind(ruby_process,bind);
 }
 
 
 // processCreate
 
-static void processCreate(VALUE class,VALUE ruby_process,VALUE host)
-{
-
+void rb_process_create(VALUE class,VALUE ruby_process,VALUE host) {
   VALUE rbName;      // Name of Java Process instance
   m_process_t process; // Native Process to Create
   const char * name ; // Name of C Native Process
   char alias[MAX_ALIAS_NAME + 1 ] = {0};
   msg_mailbox_t mailbox;
-  rbName = process_getName(ruby_process);
+  rbName = rb_process_getName(ruby_process);
 
   if(!rbName) {
     rb_raise(rb_eRuntimeError,"Internal error : Process Name Cannot be NULL");
@@ -160,7 +127,7 @@ static void processCreate(VALUE class,VALUE ruby_process,VALUE host)
   process->simdata = xbt_new0(s_simdata_process_t,1);
   // Do we Really Need to Create Ruby Process Instance , >> process is already a Ruby Process !! So..Keep on ;)
   // Bind The Ruby Process instance to The Native Process
-  processBind(ruby_process,process);
+  rb_process_bind(ruby_process,process);
   name = RSTRING(rbName)->ptr;
   process->name = xbt_strdup(name);
   Data_Get_Struct(host,m_host_t,process->simdata->m_host);
@@ -175,12 +142,11 @@ static void processCreate(VALUE class,VALUE ruby_process,VALUE host)
   }
   process->simdata->PID = msg_global->PID++; //  msg_global ??
 
-#ifdef DEBUG
-  printf("fill in process %s/%s (pid=%d) %p (sd%=%p , host=%p, host->sd=%p)\n",
+  DEBUG7("fill in process %s/%s (pid=%d) %p (sd=%p , host=%p, host->sd=%p)\n",
       process->name , process->simdata->m_host->name,process->simdata->PID,
       process,process->simdata, process->simdata->m_host,
       process->simdata->m_host->simdata);
-#endif
+
   process->simdata->s_process =
       SIMIX_process_create(process->name,
           (xbt_main_func_t)ruby_process,
@@ -188,9 +154,8 @@ static void processCreate(VALUE class,VALUE ruby_process,VALUE host)
           process->simdata->m_host->simdata->smx_host->name,
           0,NULL,NULL);
 
-#ifdef DEBUG
-  printf("context created (s_process=%p)\n",process->simdata->s_process);
-#endif
+ DEBUG1("context created (s_process=%p)\n",process->simdata->s_process);
+
   if (SIMIX_process_self()) { // SomeOne Created Me !!
     process->simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data);
   }
@@ -210,14 +175,11 @@ static void processCreate(VALUE class,VALUE ruby_process,VALUE host)
 
 
 // Process Management
+void rb_process_suspend(VALUE class,VALUE ruby_process) {
 
-static void processSuspend(VALUE class,VALUE ruby_process)
-{
+  m_process_t process = rb_process_to_native(ruby_process);
 
-  m_process_t process = process_to_native(ruby_process);
-
-  if (!process)
-  {
+  if (!process) {
     rb_raise(rb_eRuntimeError,"Process Not Bound...while suspending process");
     return;  
   }
@@ -226,91 +188,69 @@ static void processSuspend(VALUE class,VALUE ruby_process)
 
   if ( MSG_OK != MSG_process_suspend(process))
     rb_raise(rb_eRuntimeError,"MSG_process_suspend() failed");
-
-
 }
 
-static void processResume(VALUE class,VALUE ruby_process)
-{
-  m_process_t process = process_to_native(ruby_process);
-  if (!process)
-  {
+void rb_process_resume(VALUE class,VALUE ruby_process) {
+  m_process_t process = rb_process_to_native(ruby_process);
+  if (!process) {
     rb_raise(rb_eRuntimeError,"Process not Bound...while resuming process");
     return ;
   }
+
   // Trying to resume the process
   if ( MSG_OK != MSG_process_resume(process))
     rb_raise(rb_eRuntimeError,"MSG_process_resume() failed");
-
 }
 
-static VALUE processIsSuspend(VALUE class,VALUE ruby_process)
-{
-
-  m_process_t process = process_to_native(ruby_process);
-  if (!process)
-  {
+VALUE rb_process_isSuspended(VALUE class,VALUE ruby_process) {
+  m_process_t process = rb_process_to_native(ruby_process);
+  if (!process) {
     rb_raise (rb_eRuntimeError,"Process not Bound...while testing if suspended");
-    return;
+    return Qfalse;
   }
 
-  // 1 is The Process is Suspended , 0 Otherwise
   if(MSG_process_is_suspended(process))
     return Qtrue;
-
   return Qfalse;
-
 }
 
-static void processKill(VALUE class,VALUE ruby_process)
-{
-  m_process_t process = process_to_native(ruby_process);
+void rb_process_kill_down(VALUE class,VALUE ruby_process) {
+  m_process_t process = rb_process_to_native(ruby_process);
 
-  if(!process)
-  {
+  if(!process) {
     rb_raise (rb_eRuntimeError,"Process Not Bound...while killing process");
-    return ;
+    return;
   }
   // Delete The Global Reference / Ruby Process
-  process_kill(ruby_process);
+  rb_process_kill_up(ruby_process);
   // Delete the Native Process
   MSG_process_kill(process);
-
 }
 
-static VALUE processGetHost(VALUE class,VALUE ruby_process)
-{
-
-  m_process_t process = process_to_native(ruby_process);
+VALUE rb_process_getHost(VALUE class,VALUE ruby_process) {
+  m_process_t process = rb_process_to_native(ruby_process);
   m_host_t host;
 
-  if (!process)
-  {
+  if (!process) {
     rb_raise(rb_eRuntimeError,"Process Not Bound...while getting Host");
     return Qnil; // NULL
   }
 
   host = MSG_process_get_host(process);
 
-  if(!host->data)
-  {
+  if(!host->data) {
     rb_raise (rb_eRuntimeError,"MSG_process_get_host() failed");
     return Qnil;
   }
 
-  return Data_Wrap_Struct(class, 0, host_free, host);
-
+  return Data_Wrap_Struct(class, 0, rb_host_free, host);
 }
 
-static void processExit(VALUE class,VALUE ruby_process)
-{
-
-  m_process_t process = process_to_native(ruby_process);
-  if(!process)
-  {
+void rb_process_exit(VALUE class,VALUE ruby_process) {
+  m_process_t process = rb_process_to_native(ruby_process);
+  if(!process) {
     rb_raise(rb_eRuntimeError,"Process Not Bound...while exiting process");
     return;
   }
   SIMIX_context_stop(SIMIX_process_self()->context);
-
 }