X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ed95f6aa5479b9dab84fd9e2e303fdc63a9089af..3fed8dfc00286ce4df0341262e278298df401b78:/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 361765746f..c6b734aa8e 100644
--- a/src/bindings/ruby/rb_msg_task.c
+++ b/src/bindings/ruby/rb_msg_task.c
@@ -12,16 +12,18 @@ 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);
+  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);
-
 }
 
 //Get Computation Size
@@ -38,7 +40,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,22 +57,45 @@ VALUE rb_task_execute(VALUE class,VALUE task) {
 // Sending 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);
-  int res = MSG_task_send(tk,RSTRING(mailbox)->ptr);
-  if(res != MSG_OK)
-    rb_raise(rb_eRuntimeError,"MSG_task_send failed");
+  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)
+  {
+    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 )
+      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);
-  MSG_task_receive(&task,RSTRING(mailbox)->ptr);
-  INFO2("XXXXXXXXReceived a task %p %s",task,task->name);
-  return Data_Wrap_Struct(class, 0, rb_task_free, task);
+  // 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;
+  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);
+  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 )
@@ -122,10 +147,62 @@ 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;
 }
+
+
+// Set Priority
+void rb_task_set_priority(VALUE class,VALUE task,VALUE priority)
+{
+  
+  m_task_t tk;
+  double prt = NUM2DBL(priority);
+  Data_Get_Struct(task,s_m_task_t,tk);
+  MSG_task_set_priority(tk,prt);
+  
+}
+
+// Cancel
+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;
+}
+