detailed output messages if MSG_task_send failed

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

diff --git a/src/bindings/ruby/rb_msg_task.c b/src/bindings/ruby/rb_msg_task.c
index 8af9413..ea770cc 100644 (file)
--- a/src/bindings/ruby/rb_msg_task.c
+++ b/src/bindings/ruby/rb_msg_task.c
@@ -12,12 +12,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ruby);
 
 // Free Method
 void rb_task_free(m_task_t tk) {
-  MSG_task_destroy(tk);
+  //MSG_task_destroy(tk); ( This cause a bug !! is it really necessary ?!! not really sure !! )
 }
 
 // New Method
 VALUE rb_task_new(VALUE class, VALUE name,VALUE comp_size,VALUE comm_size) {
-  //char * t_name = RSTRING(name)->ptr;
   m_task_t task = MSG_task_create(RSTRING(name)->ptr,NUM2INT(comp_size),NUM2INT(comm_size),NULL);
   // Wrap m_task_t to a Ruby Value
   return Data_Wrap_Struct(class, 0, rb_task_free, task);
@@ -38,7 +37,7 @@ VALUE rb_task_comp(VALUE class,VALUE task) {
 VALUE rb_task_name(VALUE class,VALUE task) {
 
   // Wrap Ruby Value to m_task_t struct
-  m_task_t tk;
+  m_task_t tk; 
   Data_Get_Struct(task, s_m_task_t, tk);
   return rb_str_new2(MSG_task_get_name(tk));
 }
@@ -55,23 +54,37 @@ VALUE rb_task_execute(VALUE class,VALUE task) {
 // Sending Task
 void rb_task_send(VALUE class,VALUE task,VALUE mailbox) {
 
+  MSG_error_t rv;
   // Wrap Ruby Value to m_task_t struct
   m_task_t tk;
   Data_Get_Struct(task, s_m_task_t, tk);
-  xbt_backtrace_display_current();
-  int res = MSG_task_send(tk,RSTRING(mailbox)->ptr);
-  if(res != MSG_OK)
-    rb_raise(rb_eRuntimeError,"MSG_task_send failed");
+  INFO1("Sending task %p",tk);
+  rv = MSG_task_send(tk,RSTRING(mailbox)->ptr);
+  if(rv != MSG_OK)
+  {
+    if (rv == MSG_TRANSFER_FAILURE )
+      rb_raise(rb_eRuntimeError,"Transfer failure while Sending");
+    else if ( rv == MSG_HOST_FAILURE )
+      rb_raise(rb_eRuntimeError,"Host failure while Sending");
+    else if ( rv == MSG_TIMEOUT_FAILURE )
+      rb_raise(rb_eRuntimeError,"Timeout failure while Sending");
+    else 
+      rb_raise(rb_eRuntimeError,"MSG_task_send failed");
+  }
 }
 
 // Receiving Task (returns a Task)
 VALUE rb_task_receive(VALUE class, VALUE mailbox) {
-  // Task
-  m_task_t task = NULL;
-  INFO1("Receiving a task on mailbox %s",RSTRING(mailbox)->ptr);
-  xbt_backtrace_display_current();
-  MSG_task_receive(&task,RSTRING(mailbox)->ptr);
-  INFO2("XXXXXXXXReceived a task %p %s",task,task->name);
+  // We must put the location where we copy the task
+  // pointer to on the heap, because the stack may move
+  // during the context switches (damn ruby internals)
+  m_task_t *ptask = malloc(sizeof(m_task_t));
+  m_task_t task;
+  *ptask = NULL;
+  INFO2("Receiving a task on mailbox '%s', store it into %p",RSTRING(mailbox)->ptr,&task);
+  MSG_task_receive(ptask,RSTRING(mailbox)->ptr);
+  task = *ptask;
+  free(ptask);
   return Data_Wrap_Struct(class, 0, rb_task_free, task);
 }