X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e71fb2465e221c39ce004c598388d89cc7f968e..0c5058e854366019f429316340bff257dd01cbb4:/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 3faeeee9ce..acf55989f9 100644
--- a/src/bindings/ruby/rb_msg_task.c
+++ b/src/bindings/ruby/rb_msg_task.c
@@ -8,20 +8,41 @@
 
 #include "bindings/ruby_bindings.h"
 
+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);
 
 }
 
+// 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;
@@ -36,7 +57,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));
 }
@@ -53,30 +74,40 @@ 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);
-  int res = MSG_task_send(tk,RSTRING(mailbox)->ptr);
-  if(res != MSG_OK)
-    rb_raise(rb_eRuntimeError,"MSG_task_send failed");
+  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;
-  MSG_task_receive(&task,RSTRING(mailbox)->ptr);
+VALUE rb_task_receive(VALUE class, VALUE mailbox) {
+  // 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;
+  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);
 }
 
-// Recieve Task 2
-// Not Appreciated 
-void rb_task_receive2(VALUE class,VALUE task,VALUE mailbox) {
-  m_task_t tk;
-  Data_Get_Struct(task, s_m_task_t, tk);
-  MSG_task_receive(&tk,RSTRING(mailbox)->ptr);
-}
-
 // It Return a Native Process ( m_process_t )
 VALUE rb_task_sender(VALUE class,VALUE task) {
   m_task_t tk;
@@ -133,3 +164,25 @@ VALUE rb_task_listen_host(VALUE class,VALUE task,VALUE alias,VALUE host) {
     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);
+  
+}
+