Switch to Ruby 1.9.x

[simgrid.git] / src / bindings / ruby / rb_application_handler.c

diff --git a/src/bindings/ruby/rb_application_handler.c b/src/bindings/ruby/rb_application_handler.c
index 3225e87..5b056e5 100644 (file)
--- a/src/bindings/ruby/rb_application_handler.c
+++ b/src/bindings/ruby/rb_application_handler.c
@@ -6,7 +6,6 @@
 
 #include "bindings/ruby_bindings.h"
 #include "surf/surfxml_parse.h"
-#include "msg/private.h"        /* s_simdata_process_t FIXME: don't mess with MSG internals that way */
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ruby);
 
@@ -21,7 +20,7 @@ static VALUE rb_process_instance(VALUE fct_name, VALUE arguments,
 {
   ruby_init();
   ruby_init_loadpath();
-  char *p_className = RSTRING(fct_name)->ptr;   // name of process is the one of the class
+  char *p_className = RSTRING_PTR(fct_name);   // name of process is the one of the class
   return rb_funcall(rb_const_get(rb_cObject, rb_intern(p_className)),
                     rb_intern("new"), 3, fct_name, arguments, properties);
 }
@@ -33,66 +32,29 @@ static void rb_process_create_with_args(VALUE fct_name, VALUE arguments,
 
   VALUE ruby_process =
       rb_process_instance(fct_name, arguments, properties);
-  m_process_t process;          // Native Process to Create
+  m_process_t process = NULL;          // Native Process to Create
   const char *name;             // Name of C Native Processs
 
 
   if (!fct_name)
     rb_raise(rb_eRuntimeError,
              "Internal error: Process name cannot be NULL");
-  name = RSTRING(fct_name)->ptr;
+  name = RSTRING_PTR(fct_name);
   DEBUG1("Create native process %s", name);
 
+  char **argv = xbt_new(char *, 2);
+  argv[0] = bprintf("%s@%s", name, RSTRING_PTR(ht_name));
+  argv[1] = NULL;
+
   // Allocate the data for the simulation
-  process = xbt_new0(s_m_process_t, 1);
-  process->simdata = xbt_new0(s_simdata_process_t, 1);
+  process = MSG_process_create_with_arguments(name,
+      (xbt_main_func_t) ruby_process,
+      process,
+      MSG_get_host_by_name(RSTRING_PTR(ht_name)),
+      1, argv);
+
   // Bind The Ruby Process instance to The Native Process
   rb_process_bind(ruby_process, process);
-  process->name = xbt_strdup(name);
-  // Host
-  m_host_t host = MSG_get_host_by_name(RSTRING(ht_name)->ptr);
-  process->simdata->m_host = host;
-
-  if (!(process->simdata->m_host)) {    // Not Binded
-    free(process->simdata);
-    free(process->data);
-    free(process);
-    rb_raise(rb_eRuntimeError,
-             "Host not bound while creating native process");
-  }
-
-  process->simdata->PID = msg_global->PID++;
-
-  DEBUG7
-      ("fill in process %s/%s (pid=%d) %p (sd=%p , host=%p, host->sd=%p)",
-       process->name, process->simdata->m_host->name,
-       process->simdata->PID, process, process->simdata,
-       process->simdata->m_host, process->simdata->m_host->simdata);
-
-  /* FIXME: that's mainly for debugging. We could only allocate this if XBT_LOG_ISENABLED(ruby,debug) is true since I guess this leaks */
-  char **argv = xbt_new(char *, 2);
-  argv[0] =
-      bprintf("%s@%s", process->name,
-              process->simdata->m_host->simdata->smx_host->name);
-  argv[1] = NULL;
-  process->simdata->s_process =
-      SIMIX_process_create(process->name,
-                           (xbt_main_func_t) ruby_process,
-                           (void *) process,
-                           process->simdata->m_host->simdata->
-                           smx_host->name, 1, argv, NULL);
-
-  DEBUG1("context created (s_process=%p)", process->simdata->s_process);
-
-  if (SIMIX_process_self()) {   // SomeOne Created Me !!
-    process->simdata->PPID =
-        MSG_process_get_PID(SIMIX_process_self()->data);
-  } else {
-    process->simdata->PPID = -1;
-  }
-  process->simdata->last_errno = MSG_OK;
-  // let's Add the Process to the list of the Simulation's Processes
-  xbt_fifo_unshift(msg_global->process_list, process);
 }