X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2b47fc7fcc631f27fd65f2d830536959b8549af..762740361e42dd14f5d24d239a29a1e08895ef64:/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..0de3ffa898 100644
--- a/src/bindings/ruby/rb_msg_task.c
+++ b/src/bindings/ruby/rb_msg_task.c
@@ -1,135 +1,110 @@
 /*
- * $Id$
- *
- * Copyright 2010 Martin Quinson, Mehdi Fekari           
- * All right reserved. 
+ * Copyright 2010. The SimGrid Team. 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"
+#include "bindings/ruby_bindings.h"
 
 // Free Method
-static void task_free(m_task_t tk) {
+void rb_task_free(m_task_t tk) {
   MSG_task_destroy(tk);
 }
 
 // New Method
-static VALUE task_new(VALUE class, VALUE name,VALUE comp_size,VALUE comm_size)
-{
-  
+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, 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);
+  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) {
   
   // 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);
   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)
-{
+// 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);
-  return Data_Wrap_Struct(class, 0, task_free, task);
+  return Data_Wrap_Struct(class, 0, rb_task_free, task);
 }
 
 // Recieve Task 2
 // Not Appreciated 
-static void task_receive2(VALUE class,VALUE task,VALUE mailbox)
-{
+void rb_task_receive2(VALUE class,VALUE task,VALUE mailbox) {
   m_task_t tk;
-  Data_Get_Struct(task, 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 )
-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)
-{
+VALUE rb_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);
+ Data_Get_Struct(task,s_m_task_t,tk);
  p_alias = RSTRING(alias)->ptr;
  
  rv = MSG_task_listen(p_alias);
@@ -137,51 +112,25 @@ static VALUE task_listen(VALUE class,VALUE task,VALUE 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,m_task_t,tk);
- Data_Get_Struct(host,m_host_t,ht);
+ 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;
- 
+ if (rv)
+   return Qtrue;
  return Qfalse;
- 
 }
 
 
-// Put
-static void task_put(VALUE class,VALUE task,VALUE host)
-{
-  
- 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
- 
-}
-
-//get 
-static VALUE task_get(VALUE class)
-{
-  
- 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);
- 
-}