X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05a2819a1d62a4ebe2af6d0a60654bf8e629d042..7cb1f8f04ea7ad3bf6a0eedec6f8e28e3f961970:/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 9334a12bd4..3fe4d8ee73 100644
--- a/src/bindings/ruby/rb_msg_task.c
+++ b/src/bindings/ruby/rb_msg_task.c
@@ -1,187 +1,209 @@
-/*
- * $Id$
- *
- * Copyright 2010 Martin Quinson, Mehdi Fekari           
- * All right reserved. 
- *
- * This program is free software; you can redistribute 
- * it and/or modify it under the terms of the license 
- *(GNU LGPL) which comes with this package. 
- */
-#include "rb_msg_task.h"
+/* Task-related bindings to ruby  */
+
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+
+#include "bindings/ruby_bindings.h"
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ruby);
 
 // Free Method
-static void task_free(m_task_t tk) {
-  MSG_task_destroy(tk);
+void rb_task_free(m_task_t tk) {
+  //MSG_task_destroy(tk); ( This cause a bug !! is it really necessary ?!! not really sure !! )
 }
 
 // New Method
-static VALUE task_new(VALUE class, VALUE name,VALUE comp_size,VALUE comm_size)
-{
-  
-  //char * t_name = RSTRING(name)->ptr;
+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, task_free, task);
-
+  return Data_Wrap_Struct(class, 0, rb_task_free, task);
 }
 
 //Get Computation Size
-static VALUE task_comp(VALUE class,VALUE task)
-{
+VALUE rb_task_comp(VALUE class,VALUE task) {
   double size;
   m_task_t tk;
   // Wrap Ruby Value to m_task_t struct
-  Data_Get_Struct(task, m_task_t, tk);
+  Data_Get_Struct(task, s_m_task_t, tk);
   size = MSG_task_get_compute_duration(tk);
   return rb_float_new(size);
 }
 
 //Get Name
-static VALUE task_name(VALUE class,VALUE task)
-{
-  
+VALUE rb_task_name(VALUE class,VALUE task) {
+
   // Wrap Ruby Value to m_task_t struct
-  m_task_t tk;
-  Data_Get_Struct(task, 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));
-   
 }
 
 // Execute Task
-static VALUE task_execute(VALUE class,VALUE task)
-{
-  
+VALUE rb_task_execute(VALUE class,VALUE task) {
+
   // Wrap Ruby Value to m_task_t struct
   m_task_t tk;
-  Data_Get_Struct(task, m_task_t, tk);
+  Data_Get_Struct(task, s_m_task_t, tk);
   return INT2NUM(MSG_task_execute(tk));
-  
 }
 
 // Sending Task
-static void task_send(VALUE class,VALUE task,VALUE mailbox)
-{
-  
+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, 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");
-  
-  return;
-}
-
-// Recieving Task 
-
-/**
-*It Return a Task 
-*/
-
-static VALUE task_receive(VALUE class,VALUE mailbox)
-{
-  // Task
-  m_task_t task = NULL;
-  MSG_task_receive(&task,RSTRING(mailbox)->ptr);
-  return Data_Wrap_Struct(class, 0, task_free, task);
+  Data_Get_Struct(task, s_m_task_t, 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)
+  {
+    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");
+  }
 }
 
-// Recieve Task 2
-// Not Appreciated 
-static void task_receive2(VALUE class,VALUE task,VALUE mailbox)
-{
-  m_task_t tk;
-  Data_Get_Struct(task, m_task_t, tk);
-  MSG_task_receive(&tk,RSTRING(mailbox)->ptr);
-  
+// Receiving Task (returns a Task)
+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;
+  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 )
-static VALUE task_sender(VALUE class,VALUE task)
-{
+VALUE rb_task_sender(VALUE class,VALUE task) {
   m_task_t tk;
-  Data_Get_Struct(task,m_task_t,tk);
-  return MSG_task_get_sender(tk);
-  
+  Data_Get_Struct(task,s_m_task_t,tk);
+  THROW_UNIMPLEMENTED;
+  return 0;//MSG_task_get_sender(tk);
 }
 
 // it return a Host 
-static VALUE task_source(VALUE class,VALUE task)
-{
+VALUE rb_task_source(VALUE class,VALUE task) {
   m_task_t tk;
-  Data_Get_Struct(task,m_task_t,tk);
-  
+  Data_Get_Struct(task,s_m_task_t,tk);
+
   m_host_t host = MSG_task_get_source(tk);
-  if(!host->data)
-  {
+  if(!host->data) {
     rb_raise(rb_eRuntimeError,"MSG_task_get_source() failed");
     return Qnil;
   }
-  return host;
-  
+  THROW_UNIMPLEMENTED;
+  return 0;//host;
 }
 
 // Return Boolean
-static VALUE task_listen(VALUE class,VALUE task,VALUE alias)
-{
- m_task_t tk;
- const char *p_alias;
- int rv;
- 
- Data_Get_Struct(task,m_task_t,tk);
- p_alias = RSTRING(alias)->ptr;
- 
- rv = MSG_task_listen(p_alias);
- 
- if(rv) return Qtrue;
- 
- return Qfalse;
+VALUE rb_task_listen(VALUE class,VALUE task,VALUE alias) {
+  m_task_t tk;
+  const char *p_alias;
+  int rv;
+
+  Data_Get_Struct(task,s_m_task_t,tk);
+  p_alias = RSTRING(alias)->ptr;
+
+  rv = MSG_task_listen(p_alias);
 
+  if(rv) return Qtrue;
+
+  return Qfalse;
 }
 
 // return Boolean
-static VALUE task_listen_host(VALUE class,VALUE task,VALUE alias,VALUE host)
+VALUE rb_task_listen_host(VALUE class,VALUE task,VALUE alias,VALUE host) {
+
+  m_task_t tk;
+  m_host_t ht;
+  const char *p_alias;
+  int rv;
+
+  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;
- m_host_t ht;
- const char *p_alias;
- int rv;
- 
- Data_Get_Struct(task,m_task_t,tk);
- Data_Get_Struct(host,m_host_t,ht);
- p_alias = RSTRING(alias)->ptr;
- 
- rv = MSG_task_listen_from_host(p_alias,ht);
- 
- if (rv) return Qtrue;
- 
- return Qfalse;
- 
-}
-
-
-// Put
-static void task_put(VALUE class,VALUE task,VALUE host)
+ 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;
- m_host_t ht;
- 
- Data_Get_Struct(task,m_task_t,tk);
- Data_Get_Struct(host,m_host_t,ht);
- MSG_task_put(tk,ht,PORT_22);  //Channel set to 0
- 
+ 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;
 }
 
-//get 
-static VALUE task_get(VALUE class)
+VALUE rb_task_has_data(VALUE class,VALUE task)
 {
-  
- m_task_t task = NULL;
- int res = MSG_task_get(&task,PORT_22); // Channel set to 0
- xbt_assert0(res == MSG_OK, "MSG_task_get failed");
- return Data_Wrap_Struct(class, 0, task_free, 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;
 }
+