allowing to send tasks containing "ruby task" value plus "the user data"

[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 dadc6f5..c6b734a 100644 (file)
--- a/src/bindings/ruby/rb_msg_task.c
+++ b/src/bindings/ruby/rb_msg_task.c
@@ -18,31 +18,14 @@ void rb_task_free(m_task_t tk) {
 // New Method
 VALUE rb_task_new(VALUE class, VALUE name,VALUE comp_size,VALUE comm_size) {
   m_task_t task = MSG_task_create(RSTRING(name)->ptr,NUM2INT(comp_size),NUM2INT(comm_size),NULL);
+  rb_data_t data = malloc(sizeof(s_ruby_data_t));
+  data->ruby_task = NULL;
+  data->user_data = NULL;
+  MSG_task_set_data(task,(void*)data);
   // Wrap m_task_t to a Ruby Value
   return Data_Wrap_Struct(class, 0, rb_task_free, task);
-
-}
-
-// set Data : For the Moment , we will consider Data as asimple String ( char * )
-void rb_task_set_data(VALUE class,VALUE task,VALUE data)
-{
- const char *str_data = RSTRING(data)->ptr;
- m_task_t tk;
- Data_Get_Struct(task, s_m_task_t, tk);
- tk->data = (void*)str_data;
- 
 }
 
-// get Data
-VALUE rb_task_get_data(VALUE class,VALUE task)
-{
-  m_task_t tk;
-  Data_Get_Struct(task, s_m_task_t, tk);
-  return rb_str_new2(tk->data);
-  
-}
-
-
 //Get Computation Size
 VALUE rb_task_comp(VALUE class,VALUE task) {
   double size;
@@ -75,10 +58,14 @@ VALUE rb_task_execute(VALUE class,VALUE task) {
 void rb_task_send(VALUE class,VALUE task,VALUE mailbox) {
 
   MSG_error_t rv;
+  rb_data_t data;
   // Wrap Ruby Value to m_task_t struct
   m_task_t tk;
   Data_Get_Struct(task, s_m_task_t, tk);
-  INFO1("Sending task %p",tk);
+  data = MSG_task_get_data(tk);
+  data->ruby_task =(void*)task;
+  MSG_task_set_data(tk,(void*)data);
+  DEBUG1("Sending task %p",tk);
   rv = MSG_task_send(tk,RSTRING(mailbox)->ptr);
   if(rv != MSG_OK)
   {
@@ -86,7 +73,7 @@ void rb_task_send(VALUE class,VALUE task,VALUE mailbox) {
       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 )
+    else if ( rv == MSG_TIMEOUT )
       rb_raise(rb_eRuntimeError,"Timeout failure while Sending");
     else 
       rb_raise(rb_eRuntimeError,"MSG_task_send failed");
@@ -101,11 +88,14 @@ VALUE rb_task_receive(VALUE class, VALUE mailbox) {
   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);
+  rb_data_t data =NULL;
+  DEBUG2("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);
+  data = MSG_task_get_data(task);
+  if(data==NULL) printf("Empty task while receving");
+  return (VALUE)data->ruby_task;
 }
 
 // It Return a Native Process ( m_process_t )
@@ -157,9 +147,7 @@ VALUE rb_task_listen_host(VALUE class,VALUE task,VALUE alias,VALUE host) {
   Data_Get_Struct(task,s_m_task_t,tk);
   Data_Get_Struct(host,s_m_host_t,ht);
   p_alias = RSTRING(alias)->ptr;
-
   rv = MSG_task_listen_from_host(p_alias,ht);
-
   if (rv)
     return Qtrue;
   return Qfalse;
@@ -183,6 +171,38 @@ void rb_task_cancel(VALUE class,VALUE task)
  m_task_t tk;
  Data_Get_Struct(task,s_m_task_t,tk);
  MSG_task_cancel(tk);
-  
+
+}
+
+void rb_task_set_data(VALUE class,VALUE task,VALUE data)
+{
+ m_task_t tk;
+ rb_data_t rb_data;
+ Data_Get_Struct(task,s_m_task_t,tk);
+ rb_data = MSG_task_get_data(tk);
+ rb_data->user_data = (void*)data;
+ MSG_task_set_data(tk,(void*)rb_data);
+
+}
+
+VALUE rb_task_get_data(VALUE class,VALUE task)
+{
+ m_task_t tk;
+ Data_Get_Struct(task,s_m_task_t,tk);
+ rb_data_t rb_data = MSG_task_get_data(tk);
+ if(!rb_data->user_data)
+        ERROR1("the task %s contain no user data",MSG_task_get_name(tk));
+
+ return (VALUE)rb_data->user_data;
+}
+
+VALUE rb_task_has_data(VALUE class,VALUE task)
+{
+ m_task_t tk;
+ Data_Get_Struct(task,s_m_task_t,tk);
+ rb_data_t rb_data = MSG_task_get_data(tk);
+ if(!rb_data->user_data)
+        return Qfalse;
+ return Qtrue;
 }